From b36699e97cf3c1e33b3abded5e4dc8b86269c7c7 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Thu, 17 Dec 2009 21:41:31 +0000 Subject: [PATCH] don't use EAPI for functions that should not be available outside module! SVN revision: 44524 --- .../conf_wallpaper/e_int_config_wallpaper.c | 16 ++++++++-------- .../conf_wallpaper/e_int_config_wallpaper.h | 16 ++++++++-------- .../e_int_config_wallpaper_gradient.c | 2 +- .../e_int_config_wallpaper_gradient.h | 6 +++--- .../e_int_config_wallpaper_import.c | 8 ++++---- .../e_int_config_wallpaper_import.h | 10 +++++----- .../conf_wallpaper/e_int_config_wallpaper_web.c | 2 +- .../conf_wallpaper/e_int_config_wallpaper_web.h | 6 +++--- src/modules/conf_wallpaper/e_mod_main.c | 1 + 9 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c index 381088b7c..39ab878a6 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c @@ -58,13 +58,13 @@ struct _E_Config_Dialog_Data #endif }; -EAPI E_Config_Dialog * +E_Config_Dialog * e_int_config_wallpaper(E_Container *con, const char *params __UNUSED__) { return _e_int_config_wallpaper_desk(con, -1, -1, -1, -1); } -EAPI E_Config_Dialog * +E_Config_Dialog * e_int_config_wallpaper_desk(E_Container *con, const char *params) { int con_num, zone_num, desk_x, desk_y; @@ -113,7 +113,7 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de return cfd; } -EAPI void +void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file) { E_Config_Dialog_Data *cfdata; @@ -135,7 +135,7 @@ e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file) if (cfdata->o_fm) e_widget_change(cfdata->o_fm); } -EAPI void +void e_int_config_wallpaper_import_done(E_Config_Dialog *dia) { E_Config_Dialog_Data *cfdata; @@ -144,7 +144,7 @@ e_int_config_wallpaper_import_done(E_Config_Dialog *dia) cfdata->win_import = NULL; } -EAPI void +void e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia) { E_Config_Dialog_Data *cfdata; @@ -154,7 +154,7 @@ e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia) } #ifdef HAVE_EXCHANGE -EAPI void +void e_int_config_wallpaper_web_done(E_Config_Dialog *dia) { E_Config_Dialog_Data *cfdata; @@ -164,7 +164,7 @@ e_int_config_wallpaper_web_done(E_Config_Dialog *dia) } #endif -EAPI void +void e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data) { const char *dev, *fpath; @@ -189,7 +189,7 @@ e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *dat e_int_config_wallpaper_import(NULL, path); } -EAPI int +int e_int_config_wallpaper_handler_test(Evas_Object *obj, const char *path, void *data) { if (!path) return 0; diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.h b/src/modules/conf_wallpaper/e_int_config_wallpaper.h index c22a579d8..3228c236f 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper.h +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.h @@ -7,16 +7,16 @@ typedef struct _E_Config_Wallpaper E_Config_Wallpaper; #ifndef E_INT_CONFIG_WALLPAPER_H #define E_INT_CONFIG_WALLPAPER_H -EAPI E_Config_Dialog *e_int_config_wallpaper(E_Container *con, const char *params __UNUSED__); -EAPI E_Config_Dialog *e_int_config_wallpaper_desk(E_Container *con, const char *params); +E_Config_Dialog *e_int_config_wallpaper(E_Container *con, const char *params __UNUSED__); +E_Config_Dialog *e_int_config_wallpaper_desk(E_Container *con, const char *params); -EAPI void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file); -EAPI void e_int_config_wallpaper_import_done(E_Config_Dialog *dia); -EAPI void e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia); -EAPI void e_int_config_wallpaper_web_done(E_Config_Dialog *dia); +void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file); +void e_int_config_wallpaper_import_done(E_Config_Dialog *dia); +void e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia); +void e_int_config_wallpaper_web_done(E_Config_Dialog *dia); -EAPI void e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data); -EAPI int e_int_config_wallpaper_handler_test(Evas_Object *obj, const char *path, void *data); +void e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data); +int e_int_config_wallpaper_handler_test(Evas_Object *obj, const char *path, void *data); #endif #endif diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c index 4c07623eb..e47b144b8 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c @@ -57,7 +57,7 @@ static Evas_Object *_preview_widget_add(Evas *evas); static void _import_cb_on_change(void *data, Evas_Object *obj); static void _import_cb_color_swap(void *data, void *data2); -EAPI E_Dialog * +E_Dialog * e_int_config_wallpaper_gradient(E_Config_Dialog *parent) { Evas *evas; diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h index 7bf25879a..cb1b4a040 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h @@ -3,8 +3,8 @@ #ifndef E_INT_CONFIG_WALLPAPER_GRADIENT_H #define E_INT_CONFIG_WALLPAPER_GRADIENT_H -EAPI E_Dialog *e_int_config_wallpaper_gradient(E_Config_Dialog *parent); -EAPI void e_int_config_wallpaper_gradient_del(E_Dialog *dia); - +E_Dialog *e_int_config_wallpaper_gradient(E_Config_Dialog *parent); +void e_int_config_wallpaper_gradient_del(E_Dialog *dia); + #endif #endif diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c index 45442b41d..32b35b124 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c @@ -88,7 +88,7 @@ static void _import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *eve static void _fsel_cb_wid_on_focus(void *data, Evas_Object *obj); static void _fsel_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event); -EAPI E_Win * +E_Win * e_int_config_wallpaper_import(void *data, const char *path) { Evas *evas; @@ -240,7 +240,7 @@ e_int_config_wallpaper_import(void *data, const char *path) return win; } -EAPI E_Win * +E_Win * e_int_config_wallpaper_fsel(E_Config_Dialog *parent) { Evas *evas; @@ -362,7 +362,7 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent) return win; } -EAPI void +void e_int_config_wallpaper_import_del(E_Win *win) { Import *import; @@ -380,7 +380,7 @@ e_int_config_wallpaper_import_del(E_Win *win) if (import) free(import); } -EAPI void +void e_int_config_wallpaper_fsel_del(E_Win *win) { FSel *fsel; diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h index 92ad51ad3..7eabaa898 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h @@ -3,11 +3,11 @@ #ifndef E_INT_CONFIG_WALLPAPER_IMPORT_H #define E_INT_CONFIG_WALLPAPER_IMPORT_H -EAPI E_Win *e_int_config_wallpaper_fsel(E_Config_Dialog *parent); -EAPI E_Win *e_int_config_wallpaper_import(void *data, const char *path); -EAPI void e_int_config_wallpaper_del(E_Win *win); -EAPI void e_int_config_wallpaper_fsel_del(E_Win *win); -EAPI void e_int_config_wallpaper_import_del(E_Win *win); +E_Win *e_int_config_wallpaper_fsel(E_Config_Dialog *parent); +E_Win *e_int_config_wallpaper_import(void *data, const char *path); +void e_int_config_wallpaper_del(E_Win *win); +void e_int_config_wallpaper_fsel_del(E_Win *win); +void e_int_config_wallpaper_import_del(E_Win *win); #endif #endif diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c index ee83daf25..711936b99 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c @@ -95,7 +95,7 @@ _web_apply(const char *path, void *data) e_config_save_queue(); } -EAPI E_Dialog * +E_Dialog * e_int_config_wallpaper_web(E_Config_Dialog *parent) { E_Dialog *dia; diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h index 34a7853a1..9152f2ee8 100644 --- a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h +++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h @@ -3,8 +3,8 @@ #ifndef E_INT_CONFIG_WALLPAPER_WEB_H #define E_INT_CONFIG_WALLPAPER_WEB_H -EAPI E_Dialog *e_int_config_wallpaper_web(E_Config_Dialog *parent); -EAPI void e_int_config_wallpaper_web_del(E_Dialog *dia); - +E_Dialog *e_int_config_wallpaper_web(E_Config_Dialog *parent); +void e_int_config_wallpaper_web_del(E_Dialog *dia); + #endif #endif diff --git a/src/modules/conf_wallpaper/e_mod_main.c b/src/modules/conf_wallpaper/e_mod_main.c index b96a9ad0e..b176ef909 100644 --- a/src/modules/conf_wallpaper/e_mod_main.c +++ b/src/modules/conf_wallpaper/e_mod_main.c @@ -73,6 +73,7 @@ e_modapi_shutdown(E_Module *m) e_fm2_mime_handler_mime_del(import_hdl, "image/png"); e_fm2_mime_handler_mime_del(import_hdl, "image/jpeg"); e_fm2_mime_handler_free(import_hdl); + import_hdl = NULL; } conf_module = NULL;