forked from enlightenment/enlightenment
remove E_Comp usage from conf
This commit is contained in:
parent
f9fc4b13de
commit
011fea0f9f
|
@ -11,7 +11,6 @@ struct _E_Configure
|
||||||
{
|
{
|
||||||
E_Object e_obj_inherit;
|
E_Object e_obj_inherit;
|
||||||
|
|
||||||
E_Comp *comp;
|
|
||||||
Evas_Object *win;
|
Evas_Object *win;
|
||||||
Evas *evas;
|
Evas *evas;
|
||||||
Evas_Object *edje;
|
Evas_Object *edje;
|
||||||
|
@ -61,7 +60,7 @@ static Eina_Bool _e_configure_module_update_cb(void *data, int type,
|
||||||
static E_Configure *_e_configure = NULL;
|
static E_Configure *_e_configure = NULL;
|
||||||
|
|
||||||
void
|
void
|
||||||
e_configure_show(E_Comp *comp, const char *params)
|
e_configure_show(const char *params)
|
||||||
{
|
{
|
||||||
E_Configure *eco;
|
E_Configure *eco;
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
|
@ -105,7 +104,6 @@ e_configure_show(E_Comp *comp, const char *params)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
evas_object_data_set(eco->win, "e_conf_win", eco);
|
evas_object_data_set(eco->win, "e_conf_win", eco);
|
||||||
eco->comp = comp;
|
|
||||||
eco->evas = evas_object_evas_get(eco->win);
|
eco->evas = evas_object_evas_get(eco->win);
|
||||||
|
|
||||||
/* Event Handler for Module Updates */
|
/* Event Handler for Module Updates */
|
||||||
|
|
|
@ -201,7 +201,7 @@ static void
|
||||||
_config_item_activate_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__)
|
_config_item_activate_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__)
|
||||||
{
|
{
|
||||||
E_Configure_Cat *ecat = data;
|
E_Configure_Cat *ecat = data;
|
||||||
e_configure_show(e_comp, ecat ? ecat->cat : NULL);
|
e_configure_show(ecat ? ecat->cat : NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -383,14 +383,14 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params)
|
||||||
if ((zone) && (params))
|
if ((zone) && (params))
|
||||||
e_configure_registry_call(params, NULL, params);
|
e_configure_registry_call(params, NULL, params);
|
||||||
else if (zone)
|
else if (zone)
|
||||||
e_configure_show(e_comp, params);
|
e_configure_show(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* menu item callback(s) */
|
/* menu item callback(s) */
|
||||||
static void
|
static void
|
||||||
_e_mod_conf_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__)
|
_e_mod_conf_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__)
|
||||||
{
|
{
|
||||||
e_configure_show(e_comp, NULL);
|
e_configure_show(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -17,7 +17,7 @@ struct _Config
|
||||||
int menu_augmentation;
|
int menu_augmentation;
|
||||||
};
|
};
|
||||||
|
|
||||||
void e_configure_show(E_Comp *comp, const char *params);
|
void e_configure_show(const char *params);
|
||||||
void e_configure_del(void);
|
void e_configure_del(void);
|
||||||
|
|
||||||
E_Config_Dialog *e_int_config_conf_module(Evas_Object *parent, const char *params);
|
E_Config_Dialog *e_int_config_conf_module(Evas_Object *parent, const char *params);
|
||||||
|
|
Loading…
Reference in New Issue