From 763008e5c686386d22005ce8aca8c6860d540d91 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sat, 25 Apr 2009 16:13:12 +0000 Subject: [PATCH] remove global list of widgets, not required. SVN revision: 40377 --- src/modules/conf_dpms/e_int_config_dpms.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/modules/conf_dpms/e_int_config_dpms.c b/src/modules/conf_dpms/e_int_config_dpms.c index 3ecb0e422..ba43967cd 100644 --- a/src/modules/conf_dpms/e_int_config_dpms.c +++ b/src/modules/conf_dpms/e_int_config_dpms.c @@ -35,10 +35,10 @@ struct _E_Config_Dialog_Data double standby_timeout; double suspend_timeout; double off_timeout; + Eina_List *dpms_list; }; static E_Dialog *dpms_dialog = NULL; -Eina_List *dpms_list = NULL; static void _cb_dpms_dialog_ok(void *data, E_Dialog *dia) @@ -146,8 +146,7 @@ _create_data(E_Config_Dialog *cfd) static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - dpms_list = eina_list_free(dpms_list); - + eina_list_free(cfdata->dpms_list); E_FREE(cfdata); } @@ -204,42 +203,42 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data ob = e_widget_check_add(evas, _("Standby time"), &(cfdata->enable_standby)); e_widget_framelist_object_append(of, ob); - dpms_list = eina_list_append (dpms_list, ob); + cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, &(cfdata->standby_timeout), NULL, 200); e_widget_on_change_hook_set(ob, _cb_standby_slider_change, cfdata); cfdata->standby_slider = ob; - dpms_list = eina_list_append (dpms_list, ob); + cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Suspend time"), &(cfdata->enable_suspend)); e_widget_framelist_object_append(of, ob); - dpms_list = eina_list_append (dpms_list, ob); + cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, &(cfdata->suspend_timeout), NULL, 200); e_widget_on_change_hook_set(ob, _cb_suspend_slider_change, cfdata); cfdata->suspend_slider = ob; - dpms_list = eina_list_append (dpms_list, ob); + cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Off time"), &(cfdata->enable_off)); e_widget_framelist_object_append(of, ob); - dpms_list = eina_list_append (dpms_list, ob); + cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, &(cfdata->off_timeout), NULL, 200); e_widget_on_change_hook_set(ob, _cb_off_slider_change, cfdata); cfdata->off_slider = ob; - dpms_list = eina_list_append (dpms_list, ob); + cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob); e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config e_widget_framelist_object_append(of, ob); // handler for enable/disable widget array - e_widget_on_change_hook_set(dpms_check, _cb_disable_check_list, dpms_list); + e_widget_on_change_hook_set(dpms_check, _cb_disable_check_list, cfdata->dpms_list); e_widget_list_object_append(o, of, 1, 1, 0.5); return o;