Fix bug where changing a config value then selecting a different page (Basic/Advanced...

SVN revision: 20437

diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c
index bc6a0e964ed0d825150fb0cf2eeffdfbe0e096fa..e01c40776047e88ad7440a822556c889fdc733b9 100644 (file)
--- a/src/modules/battery/e_mod_config.c
+++ b/src/modules/battery/e_mod_config.c
@@ -52,13 +52,9 @@ _fill_data(Battery *b, E_Config_Dialog_Data *cfdata)
    cfdata->alarm_time = b->conf->alarm;
    cfdata->poll_time = b->conf->poll_time;
    if (cfdata->alarm_time > 0) 
-     {
-       cfdata->show_alert = 1;
-     }
+     cfdata->show_alert = 1;
    else 
-     {
-       cfdata->show_alert = 0;
-     }
+     cfdata->show_alert = 0;
    cfdata->allow_overlap = b->conf->allow_overlap;
 }
 
@@ -87,12 +83,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
-   Battery *b;
    Evas_Object *o, *of, *ob;
-   
-   b = cfd->data;
-   _fill_data(b, cfdata);
-   
+      
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("Basic Settings"), 0);
    ob = e_widget_check_add(evas, _("Show alert when battery is low"), &(cfdata->show_alert));
@@ -131,12 +123,8 @@ static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *of, *ob;
-   Battery *b;
    
    /* Use Sliders for both cfg options */
-   b = cfd->data;
-   _fill_data(b, cfdata);
-
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_frametable_add(evas, _("Advanced Settings"), 1);
    
@@ -174,13 +162,9 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    
    b->conf->poll_time = cfdata->poll_time;
    if (cfdata->show_alert) 
-     {
-       b->conf->alarm = cfdata->alarm_time;
-     }
+     b->conf->alarm = cfdata->alarm_time;
    else 
-     {
-       b->conf->alarm = 0;
-     }
+     b->conf->alarm = 0;
 
    if (cfdata->allow_overlap && !b->conf->allow_overlap)
      b->conf->allow_overlap = 1;

diff --git a/src/modules/clock/e_mod_config.c b/src/modules/clock/e_mod_config.c
index 82093d1b942e1e35b197438da0b1cd76c2eb1247..2f490ae720a9ec598d5aaa976ef2c8957c46cf33 100644 (file)
--- a/src/modules/clock/e_mod_config.c
+++ b/src/modules/clock/e_mod_config.c
@@ -53,8 +53,11 @@ static void *
 _create_data(E_Config_Dialog *cfd) 
 {
    E_Config_Dialog_Data *cfdata;
+   Clock_Face *cf;
    
+   cf = cfd->data;
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _fill_data(cf, cfdata);
    return cfdata;
 }
 
@@ -73,10 +76,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
-   Clock_Face *c;
-   
-   c = cfd->data;
-   _fill_data(c, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("General Settings"), 0);

diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c
index 131c15af460c94f0b8e763aced846526cec0742f..6b2616e6e1d8c295917a4f9b462b51333f094877 100644 (file)
--- a/src/modules/dropshadow/e_mod_config.c
+++ b/src/modules/dropshadow/e_mod_config.c
@@ -112,10 +112,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 {
    Evas_Object *o, *ob, *of;
    E_Radio_Group *rg;
-   Dropshadow *ds;
-   
-   ds = cfd->data;
-   _fill_data(ds, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
 

diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index c1e8a1709a30b786c96ff9eb63c3bc445b27ac5e..2749a6667a19200b5d8304094622415a6ccbdccf 100644 (file)
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -87,10 +87,6 @@ static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *ob;
-   IBar *ib;
-   
-   ib = cfd->data;
-   _fill_data(ib, cfdata);
 
    o = e_widget_list_add(evas, 0, 0);
    ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower));
@@ -143,10 +139,6 @@ static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *of, *ob;
-   IBar *ib;
-   
-   ib = cfd->data;
-   _fill_data(ib, cfdata);
 
    o = e_widget_list_add(evas, 0, 0);
    

