forked from enlightenment/enlightenment
governors menu works properly/predictably again
SVN revision: 22468
This commit is contained in:
parent
7310748157
commit
90a1c59b5c
|
@ -1004,6 +1004,7 @@ _e_gadcon_free(E_Gadcon *gc)
|
||||||
evas_stringshare_del(gc->name);
|
evas_stringshare_del(gc->name);
|
||||||
evas_stringshare_del(gc->id);
|
evas_stringshare_del(gc->id);
|
||||||
evas_stringshare_del(gc->edje.swallow_name);
|
evas_stringshare_del(gc->edje.swallow_name);
|
||||||
|
if (gc->config_dialog) e_object_del(E_OBJECT(gc->config_dialog));
|
||||||
free(gc);
|
free(gc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,7 @@ struct _E_Gadcon
|
||||||
void *data;
|
void *data;
|
||||||
} frame_request;
|
} frame_request;
|
||||||
|
|
||||||
|
E_Config_Dialog *config_dialog;
|
||||||
unsigned char editing : 1;
|
unsigned char editing : 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ e_int_gadcon_config(E_Gadcon *gc)
|
||||||
/* create config diaolg for bd object/data */
|
/* create config diaolg for bd object/data */
|
||||||
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
|
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
|
||||||
_("Contents Settings"), NULL, 0, v, gc);
|
_("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_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
/* Free the cfdata */
|
/* Free the cfdata */
|
||||||
// cfdata->gc->config_dialog = NULL;
|
cfdata->gc->config_dialog = NULL;
|
||||||
// if (cfdata->style) free(cfdata->style);
|
// if (cfdata->style) free(cfdata->style);
|
||||||
free(cfdata);
|
free(cfdata);
|
||||||
}
|
}
|
||||||
|
@ -137,7 +137,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
e_shelf_show(cfdata->es);
|
e_shelf_show(cfdata->es);
|
||||||
e_config_save_queue();
|
e_config_save_queue();
|
||||||
*/
|
*/
|
||||||
// cfdata->gc->config_dialog = cfd;
|
cfdata->gc->config_dialog = cfd;
|
||||||
return 1; /* Apply was OK */
|
return 1; /* Apply was OK */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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_label_set(mi, _("Maximum Speed"));
|
||||||
e_menu_item_radio_set(mi, 1);
|
e_menu_item_radio_set(mi, 1);
|
||||||
e_menu_item_radio_group_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))
|
if (!strcmp(cpufreq_config->status->cur_governor, l->data))
|
||||||
e_menu_item_toggle_set(mi, 1);
|
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_label_set(mi, buf);
|
||||||
e_menu_item_radio_set(mi, 1);
|
e_menu_item_radio_set(mi, 1);
|
||||||
e_menu_item_radio_group_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)
|
if (cpufreq_config->status->cur_frequency == frequency)
|
||||||
e_menu_item_toggle_set(mi, 1);
|
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;
|
Instance *inst;
|
||||||
Evas_List *l;
|
Evas_List *l;
|
||||||
int active;
|
int active;
|
||||||
|
|
||||||
|
if (cpufreq_config->menu_poll) return 1;
|
||||||
active = cpufreq_config->status->active;
|
active = cpufreq_config->status->active;
|
||||||
if (_cpufreq_status_check_current(cpufreq_config->status))
|
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;
|
char *governor;
|
||||||
|
|
||||||
governor = e_object_data_get(E_OBJECT(mi));
|
governor = data;
|
||||||
if (governor)
|
if (governor)
|
||||||
{
|
{
|
||||||
_cpufreq_set_governor(governor);
|
_cpufreq_set_governor(governor);
|
||||||
|
@ -802,11 +801,8 @@ _cpufreq_menu_frequency(void * data, E_Menu *m, E_Menu_Item *mi)
|
||||||
{
|
{
|
||||||
int frequency;
|
int frequency;
|
||||||
|
|
||||||
frequency = (int)e_object_data_get(E_OBJECT(mi));
|
frequency = (int)data;
|
||||||
if (frequency > 0)
|
if (frequency > 0) _cpufreq_set_frequency(frequency);
|
||||||
{
|
|
||||||
_cpufreq_set_frequency(frequency);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
Loading…
Reference in New Issue