From: Enlightenment S. <no-...@en...> - 2009-12-17 21:43:43
|
Log: don't use EAPI for functions that should not be available outside module! Author: barbieri Date: 2009-12-17 13:41:31 -0800 (Thu, 17 Dec 2009) New Revision: 44524 Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper.h trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h trunk/e/src/modules/conf_wallpaper/e_mod_main.c Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c 2009-12-17 21:41:31 UTC (rev 44524) @@ -58,13 +58,13 @@ #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 @@ 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 @@ 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 @@ 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 @@ } #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 @@ } #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_import(NULL, path); } -EAPI int +int e_int_config_wallpaper_handler_test(Evas_Object *obj, const char *path, void *data) { if (!path) return 0; Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper.h =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper.h 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper.h 2009-12-17 21:41:31 UTC (rev 44524) @@ -7,16 +7,16 @@ #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 Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c 2009-12-17 21:41:31 UTC (rev 44524) @@ -57,7 +57,7 @@ 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; Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h 2009-12-17 21:41:31 UTC (rev 44524) @@ -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 Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c 2009-12-17 21:41:31 UTC (rev 44524) @@ -88,7 +88,7 @@ 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 @@ return win; } -EAPI E_Win * +E_Win * e_int_config_wallpaper_fsel(E_Config_Dialog *parent) { Evas *evas; @@ -362,7 +362,7 @@ return win; } -EAPI void +void e_int_config_wallpaper_import_del(E_Win *win) { Import *import; @@ -380,7 +380,7 @@ if (import) free(import); } -EAPI void +void e_int_config_wallpaper_fsel_del(E_Win *win) { FSel *fsel; Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h 2009-12-17 21:41:31 UTC (rev 44524) @@ -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 Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c 2009-12-17 21:41:31 UTC (rev 44524) @@ -95,7 +95,7 @@ e_config_save_queue(); } -EAPI E_Dialog * +E_Dialog * e_int_config_wallpaper_web(E_Config_Dialog *parent) { E_Dialog *dia; Modified: trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h 2009-12-17 21:41:31 UTC (rev 44524) @@ -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 Modified: trunk/e/src/modules/conf_wallpaper/e_mod_main.c =================================================================== --- trunk/e/src/modules/conf_wallpaper/e_mod_main.c 2009-12-17 11:58:15 UTC (rev 44523) +++ trunk/e/src/modules/conf_wallpaper/e_mod_main.c 2009-12-17 21:41:31 UTC (rev 44524) @@ -73,6 +73,7 @@ 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; |