diff --git a/src/modules/itray/e_mod_config.c b/src/modules/itray/e_mod_config.c
index 2db50a338be5df3c0ed4635cff83e5a311b85b65..6e08226ee6bdf6d7378ab7b92ce0a7f55195996f 100644 (file)
--- a/src/modules/itray/e_mod_config.c
+++ b/src/modules/itray/e_mod_config.c
@@ -80,10 +80,6 @@ static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 {
    Evas_Object *o, *ob, *of;
-   ITray *ib;
-   
-   ib = cfd->data;
-   _fill_data(ib, cfdata);
 
    o = e_widget_list_add(evas, 0, 0);
    
@@ -115,10 +111,6 @@ static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
 {
    Evas_Object *o, *of, *ob;
-   ITray *ib;
-   
-   ib = cfd->data;
-   _fill_data(ib, cfdata);
 
    o = e_widget_list_add(evas, 0, 0);
    
@@ -143,9 +135,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
    ib = cfd->data;
    e_border_button_bindings_ungrab_all();
    if (cfdata->rowsize != ib->conf->rowsize) 
-     {
-       ib->conf->rowsize = cfdata->rowsize;
-     }
+     ib->conf->rowsize = cfdata->rowsize;
    if (cfdata->allow_overlap && !ib->conf->allow_overlap)
      ib->conf->allow_overlap = 1;
    else if (!cfdata->allow_overlap && ib->conf->allow_overlap)

diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index c3c81221a4271c7bdbf05af8926cd47b5741ab25..0113b950673a25ff87ea37544dea018eb853282e 100644 (file)
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -71,8 +71,11 @@ static void *
 _create_data(E_Config_Dialog *cfd) 
 {
    E_Config_Dialog_Data *cfdata;
+   Pager *p;
    
+   p = cfd->data;
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _fill_data(p, cfdata);
    return cfdata;
 }
 
@@ -91,10 +94,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
-   Pager *p;
-   
-   p = cfd->data;
-   _fill_data(p, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("General Settings"), 0);
@@ -154,10 +153,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
-   Pager *p;
-   
-   p = cfd->data;
-   _fill_data(p, cfdata);
 
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("General Settings"), 0);

diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c
index 4c5c9e8466a2ba4d54eddff8a2082dd6658bb351..7520e4709d8df33042f97de46e5b510290228df4 100644 (file)
--- a/src/modules/temperature/e_mod_config.c
+++ b/src/modules/temperature/e_mod_config.c
@@ -69,79 +69,49 @@ _fill_data(Temperature *t, E_Config_Dialog_Data *cfdata)
    
    cfdata->units = t->conf->units;
    if (t->conf->units == CELCIUS) 
-     {
-       cfdata->unit_method = 0;
-     }
+     cfdata->unit_method = 0;
    else 
-     {
-       cfdata->unit_method = 1;
-     }
+     cfdata->unit_method = 1;
    
    p = t->conf->poll_time;
    cfdata->poll_time = p;
    if ((p >= 0) && (p <= 5)) 
-     {
-       cfdata->poll_method = 1; //Fast
-     }
+     cfdata->poll_method = 1; //Fast
    else if ((p > 5) && (p <= 10)) 
-     {
-       cfdata->poll_method = 10; //Normal
-     }
+     cfdata->poll_method = 10; //Normal
    else if ((p > 10) && (p <= 30)) 
-     {
-       cfdata->poll_method = 30; //Slow
-     }
+     cfdata->poll_method = 30; //Slow
    else if (p > 30) 
-     {
-       cfdata->poll_method = 60; //Very Slow
-     }
+     cfdata->poll_method = 60; //Very Slow
    
    p = t->conf->low;
    if (cfdata->units == FAHRENHEIT)
      p = FAR_2_CEL(p - 1); // -1 so the conversion doesn't make mid go hi
    cfdata->low_temp = p;
    if ((p >= 0) && (p <= TEMP_LOW_LOW)) 
-     {
-       cfdata->low_method = TEMP_LOW_LOW;
-     }
+     cfdata->low_method = TEMP_LOW_LOW;
    else if ((p > TEMP_LOW_LOW) && (p <= TEMP_LOW_MID)) 
-     {
-       cfdata->low_method = TEMP_LOW_MID;
-     }
+     cfdata->low_method = TEMP_LOW_MID;
    else if (p > TEMP_LOW_MID) 
-     {
-       cfdata->low_method = TEMP_LOW_HIGH;
-     }
+     cfdata->low_method = TEMP_LOW_HIGH;
 
    p = t->conf->high;
    if (cfdata->units == FAHRENHEIT)
      p = FAR_2_CEL(p - 1);
    cfdata->high_temp = p;
    if ((p >= 0) && (p <= TEMP_HIGH_LOW)) 
-     {
-       cfdata->high_method = TEMP_HIGH_LOW;
-     }
+     cfdata->high_method = TEMP_HIGH_LOW;
    else if ((p > TEMP_HIGH_LOW) && (p <= TEMP_HIGH_MID)) 
-     {
-       cfdata->high_method = TEMP_HIGH_MID;
-     }
+     cfdata->high_method = TEMP_HIGH_MID;
    else if (p > TEMP_HIGH_MID) 
-     {
-       cfdata->high_method = TEMP_HIGH_HIGH;
-     }
+     cfdata->high_method = TEMP_HIGH_HIGH;
    
    if (!strcmp(t->conf->sensor_name, "temp1")) 
-     {
-       cfdata->sensor = 0;
-     }
+     cfdata->sensor = 0;
    else if (!strcmp(t->conf->sensor_name, "temp2")) 
-     {
-       cfdata->sensor = 1;
-     }
+     cfdata->sensor = 1;
    else if (!strcmp(t->conf->sensor_name, "temp3")) 
-     {
-       cfdata->sensor = 2;
-     }
+     cfdata->sensor = 2;
 
    cfdata->allow_overlap = t->conf->allow_overlap;
 }
@@ -150,8 +120,11 @@ static void *
 _create_data(E_Config_Dialog *cfd) 
 {
    E_Config_Dialog_Data *cfdata;
+   Temperature *t;
    
+   t = cfd->data;
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   _fill_data(t, cfdata);
    return cfdata;
 }
 
@@ -170,10 +143,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 {
    Evas_Object *o, *of, *ob;
    E_Radio_Group *rg;
-   Temperature *t;
-   
-   t = cfd->data;
-   _fill_data(t, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("Display Units"), 0);
@@ -262,13 +231,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    t = cfd->data;
    e_border_button_bindings_ungrab_all();
    if (cfdata->unit_method == 0) 
-     {
-       t->conf->units = CELCIUS;       
-     }
+     t->conf->units = CELCIUS; 
    else 
-     {
-       t->conf->units = FAHRENHEIT;
-     }
+     t->conf->units = FAHRENHEIT;
    
    t->conf->poll_time = (double)cfdata->poll_method;
 
@@ -304,7 +269,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    Temperature *t;
    
    t = cfd->data;
-   _fill_data(t, cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("Display Units"), 0);
@@ -434,13 +398,9 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      }
 
    if (cfdata->unit_method == 0) 
-     {
-       t->conf->units = CELCIUS;       
-     }
+     t->conf->units = CELCIUS; 
    else 
-     {
-       t->conf->units = FAHRENHEIT;
-     }
+     t->conf->units = FAHRENHEIT;
    
    t->conf->poll_time = cfdata->poll_time;