discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=011fea0f9fa349f4007393fa9b43854336c10b51
commit 011fea0f9fa349f4007393fa9b43854336c10b51 Author: Mike Blumenkrantz <[email protected]> Date: Wed Mar 18 17:41:25 2015 -0400 remove E_Comp usage from conf --- src/modules/conf/e_conf.c | 4 +--- src/modules/conf/e_mod_main.c | 6 +++--- src/modules/conf/e_mod_main.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c index 4bc5b7b..732c8b0 100644 --- a/src/modules/conf/e_conf.c +++ b/src/modules/conf/e_conf.c @@ -11,7 +11,6 @@ struct _E_Configure { E_Object e_obj_inherit; - E_Comp *comp; Evas_Object *win; Evas *evas; 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; void -e_configure_show(E_Comp *comp, const char *params) +e_configure_show(const char *params) { E_Configure *eco; Evas_Object *o; @@ -105,7 +104,6 @@ e_configure_show(E_Comp *comp, const char *params) return; } evas_object_data_set(eco->win, "e_conf_win", eco); - eco->comp = comp; eco->evas = evas_object_evas_get(eco->win); /* Event Handler for Module Updates */ diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c index 95443ab..3f1a852 100644 --- a/src/modules/conf/e_mod_main.c +++ b/src/modules/conf/e_mod_main.c @@ -201,7 +201,7 @@ static void _config_item_activate_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__) { E_Configure_Cat *ecat = data; - e_configure_show(e_comp, ecat ? ecat->cat : NULL); + e_configure_show(ecat ? ecat->cat : NULL); } static void @@ -383,14 +383,14 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params) if ((zone) && (params)) e_configure_registry_call(params, NULL, params); else if (zone) - e_configure_show(e_comp, params); + e_configure_show(params); } /* menu item callback(s) */ static void _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 diff --git a/src/modules/conf/e_mod_main.h b/src/modules/conf/e_mod_main.h index 009f022..a285ece 100644 --- a/src/modules/conf/e_mod_main.h +++ b/src/modules/conf/e_mod_main.h @@ -17,7 +17,7 @@ struct _Config 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); E_Config_Dialog *e_int_config_conf_module(Evas_Object *parent, const char *params); --
