From 90a1c59b5c3009dbcb0013aff40d2900dec458cd Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 5 May 2006 23:31:12 +0000 Subject: [PATCH] governors menu works properly/predictably again SVN revision: 22468 --- src/bin/e_gadcon.c | 1 + src/bin/e_gadcon.h | 1 + src/bin/e_int_gadcon_config.c | 6 +++--- src/modules/cpufreq/e_mod_main.c | 18 +++++++----------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index a7851f1be..5704c4a51 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -1004,6 +1004,7 @@ _e_gadcon_free(E_Gadcon *gc) evas_stringshare_del(gc->name); evas_stringshare_del(gc->id); evas_stringshare_del(gc->edje.swallow_name); + if (gc->config_dialog) e_object_del(E_OBJECT(gc->config_dialog)); free(gc); } diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h index 1a1019145..e17d052b0 100644 --- a/src/bin/e_gadcon.h +++ b/src/bin/e_gadcon.h @@ -71,6 +71,7 @@ struct _E_Gadcon void *data; } frame_request; + E_Config_Dialog *config_dialog; unsigned char editing : 1; }; diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c index 345cd7d22..0a0a1d519 100644 --- a/src/bin/e_int_gadcon_config.c +++ b/src/bin/e_int_gadcon_config.c @@ -35,7 +35,7 @@ e_int_gadcon_config(E_Gadcon *gc) /* create config diaolg for bd object/data */ cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), _("Contents Settings"), NULL, 0, v, gc); -// gc->config_dialog = cfd; + gc->config_dialog = cfd; } } @@ -85,7 +85,7 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { /* Free the cfdata */ -// cfdata->gc->config_dialog = NULL; + cfdata->gc->config_dialog = NULL; // if (cfdata->style) free(cfdata->style); free(cfdata); } @@ -137,7 +137,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_shelf_show(cfdata->es); e_config_save_queue(); */ -// cfdata->gc->config_dialog = cfd; + cfdata->gc->config_dialog = cfd; return 1; /* Apply was OK */ } diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index f1f8da97e..0e87dce76 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -198,10 +198,9 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_label_set(mi, _("Maximum Speed")); e_menu_item_radio_set(mi, 1); e_menu_item_radio_group_set(mi, 1); - e_object_data_set(E_OBJECT(mi), l->data); if (!strcmp(cpufreq_config->status->cur_governor, l->data)) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _cpufreq_menu_governor, NULL); + e_menu_item_callback_set(mi, _cpufreq_menu_governor, l->data); } } @@ -226,10 +225,9 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) e_menu_item_label_set(mi, buf); e_menu_item_radio_set(mi, 1); e_menu_item_radio_group_set(mi, 1); - e_object_data_set(E_OBJECT(mi), l->data); if (cpufreq_config->status->cur_frequency == frequency) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _cpufreq_menu_frequency, NULL); + e_menu_item_callback_set(mi, _cpufreq_menu_frequency, l->data); } } @@ -367,7 +365,8 @@ _cpufreq_cb_check(void *data) Instance *inst; Evas_List *l; int active; - + + if (cpufreq_config->menu_poll) return 1; active = cpufreq_config->status->active; if (_cpufreq_status_check_current(cpufreq_config->status)) { @@ -787,7 +786,7 @@ _cpufreq_menu_governor(void *data, E_Menu *m, E_Menu_Item *mi) { char *governor; - governor = e_object_data_get(E_OBJECT(mi)); + governor = data; if (governor) { _cpufreq_set_governor(governor); @@ -802,11 +801,8 @@ _cpufreq_menu_frequency(void * data, E_Menu *m, E_Menu_Item *mi) { int frequency; - frequency = (int)e_object_data_get(E_OBJECT(mi)); - if (frequency > 0) - { - _cpufreq_set_frequency(frequency); - } + frequency = (int)data; + if (frequency > 0) _cpufreq_set_frequency(frequency); } /***************************************************************************/