cleanups

SVN revision: 24714

diff --git a/src/bin/e_spectrum.c b/src/bin/e_spectrum.c
index 9915694..2cf3a30 100644 (file)
--- a/src/bin/e_spectrum.c
+++ b/src/bin/e_spectrum.c
@@ -258,7 +258,11 @@ _e_spectrum_redraw(void *d)
   float vx, vy, vz;
 
   data = evas_object_image_data_get(sp->o_spectrum, 1);
-  if (!data) return;
+  if (!data) 
+  {
+    sp->draw_timer = NULL;
+    return 0;
+  }
 
   switch(sp->mode)
   {

diff --git a/src/bin/e_test.c b/src/bin/e_test.c
index a37d9d4..85a2d15 100644 (file)
--- a/src/bin/e_test.c
+++ b/src/bin/e_test.c
@@ -814,6 +814,7 @@ _e_test_internal(E_Container *con)
    e_dialog_title_set(dia, "Test Color Selector");
 
    color = calloc(1, sizeof(E_Color));
+   color->a = 255;
 
    o = e_widget_csel_add(dia->win->evas, color);
    evas_object_show(o);

diff --git a/src/bin/e_widget_csel.c b/src/bin/e_widget_csel.c
index 50c7953..1126d20 100644 (file)
--- a/src/bin/e_widget_csel.c
+++ b/src/bin/e_widget_csel.c
@@ -168,10 +168,6 @@ e_widget_csel_add(Evas *evas, E_Color *color)
    e_widget_sub_object_add(obj, frame);
    grp = e_widget_radio_group_new(&wd->mode);
 
-   cv->r = 20; cv->g = 120; cv->b = 79;
-   cv->a = 255;
-   e_color_update_rgb(cv);
-
    wd->values = calloc(E_COLOR_COMPONENT_MAX, sizeof(char *));
 
    for(i = 0; i < E_COLOR_COMPONENT_MAX; i++)
@@ -236,7 +232,7 @@ e_widget_csel_add(Evas *evas, E_Color *color)
 
    e_widget_table_object_append(table, frame, 3, 1, 1, 1, 1, 1, 1, 1);
 
-   return table;
+   return obj;
 }