discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9e5e2767c754033f0425af4e1ad5c53d99b21066
commit 9e5e2767c754033f0425af4e1ad5c53d99b21066 Author: Mike Blumenkrantz <[email protected]> Date: Wed Mar 18 11:33:01 2015 -0400 remove E_Comp from e_desktop*edit apis --- src/bin/e_desktop_editor.c | 12 ++++++------ src/bin/e_desktop_editor.h | 4 ++-- src/bin/e_fm.c | 2 +- src/bin/e_int_client_menu.c | 2 +- src/modules/conf_applications/e_int_config_apps.c | 2 +- src/modules/conf_applications/e_int_config_apps_personal.c | 2 +- src/modules/everything/evry_plug_apps.c | 4 ++-- src/modules/ibar/e_mod_main.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/bin/e_desktop_editor.c b/src/bin/e_desktop_editor.c index c75e4f5..f6e2033 100644 --- a/src/bin/e_desktop_editor.c +++ b/src/bin/e_desktop_editor.c @@ -38,7 +38,7 @@ struct _E_Config_Dialog_Data /* local subsystem functions */ -static int _e_desktop_edit_view_create(E_Desktop_Edit *editor, E_Comp *c); +static int _e_desktop_edit_view_create(E_Desktop_Edit *editor); static void _e_desktop_edit_free(E_Desktop_Edit *editor); static void *_e_desktop_edit_create_data(E_Config_Dialog *cfd); static void _e_desktop_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data); @@ -184,7 +184,7 @@ e_desktop_client_create(E_Client *ec) } EAPI E_Desktop_Edit * -e_desktop_border_edit(E_Comp *c, E_Client *ec) +e_desktop_border_edit(E_Client *ec) { E_Desktop_Edit *editor; int new_desktop = 0; @@ -217,7 +217,7 @@ e_desktop_border_edit(E_Comp *c, E_Client *ec) "change.")); } #endif - if (!_e_desktop_edit_view_create(editor, c)) + if (!_e_desktop_edit_view_create(editor)) { e_object_del(E_OBJECT(editor)); editor = NULL; @@ -229,14 +229,14 @@ e_desktop_border_edit(E_Comp *c, E_Client *ec) } EAPI E_Desktop_Edit * -e_desktop_edit(E_Comp *c, Efreet_Desktop *desktop) +e_desktop_edit(Efreet_Desktop *desktop) { E_Desktop_Edit *editor; editor = E_OBJECT_ALLOC(E_Desktop_Edit, E_DESKTOP_EDIT_TYPE, _e_desktop_edit_free); if (!editor) return NULL; if (desktop) editor->desktop = desktop; - if (!_e_desktop_edit_view_create(editor, c)) + if (!_e_desktop_edit_view_create(editor)) { e_object_del(E_OBJECT(editor)); editor = NULL; @@ -245,7 +245,7 @@ e_desktop_edit(E_Comp *c, Efreet_Desktop *desktop) } static int -_e_desktop_edit_view_create(E_Desktop_Edit *editor, E_Comp *c EINA_UNUSED) +_e_desktop_edit_view_create(E_Desktop_Edit *editor) { E_Config_Dialog_View *v; diff --git a/src/bin/e_desktop_editor.h b/src/bin/e_desktop_editor.h index 786e1d7..d0a2ce6 100644 --- a/src/bin/e_desktop_editor.h +++ b/src/bin/e_desktop_editor.h @@ -33,8 +33,8 @@ struct _E_Desktop_Edit }; EAPI Efreet_Desktop *e_desktop_client_create(E_Client *ec); -EAPI E_Desktop_Edit *e_desktop_border_edit(E_Comp *c, E_Client *ec); -EAPI E_Desktop_Edit *e_desktop_edit(E_Comp *c, Efreet_Desktop *desktop); +EAPI E_Desktop_Edit *e_desktop_border_edit(E_Client *ec); +EAPI E_Desktop_Edit *e_desktop_edit(Efreet_Desktop *desktop); #endif #endif diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index f1fed33..d9cd379 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -10883,7 +10883,7 @@ _e_fm2_file_application_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item return; desktop = efreet_desktop_get(buf); - e_desktop_edit(NULL, desktop); + e_desktop_edit(desktop); } static void diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c index ab6279c..d464cdf 100644 --- a/src/bin/e_int_client_menu.c +++ b/src/bin/e_int_client_menu.c @@ -607,7 +607,7 @@ _e_client_menu_cb_icon_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi _ E_Client *ec; ec = data; - e_desktop_border_edit(e_comp, ec); + e_desktop_border_edit(ec); } static void diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c index 170981c..6e91516 100644 --- a/src/modules/conf_applications/e_int_config_apps.c +++ b/src/modules/conf_applications/e_int_config_apps.c @@ -53,7 +53,7 @@ e_int_config_apps_add(Evas_Object *parent EINA_UNUSED, const char *params __UNUS { E_Desktop_Edit *ed; - if (!(ed = e_desktop_edit(NULL, NULL))) return NULL; + if (!(ed = e_desktop_edit(NULL))) return NULL; return ed->cfd; } diff --git a/src/modules/conf_applications/e_int_config_apps_personal.c b/src/modules/conf_applications/e_int_config_apps_personal.c index dc6bbc8..a589585 100644 --- a/src/modules/conf_applications/e_int_config_apps_personal.c +++ b/src/modules/conf_applications/e_int_config_apps_personal.c @@ -182,7 +182,7 @@ _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il) static void _btn_cb_add(void *data __UNUSED__, void *data2 __UNUSED__) { - e_desktop_edit(NULL, NULL); + e_desktop_edit(NULL); } static void diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c index 282bc45..337b74d 100644 --- a/src/modules/everything/evry_plug_apps.c +++ b/src/modules/everything/evry_plug_apps.c @@ -933,7 +933,7 @@ _edit_app_action(Evry_Action *act) desktop->exec = strdup(app->file); } - e_desktop_edit(NULL, desktop); + e_desktop_edit(desktop); return 1; } @@ -1010,7 +1010,7 @@ _new_app_action(Evry_Action *act) desktop->mime_types = eina_list_clone(app->desktop->mime_types); } if (desktop) - e_desktop_edit(NULL, desktop); + e_desktop_edit(desktop); return 1; } diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 848d0c9..a74d98a 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -1034,7 +1034,7 @@ _ibar_cb_menu_icon_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi IBar_Icon *ic; ic = data; - e_desktop_edit(e_comp, ic->app); + e_desktop_edit(ic->app); } static void @@ -2073,7 +2073,7 @@ _ibar_inst_cb_drop(void *data, const char *type, void *event_info) { app = e_desktop_client_create(ec); efreet_desktop_save(app); - e_desktop_edit(NULL, app); + e_desktop_edit(app); } } else if (!strcmp(type, "text/uri-list")) --
