From 6f2213cb25c6ec810bfeeab106e4fcbfe3922792 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Mon, 22 Nov 2010 15:21:32 +0000 Subject: [PATCH] convert init/shutdown to EINTERN, move some to _update(). Do not abuse the concept of e_*_init(), make them call-once and those that needed multiple call are renamed to e_*_update(). To make sure convert them to EINTERN so the symbols are not exported. Actually I guess too much is exported as EAPI while they should be EINTERN, but that would require manual investigation, while this patch was basically created with sed + grep. SVN revision: 54795 --- src/bin/e_acpi.c | 4 ++-- src/bin/e_acpi.h | 4 ++-- src/bin/e_actions.c | 4 ++-- src/bin/e_actions.h | 4 ++-- src/bin/e_alert.c | 5 +++-- src/bin/e_alert.h | 4 ++-- src/bin/e_atoms.c | 4 ++-- src/bin/e_atoms.h | 4 ++-- src/bin/e_bg.c | 4 ++-- src/bin/e_bg.h | 4 ++-- src/bin/e_bindings.c | 4 ++-- src/bin/e_bindings.h | 4 ++-- src/bin/e_border.c | 4 ++-- src/bin/e_border.h | 4 ++-- src/bin/e_color_class.c | 4 ++-- src/bin/e_color_class.h | 4 ++-- src/bin/e_config.c | 4 ++-- src/bin/e_config.h | 4 ++-- src/bin/e_configure.c | 2 +- src/bin/e_configure.h | 2 +- src/bin/e_container.c | 4 ++-- src/bin/e_container.h | 4 ++-- src/bin/e_desk.c | 4 ++-- src/bin/e_desk.h | 4 ++-- src/bin/e_desklock.c | 4 ++-- src/bin/e_desklock.h | 4 ++-- src/bin/e_dnd.c | 4 ++-- src/bin/e_dnd.h | 4 ++-- src/bin/e_dpms.c | 4 ++-- src/bin/e_dpms.h | 4 ++-- src/bin/e_exec.c | 4 ++-- src/bin/e_exec.h | 4 ++-- src/bin/e_exehist.c | 4 ++-- src/bin/e_exehist.h | 4 ++-- src/bin/e_filereg.c | 4 ++-- src/bin/e_filereg.h | 4 ++-- src/bin/e_fm.c | 4 ++-- src/bin/e_fm.h | 4 ++-- src/bin/e_fm_custom.c | 4 ++-- src/bin/e_fm_custom.h | 4 ++-- src/bin/e_fm_op_registry.c | 4 ++-- src/bin/e_fm_op_registry.h | 4 ++-- src/bin/e_focus.c | 4 ++-- src/bin/e_focus.h | 4 ++-- src/bin/e_font.c | 4 ++-- src/bin/e_font.h | 4 ++-- src/bin/e_gadcon.c | 4 ++-- src/bin/e_gadcon.h | 4 ++-- src/bin/e_grabinput.c | 4 ++-- src/bin/e_grabinput.h | 4 ++-- src/bin/e_hints.c | 6 ++--- src/bin/e_hints.h | 6 ++--- src/bin/e_init.c | 4 ++-- src/bin/e_init.h | 4 ++-- src/bin/e_init_main.c | 46 ++++++++++++++++++++++++++++++++++---- src/bin/e_int_menus.c | 2 +- src/bin/e_intl.c | 8 +++---- src/bin/e_intl.h | 8 +++---- src/bin/e_intl_data.c | 4 ++-- src/bin/e_intl_data.h | 4 ++-- src/bin/e_ipc.c | 4 ++-- src/bin/e_ipc.h | 4 ++-- src/bin/e_ipc_codec.c | 4 ++-- src/bin/e_ipc_codec.h | 4 ++-- src/bin/e_main.c | 6 ++--- src/bin/e_manager.c | 4 ++-- src/bin/e_manager.h | 4 ++-- src/bin/e_menu.c | 4 ++-- src/bin/e_menu.h | 4 ++-- src/bin/e_module.c | 4 ++-- src/bin/e_module.h | 4 ++-- src/bin/e_mouse.c | 2 +- src/bin/e_mouse.h | 2 +- src/bin/e_moveresize.c | 4 ++-- src/bin/e_moveresize.h | 4 ++-- src/bin/e_msg.c | 4 ++-- src/bin/e_msg.h | 4 ++-- src/bin/e_msgbus.c | 4 ++-- src/bin/e_msgbus.h | 4 ++-- src/bin/e_order.c | 4 ++-- src/bin/e_order.h | 4 ++-- src/bin/e_pointer.c | 4 ++-- src/bin/e_pointer.h | 4 ++-- src/bin/e_popup.c | 4 ++-- src/bin/e_popup.h | 4 ++-- src/bin/e_powersave.c | 4 ++-- src/bin/e_powersave.h | 4 ++-- src/bin/e_prefix.c | 2 +- src/bin/e_prefix.h | 2 +- src/bin/e_randr.c | 4 ++-- src/bin/e_randr.h | 4 ++-- src/bin/e_remember.c | 4 ++-- src/bin/e_remember.h | 4 ++-- src/bin/e_scale.c | 4 ++-- src/bin/e_scale.h | 4 ++-- src/bin/e_screensaver.c | 4 ++-- src/bin/e_screensaver.h | 4 ++-- src/bin/e_shelf.c | 6 ++--- src/bin/e_shelf.h | 6 ++--- src/bin/e_sys.c | 4 ++-- src/bin/e_sys.h | 4 ++-- src/bin/e_theme.c | 4 ++-- src/bin/e_theme.h | 4 ++-- src/bin/e_thumb.c | 4 ++-- src/bin/e_thumb.h | 4 ++-- src/bin/e_toolbar.c | 4 ++-- src/bin/e_toolbar.h | 4 ++-- src/bin/e_win.c | 4 ++-- src/bin/e_win.h | 4 ++-- src/bin/e_xinerama.c | 4 ++-- src/bin/e_xinerama.h | 4 ++-- src/bin/e_zone.c | 4 ++-- src/bin/e_zone.h | 4 ++-- 113 files changed, 269 insertions(+), 230 deletions(-) diff --git a/src/bin/e_acpi.c b/src/bin/e_acpi.c index f16bada2c..bac5ba60c 100644 --- a/src/bin/e_acpi.c +++ b/src/bin/e_acpi.c @@ -60,7 +60,7 @@ EAPI int E_EVENT_ACPI_VIDEO = 0; EAPI int E_EVENT_ACPI_WIFI = 0; /* public functions */ -EAPI int +EINTERN int e_acpi_init(void) { const ACPIDevice *dev; @@ -120,7 +120,7 @@ e_acpi_init(void) return 1; } -EAPI int +EINTERN int e_acpi_shutdown(void) { Ecore_Event_Handler *hdl; diff --git a/src/bin/e_acpi.h b/src/bin/e_acpi.h index f9f746e66..0786679f7 100644 --- a/src/bin/e_acpi.h +++ b/src/bin/e_acpi.h @@ -48,8 +48,8 @@ struct _E_Event_Acpi int type, signal, status; }; -EAPI int e_acpi_init(void); -EAPI int e_acpi_shutdown(void); +EINTERN int e_acpi_init(void); +EINTERN int e_acpi_shutdown(void); EAPI void e_acpi_events_freeze(void); EAPI void e_acpi_events_thaw(void); diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index fdd084655..271608b5d 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -2568,7 +2568,7 @@ static Eina_List *action_groups = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_actions_init(void) { E_Action *act; @@ -2989,7 +2989,7 @@ e_actions_init(void) return 1; } -EAPI int +EINTERN int e_actions_shutdown(void) { e_action_predef_name_all_del(); diff --git a/src/bin/e_actions.h b/src/bin/e_actions.h index 0685f5432..7381d0dcc 100644 --- a/src/bin/e_actions.h +++ b/src/bin/e_actions.h @@ -45,8 +45,8 @@ struct _E_Action_Group Eina_List *acts; }; -EAPI int e_actions_init(void); -EAPI int e_actions_shutdown(void); +EINTERN int e_actions_init(void); +EINTERN int e_actions_shutdown(void); EAPI Eina_List *e_action_name_list(void); EAPI E_Action *e_action_add(const char *name); diff --git a/src/bin/e_alert.c b/src/bin/e_alert.c index 50bd3c497..cb5bb2ef9 100644 --- a/src/bin/e_alert.c +++ b/src/bin/e_alert.c @@ -1,3 +1,4 @@ +#include "e.h" #include "e_alert.h" #include @@ -25,7 +26,7 @@ static int ww = 320, hh = 240, wx = 20, wy = 20; EAPI unsigned long e_alert_composite_win = 0; /* externally accessible functions */ -EAPI int +EINTERN int e_alert_init(const char *disp) { XGCValues gcv; @@ -72,7 +73,7 @@ e_alert_init(const char *disp) return 1; } -EAPI int +EINTERN int e_alert_shutdown(void) { XDestroyWindow(dd, win); diff --git a/src/bin/e_alert.h b/src/bin/e_alert.h index d93309783..7c821dda6 100644 --- a/src/bin/e_alert.h +++ b/src/bin/e_alert.h @@ -4,8 +4,8 @@ #ifndef E_ALERT_H #define E_ALERT_H -int e_alert_init(const char *disp); -int e_alert_shutdown(void); +EINTERN int e_alert_init(const char *disp); +EINTERN int e_alert_shutdown(void); void e_alert_show(const char *text); diff --git a/src/bin/e_atoms.c b/src/bin/e_atoms.c index 44016de31..094e44f59 100644 --- a/src/bin/e_atoms.c +++ b/src/bin/e_atoms.c @@ -14,7 +14,7 @@ EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0; EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0; /* externally accessible functions */ -EAPI int +EINTERN int e_atoms_init(void) { const char *atom_names[] = { @@ -47,7 +47,7 @@ e_atoms_init(void) return 1; } -EAPI int +EINTERN int e_atoms_shutdown(void) { /* Nothing really to do here yet, just present for consistency right now */ diff --git a/src/bin/e_atoms.h b/src/bin/e_atoms.h index 4ffdd066d..871489ee5 100644 --- a/src/bin/e_atoms.h +++ b/src/bin/e_atoms.h @@ -25,8 +25,8 @@ extern EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE; extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE; extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED; -EAPI int e_atoms_init(void); -EAPI int e_atoms_shutdown(void); +EINTERN int e_atoms_init(void); +EINTERN int e_atoms_shutdown(void); #endif #endif diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c index b7daecfde..88f4f91c4 100644 --- a/src/bin/e_bg.c +++ b/src/bin/e_bg.c @@ -40,7 +40,7 @@ struct _E_Bg_Image_Import_Handle }; /* externally accessible functions */ -EAPI int +EINTERN int e_bg_init(void) { Eina_List *l = NULL; @@ -72,7 +72,7 @@ e_bg_init(void) return 1; } -EAPI int +EINTERN int e_bg_shutdown(void) { Eina_List *l = NULL; diff --git a/src/bin/e_bg.h b/src/bin/e_bg.h index 5e296b4a3..54e48cbb7 100644 --- a/src/bin/e_bg.h +++ b/src/bin/e_bg.h @@ -25,8 +25,8 @@ struct _E_Event_Bg_Update int desk_y; }; -EAPI int e_bg_init(void); -EAPI int e_bg_shutdown(void); +EINTERN int e_bg_init(void); +EINTERN int e_bg_shutdown(void); EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y); EAPI const char *e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y); diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c index 660771582..c4b4599b7 100644 --- a/src/bin/e_bindings.c +++ b/src/bin/e_bindings.c @@ -37,7 +37,7 @@ struct _E_Binding_Edge_Data /* externally accessible functions */ -EAPI int +EINTERN int e_bindings_init(void) { E_Config_Binding_Signal *ebs; @@ -95,7 +95,7 @@ e_bindings_init(void) return 1; } -EAPI int +EINTERN int e_bindings_shutdown(void) { E_FREE_LIST(mouse_bindings, _e_bindings_mouse_free); diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h index 7aebebcf7..4818427c5 100644 --- a/src/bin/e_bindings.h +++ b/src/bin/e_bindings.h @@ -100,8 +100,8 @@ struct _E_Binding_Acpi const char *action, *params; }; -EAPI int e_bindings_init(void); -EAPI int e_bindings_shutdown(void); +EINTERN int e_bindings_init(void); +EINTERN int e_bindings_shutdown(void); EAPI void e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); EAPI void e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 3f427f572..102b0650e 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -169,7 +169,7 @@ ecore_x_window_gravity_set(bd->client.shell_win, grav); \ ecore_x_window_gravity_set(bd->client.win, grav); /* externally accessible functions */ -EAPI int +EINTERN int e_border_init(void) { handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, _e_border_cb_window_show_request, NULL)); @@ -225,7 +225,7 @@ e_border_init(void) return 1; } -EAPI int +EINTERN int e_border_shutdown(void) { E_FREE_LIST(handlers, ecore_event_handler_del); diff --git a/src/bin/e_border.h b/src/bin/e_border.h index fbbff9fa9..3811fc3dc 100644 --- a/src/bin/e_border.h +++ b/src/bin/e_border.h @@ -605,8 +605,8 @@ struct _E_Event_Border_Stack E_Stacking type; }; -EAPI int e_border_init(void); -EAPI int e_border_shutdown(void); +EINTERN int e_border_init(void); +EINTERN int e_border_shutdown(void); EAPI E_Border *e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal); EAPI void e_border_free(E_Border *bd); diff --git a/src/bin/e_color_class.c b/src/bin/e_color_class.c index 73f5dd6fd..f209fa5dd 100644 --- a/src/bin/e_color_class.c +++ b/src/bin/e_color_class.c @@ -1,6 +1,6 @@ #include "e.h" -EAPI int +EINTERN int e_color_class_init(void) { const Eina_List *l; @@ -20,7 +20,7 @@ e_color_class_init(void) return 1; } -EAPI int +EINTERN int e_color_class_shutdown(void) { return 1; diff --git a/src/bin/e_color_class.h b/src/bin/e_color_class.h index 3c419124f..767540986 100644 --- a/src/bin/e_color_class.h +++ b/src/bin/e_color_class.h @@ -14,8 +14,8 @@ struct _E_Color_Class int r3, g3, b3, a3; }; -EAPI int e_color_class_init(void); -EAPI int e_color_class_shutdown(void); +EINTERN int e_color_class_init(void); +EINTERN int e_color_class_shutdown(void); EAPI void e_color_class_instance_set(E_Color_Class *cc, int r, int g, int b, int a, diff --git a/src/bin/e_config.c b/src/bin/e_config.c index cf8803448..98180d4b1 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -117,7 +117,7 @@ _e_config_profile_name_get(Eet_File *ef) } /* externally accessible functions */ -EAPI int +EINTERN int e_config_init(void) { E_EVENT_CONFIG_ICON_THEME = ecore_event_type_new(); @@ -883,7 +883,7 @@ e_config_init(void) return 1; } -EAPI int +EINTERN int e_config_shutdown(void) { E_FREE(_e_config_profile); diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 7079dccd8..d985c934f 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -501,8 +501,8 @@ struct _E_Event_Config_Icon_Theme const char *icon_theme; }; -EAPI int e_config_init(void); -EAPI int e_config_shutdown(void); +EINTERN int e_config_init(void); +EINTERN int e_config_shutdown(void); EAPI void e_config_load(void); diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 40c12f53c..6fe14822a 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -22,7 +22,7 @@ static struct { const char *data; } custom_desktop_exec = { NULL, NULL }; -EAPI void +EINTERN void e_configure_init(void) { e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions"); diff --git a/src/bin/e_configure.h b/src/bin/e_configure.h index 13beebc19..85c6ac600 100644 --- a/src/bin/e_configure.h +++ b/src/bin/e_configure.h @@ -37,7 +37,7 @@ EAPI void e_configure_registry_category_del(const char *path); EAPI void e_configure_registry_call(const char *path, E_Container *con, const char *params); EAPI int e_configure_registry_exists(const char *path); EAPI void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, E_Container *con, const char *params, Efreet_Desktop *desktop), const void *data); -EAPI void e_configure_init(void); +EINTERN void e_configure_init(void); extern EAPI Eina_List *e_configure_registry; diff --git a/src/bin/e_container.c b/src/bin/e_container.c index e6b8a42cf..01a834ce6 100644 --- a/src/bin/e_container.c +++ b/src/bin/e_container.c @@ -30,7 +30,7 @@ static int container_count; static Eina_List *handlers = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_container_init(void) { E_EVENT_CONTAINER_RESIZE = ecore_event_type_new(); @@ -45,7 +45,7 @@ e_container_init(void) return 1; } -EAPI int +EINTERN int e_container_shutdown(void) { E_FREE_LIST(handlers, ecore_event_handler_del); diff --git a/src/bin/e_container.h b/src/bin/e_container.h index 70030ab30..876edcd19 100644 --- a/src/bin/e_container.h +++ b/src/bin/e_container.h @@ -84,8 +84,8 @@ struct _E_Event_Container_Resize E_Container *container; }; -EAPI int e_container_init(void); -EAPI int e_container_shutdown(void); +EINTERN int e_container_init(void); +EINTERN int e_container_shutdown(void); EAPI E_Container *e_container_new(E_Manager *man); EAPI void e_container_show(E_Container *con); diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index ead4a0dd3..8effb697b 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -24,7 +24,7 @@ EAPI int E_EVENT_DESK_AFTER_SHOW = 0; EAPI int E_EVENT_DESK_DESKSHOW = 0; EAPI int E_EVENT_DESK_NAME_CHANGE = 0; -EAPI int +EINTERN int e_desk_init(void) { E_EVENT_DESK_SHOW = ecore_event_type_new(); @@ -35,7 +35,7 @@ e_desk_init(void) return 1; } -EAPI int +EINTERN int e_desk_shutdown(void) { return 1; diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h index 57f17c284..dc2589e13 100644 --- a/src/bin/e_desk.h +++ b/src/bin/e_desk.h @@ -49,8 +49,8 @@ struct _E_Event_Desk_Name_Change E_Desk *desk; }; -EAPI int e_desk_init(void); -EAPI int e_desk_shutdown(void); +EINTERN int e_desk_init(void); +EINTERN int e_desk_shutdown(void); EAPI E_Desk *e_desk_new(E_Zone *zone, int x, int y); EAPI void e_desk_name_set(E_Desk *desk, const char *name); EAPI void e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *name); diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index 90b1d60b9..ef5219928 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -91,7 +91,7 @@ static void _e_desklock_ask_presentation_mode(void); EAPI int E_EVENT_DESKLOCK = 0; -EAPI int +EINTERN int e_desklock_init(void) { /* A poller to tick every 256 ticks, watching for an idle user */ @@ -106,7 +106,7 @@ e_desklock_init(void) return 1; } -EAPI int +EINTERN int e_desklock_shutdown(void) { e_desklock_hide(); diff --git a/src/bin/e_desklock.h b/src/bin/e_desklock.h index 11ee6a045..e40134af4 100644 --- a/src/bin/e_desklock.h +++ b/src/bin/e_desklock.h @@ -11,8 +11,8 @@ struct _E_Event_Desklock int on; }; -EAPI int e_desklock_init(void); -EAPI int e_desklock_shutdown(void); +EINTERN int e_desklock_init(void); +EINTERN int e_desklock_shutdown(void); EAPI int e_desklock_show(void); EAPI int e_desklock_show_autolocked(void); diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c index 8c35a4560..93833bd81 100644 --- a/src/bin/e_dnd.c +++ b/src/bin/e_dnd.c @@ -71,7 +71,7 @@ static Ecore_X_Atom _action; /* externally accessible functions */ -EAPI int +EINTERN int e_dnd_init(void) { _type_text_uri_list = eina_stringshare_add("text/uri-list"); @@ -123,7 +123,7 @@ e_dnd_init(void) return 1; } -EAPI int +EINTERN int e_dnd_shutdown(void) { E_FREE_LIST(_drag_list, e_object_del); diff --git a/src/bin/e_dnd.h b/src/bin/e_dnd.h index cbcb16494..355909c14 100644 --- a/src/bin/e_dnd.h +++ b/src/bin/e_dnd.h @@ -104,8 +104,8 @@ struct _E_Event_Dnd_Drop int x, y; }; -EAPI int e_dnd_init(void); -EAPI int e_dnd_shutdown(void); +EINTERN int e_dnd_init(void); +EINTERN int e_dnd_shutdown(void); EAPI int e_dnd_active(void); diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c index 7b0d4e03b..aa27b162b 100644 --- a/src/bin/e_dpms.c +++ b/src/bin/e_dpms.c @@ -93,7 +93,7 @@ _e_dpms_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *e return ECORE_CALLBACK_PASS_ON; } -EAPI int +EINTERN int e_dpms_init(void) { _e_dpms_handler_config_mode = ecore_event_handler_add @@ -129,7 +129,7 @@ e_dpms_init(void) return 1; } -EAPI int +EINTERN int e_dpms_shutdown(void) { if (_e_dpms_handler_config_mode) diff --git a/src/bin/e_dpms.h b/src/bin/e_dpms.h index 2b71e8cf3..c1076d41c 100644 --- a/src/bin/e_dpms.h +++ b/src/bin/e_dpms.h @@ -3,8 +3,8 @@ #ifndef E_DPMS_H #define E_DPMS_H -EAPI int e_dpms_init(void); -EAPI int e_dpms_shutdown(void); +EINTERN int e_dpms_init(void); +EINTERN int e_dpms_shutdown(void); EAPI void e_dpms_update(void); diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index e20029c6f..3a5328520 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -63,7 +63,7 @@ static Ecore_Event_Handler *_e_exec_exit_handler = NULL; static Ecore_Event_Handler *_e_exec_border_add_handler = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_exec_init(void) { e_exec_instances = eina_hash_string_superfast_new(NULL); @@ -77,7 +77,7 @@ e_exec_init(void) return 1; } -EAPI int +EINTERN int e_exec_shutdown(void) { char buf[256]; diff --git a/src/bin/e_exec.h b/src/bin/e_exec.h index 3d6ea6071..c239483a2 100644 --- a/src/bin/e_exec.h +++ b/src/bin/e_exec.h @@ -16,8 +16,8 @@ struct _E_Exec_Instance Ecore_Timer *expire_timer; }; -EAPI int e_exec_init(void); -EAPI int e_exec_shutdown(void); +EINTERN int e_exec_init(void); +EINTERN int e_exec_shutdown(void); EAPI E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method); EAPI Efreet_Desktop *e_exec_startup_id_pid_find(int startup_id, pid_t pid); diff --git a/src/bin/e_exehist.c b/src/bin/e_exehist.c index 338df271b..37aa41221 100644 --- a/src/bin/e_exehist.c +++ b/src/bin/e_exehist.c @@ -40,7 +40,7 @@ static E_Powersave_Deferred_Action *_e_exehist_unload_defer = NULL; static int _e_exehist_changes = 0; /* externally accessible functions */ -EAPI int +EINTERN int e_exehist_init(void) { _e_exehist_config_item_edd = E_CONFIG_DD_NEW("E_Exehist_Item", E_Exehist_Item); @@ -66,7 +66,7 @@ e_exehist_init(void) return 1; } -EAPI int +EINTERN int e_exehist_shutdown(void) { if (_e_exehist_unload_defer) diff --git a/src/bin/e_exehist.h b/src/bin/e_exehist.h index bf74a3e85..27758372f 100644 --- a/src/bin/e_exehist.h +++ b/src/bin/e_exehist.h @@ -11,8 +11,8 @@ typedef enum _E_Exehist_Sort E_EXEHIST_SORT_BY_POPULARITY } E_Exehist_Sort; -EAPI int e_exehist_init(void); -EAPI int e_exehist_shutdown(void); +EINTERN int e_exehist_init(void); +EINTERN int e_exehist_shutdown(void); EAPI void e_exehist_add(const char *launch_method, const char *exe); EAPI void e_exehist_del(const char *exe); diff --git a/src/bin/e_filereg.c b/src/bin/e_filereg.c index 5717ac82d..4ee0f02a8 100644 --- a/src/bin/e_filereg.c +++ b/src/bin/e_filereg.c @@ -19,7 +19,7 @@ static Eina_Bool _filereg_hash_cb_free(const Eina_Hash *hash __UNUSED__, void *data, void *fdata __UNUSED__); /* Externally accessible functions */ -EAPI int +EINTERN int e_filereg_init(void) { _e_filereg = eina_hash_string_superfast_new(NULL); @@ -27,7 +27,7 @@ e_filereg_init(void) return 1; } -EAPI int +EINTERN int e_filereg_shutdown(void) { eina_hash_foreach(_e_filereg, _filereg_hash_cb_free, NULL); diff --git a/src/bin/e_filereg.h b/src/bin/e_filereg.h index 45ac3e9ac..6b8872c8e 100644 --- a/src/bin/e_filereg.h +++ b/src/bin/e_filereg.h @@ -4,8 +4,8 @@ #ifndef E_FILEREG_H #define E_FILEREG_H -EAPI int e_filereg_init(void); -EAPI int e_filereg_shutdown(void); +EINTERN int e_filereg_init(void); +EINTERN int e_filereg_shutdown(void); EAPI int e_filereg_register(const char * path); EAPI void e_filereg_deregister(const char * path); diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 9cd737661..818031c2f 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -692,7 +692,7 @@ static Ecore_Event_Handler *_e_fm2_op_registry_entry_changed_handler = NULL; /***/ -EAPI int +EINTERN int e_fm2_init(void) { char path[PATH_MAX]; @@ -762,7 +762,7 @@ e_fm2_init(void) return 1; } -EAPI int +EINTERN int e_fm2_shutdown(void) { eina_stringshare_replace(&_e_fm2_icon_desktop_str, NULL); diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h index d5166b042..894e4ff0e 100644 --- a/src/bin/e_fm.h +++ b/src/bin/e_fm.h @@ -129,8 +129,8 @@ struct _E_Fm2_Icon_Info typedef void (*E_Fm_Cb) (void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info); -EAPI int e_fm2_init(void); -EAPI int e_fm2_shutdown(void); +EINTERN int e_fm2_init(void); +EINTERN int e_fm2_shutdown(void); EAPI Evas_Object *e_fm2_add(Evas *evas); EAPI void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path); EAPI void e_fm2_custom_theme_set(Evas_Object *obj, const char *path); diff --git a/src/bin/e_fm_custom.c b/src/bin/e_fm_custom.c index 850599941..b1d336261 100644 --- a/src/bin/e_fm_custom.c +++ b/src/bin/e_fm_custom.c @@ -26,7 +26,7 @@ static int _e_fm2_custom_init = 0; */ /* externally accessible functions */ -EAPI int +EINTERN int e_fm2_custom_file_init(void) { Eet_Data_Descriptor_Class eddc; @@ -81,7 +81,7 @@ e_fm2_custom_file_init(void) return 1; } -EAPI void +EINTERN void e_fm2_custom_file_shutdown(void) { _e_fm2_custom_init--; diff --git a/src/bin/e_fm_custom.h b/src/bin/e_fm_custom.h index 58a3d2f37..6b3d96df3 100644 --- a/src/bin/e_fm_custom.h +++ b/src/bin/e_fm_custom.h @@ -39,8 +39,8 @@ struct _E_Fm2_Custom_File /* FIXME: this will have more added */ }; -EAPI int e_fm2_custom_file_init(void); -EAPI void e_fm2_custom_file_shutdown(void); +EINTERN int e_fm2_custom_file_init(void); +EINTERN void e_fm2_custom_file_shutdown(void); EAPI E_Fm2_Custom_File *e_fm2_custom_file_get(const char *path); EAPI void e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf); EAPI void e_fm2_custom_file_del(const char *path); diff --git a/src/bin/e_fm_op_registry.c b/src/bin/e_fm_op_registry.c index 56915ba2d..0459faa02 100644 --- a/src/bin/e_fm_op_registry.c +++ b/src/bin/e_fm_op_registry.c @@ -465,7 +465,7 @@ e_fm2_op_registry_count(void) } -EAPI unsigned int +EINTERN unsigned int e_fm2_op_registry_init(void) { _e_fm2_init_count++; @@ -488,7 +488,7 @@ e_fm2_op_registry_init(void) return 1; } -EAPI unsigned int +EINTERN unsigned int e_fm2_op_registry_shutdown(void) { if (_e_fm2_init_count == 0) return 0; diff --git a/src/bin/e_fm_op_registry.h b/src/bin/e_fm_op_registry.h index 59dceb9b4..7e7de2774 100644 --- a/src/bin/e_fm_op_registry.h +++ b/src/bin/e_fm_op_registry.h @@ -63,8 +63,8 @@ EAPI int e_fm2_op_registry_count(void); EAPI void e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry); -EAPI unsigned int e_fm2_op_registry_init(void); -EAPI unsigned int e_fm2_op_registry_shutdown(void); +EINTERN unsigned int e_fm2_op_registry_init(void); +EINTERN unsigned int e_fm2_op_registry_shutdown(void); /* E internal/private functions, symbols not exported outside e binary (e_fm.c mainly) */ Eina_Bool e_fm2_op_registry_entry_add(int id, Evas_Object *e_fm, E_Fm_Op_Type op, E_Fm2_Op_Registry_Abort_Func abort); diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c index f4e0ab6b8..eecee478b 100644 --- a/src/bin/e_focus.c +++ b/src/bin/e_focus.c @@ -6,13 +6,13 @@ static Eina_Bool _e_focus_raise_timer(void* data); /* local subsystem globals */ /* externally accessible functions */ -EAPI int +EINTERN int e_focus_init(void) { return 1; } -EAPI int +EINTERN int e_focus_shutdown(void) { return 1; diff --git a/src/bin/e_focus.h b/src/bin/e_focus.h index d34fc4254..7230a4e98 100644 --- a/src/bin/e_focus.h +++ b/src/bin/e_focus.h @@ -3,8 +3,8 @@ #ifndef E_FOCUS_H #define E_FOCUS_H -EAPI int e_focus_init(void); -EAPI int e_focus_shutdown(void); +EINTERN int e_focus_init(void); +EINTERN int e_focus_shutdown(void); EAPI void e_focus_idler_before(void); EAPI void e_focus_event_mouse_in(E_Border* bd); diff --git a/src/bin/e_font.c b/src/bin/e_font.c index edf7e3635..6801af5b3 100644 --- a/src/bin/e_font.c +++ b/src/bin/e_font.c @@ -7,14 +7,14 @@ static Eina_Hash *_e_font_available_hash_add(Eina_Hash *font_hash, const char *f static E_Font_Properties *_e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, const char *font); static char _fn_buf[1024]; -EAPI int +EINTERN int e_font_init(void) { /* all init stuff is in e_config */ return 1; } -EAPI int +EINTERN int e_font_shutdown(void) { /* e_config will do this */ diff --git a/src/bin/e_font.h b/src/bin/e_font.h index 49b69fd6b..f81e5656b 100644 --- a/src/bin/e_font.h +++ b/src/bin/e_font.h @@ -32,8 +32,8 @@ struct _E_Font_Properties Eina_List *styles; }; -EAPI int e_font_init(void); -EAPI int e_font_shutdown(void); +EINTERN int e_font_init(void); +EINTERN int e_font_shutdown(void); EAPI void e_font_apply(void); EAPI Eina_List *e_font_available_list(void); EAPI void e_font_available_list_free(Eina_List *available); diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 04ae129e2..5ee6671fa 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -193,13 +193,13 @@ static E_Gadcon_Client *drag_gcc = NULL; static E_Gadcon_Client *new_gcc = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_gadcon_init(void) { return 1; } -EAPI int +EINTERN int e_gadcon_shutdown(void) { eina_list_free(populate_requests); diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h index 9ba6e626f..19caae676 100644 --- a/src/bin/e_gadcon.h +++ b/src/bin/e_gadcon.h @@ -233,8 +233,8 @@ struct _E_Gadcon_Location } gadget_remove; }; -EAPI int e_gadcon_init(void); -EAPI int e_gadcon_shutdown(void); +EINTERN int e_gadcon_init(void); +EINTERN int e_gadcon_shutdown(void); EAPI void e_gadcon_provider_register(const E_Gadcon_Client_Class *cc); EAPI void e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc); EAPI Eina_List *e_gadcon_provider_list(void); diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c index 6555657c1..385f249ed 100644 --- a/src/bin/e_grabinput.c +++ b/src/bin/e_grabinput.c @@ -11,13 +11,13 @@ static E_Focus_Method focus_method = E_FOCUS_METHOD_NO_INPUT; static double last_focus_time = 0.0; /* externally accessible functions */ -EAPI int +EINTERN int e_grabinput_init(void) { return 1; } -EAPI int +EINTERN int e_grabinput_shutdown(void) { return 1; diff --git a/src/bin/e_grabinput.h b/src/bin/e_grabinput.h index 6e9d6bfbe..180794299 100644 --- a/src/bin/e_grabinput.h +++ b/src/bin/e_grabinput.h @@ -12,8 +12,8 @@ typedef enum _E_Focus_Method #ifndef E_GRABINPUT_H #define E_GRABINPUT_H -EAPI int e_grabinput_init(void); -EAPI int e_grabinput_shutdown(void); +EINTERN int e_grabinput_init(void); +EINTERN int e_grabinput_shutdown(void); EAPI int e_grabinput_get(Ecore_X_Window mouse_win, int confine_mouse, Ecore_X_Window key_win); EAPI void e_grabinput_release(Ecore_X_Window mouse_win, Ecore_X_Window key_win); EAPI void e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method); diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 88658ab10..e661a2466 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -7,7 +7,7 @@ EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_COMMS = 0; EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION = 0; EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE = 0; -EAPI void +EINTERN void e_hints_init(void) { Ecore_X_Window *roots = NULL; @@ -212,7 +212,7 @@ e_hints_e16_comms_pretend(E_Manager *man) ecore_x_window_prop_property_set(man->root, ATM_ENLIGHTENMENT_COMMS, ECORE_X_ATOM_STRING, 8, buf, 14); } -EAPI void +EINTERN void e_hints_manager_init(E_Manager *man) { /* Set desktop count, desktop names and workarea */ @@ -407,7 +407,7 @@ e_hints_active_window_set(E_Manager *man, E_Border *bd) ecore_x_netwm_client_active_set(man->root, 0); } -EAPI void +EINTERN void e_hints_window_init(E_Border *bd) { E_Remember *rem = NULL; diff --git a/src/bin/e_hints.h b/src/bin/e_hints.h index 03b670e7f..a4746dd1a 100644 --- a/src/bin/e_hints.h +++ b/src/bin/e_hints.h @@ -3,15 +3,15 @@ #ifndef E_HINTS_H #define E_HINTS_H -EAPI void e_hints_init(void); +EINTERN void e_hints_init(void); EAPI void e_hints_e16_comms_pretend(E_Manager *man); -EAPI void e_hints_manager_init(E_Manager *man); +EINTERN void e_hints_manager_init(E_Manager *man); EAPI void e_hints_client_list_set(void); EAPI void e_hints_client_stacking_set(void); EAPI void e_hints_active_window_set(E_Manager *man, E_Border *bd); -EAPI void e_hints_window_init(E_Border *bd); +EINTERN void e_hints_window_init(E_Border *bd); EAPI void e_hints_window_state_set(E_Border *bd); EAPI void e_hints_window_state_get(E_Border *bd); EAPI void e_hints_window_type_set(E_Border *bd); diff --git a/src/bin/e_init.c b/src/bin/e_init.c index 49a7296ef..c66f0edad 100644 --- a/src/bin/e_init.c +++ b/src/bin/e_init.c @@ -16,7 +16,7 @@ static int undone = 0; static Eina_List *stats = NULL; /* public functions */ -EAPI int +EINTERN int e_init_init(void) { E_EVENT_INIT_DONE = ecore_event_type_new(); @@ -28,7 +28,7 @@ e_init_init(void) return 1; } -EAPI int +EINTERN int e_init_shutdown(void) { /* if not killed, kill init */ diff --git a/src/bin/e_init.h b/src/bin/e_init.h index db00ff494..fba785dfb 100644 --- a/src/bin/e_init.h +++ b/src/bin/e_init.h @@ -3,8 +3,8 @@ #ifndef E_INIT_H #define E_INIT_H -EAPI int e_init_init(void); -EAPI int e_init_shutdown(void); +EINTERN int e_init_init(void); +EINTERN int e_init_shutdown(void); EAPI void e_init_show(void); EAPI void e_init_hide(void); EAPI void e_init_title_set(const char *str); diff --git a/src/bin/e_init_main.c b/src/bin/e_init_main.c index 195e674cc..5b9ded4f7 100644 --- a/src/bin/e_init_main.c +++ b/src/bin/e_init_main.c @@ -10,13 +10,51 @@ #include #include +#ifdef EAPI +#undef EAPI +#endif +#ifdef WIN32 +# ifdef BUILDING_DLL +# define EAPI __declspec(dllexport) +# else +# define EAPI __declspec(dllimport) +# endif +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +/* BROKEN in gcc 4 on amd64 */ +#if 0 +# pragma GCC visibility push(hidden) +#endif +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif + +#ifdef EINTERN +#undef EINTERN +#endif +#ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EINTERN __attribute__ ((visibility("hidden"))) +# else +# define EINTERN +# endif +#else +# define EINTERN +#endif + #define E_TYPEDEFS 1 #include "e_xinerama.h" #undef E_TYPEDEFS #include "e_xinerama.h" -EAPI int e_init_init(void); -EAPI int e_init_shutdown(void); +EINTERN int e_init_init(void); +EINTERN int e_init_shutdown(void); EAPI void e_init_show(void); EAPI void e_init_hide(void); EAPI void e_init_title_set(const char *str); @@ -205,7 +243,7 @@ static Ecore_Event_Handler *_e_init_configure_handler = NULL; static Ecore_Timer *_e_init_timeout_timer = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_init_init(void) { Ecore_X_Window root, *roots; @@ -298,7 +336,7 @@ e_init_init(void) return 1; } -EAPI int +EINTERN int e_init_shutdown(void) { if (_e_init_configure_handler) diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 25438269c..483293cbc 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -1524,7 +1524,7 @@ _e_int_menus_shelves_add_cb(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_ e_config->shelves = eina_list_append(e_config->shelves, cs); e_config_save_queue(); - e_shelf_config_init(); + e_shelf_config_update(); } static void diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c index 29ce1ecd3..6205452c4 100644 --- a/src/bin/e_intl.c +++ b/src/bin/e_intl.c @@ -50,7 +50,7 @@ static Eina_Bool _e_intl_locale_hash_free_cb(const Eina_Hash *hash, const void static Eina_Bool _e_intl_cb_exit(void *data, int type, void *event); static Eina_List *_e_intl_imc_dir_scan(const char *dir); -EAPI int +EINTERN int e_intl_init(void) { char *s; @@ -69,7 +69,7 @@ e_intl_init(void) return 1; } -EAPI int +EINTERN int e_intl_shutdown(void) { E_FREE(_e_intl_language); @@ -93,7 +93,7 @@ e_intl_shutdown(void) } /* Setup configuration settings and start services */ -EAPI int +EINTERN int e_intl_post_init(void) { if ((e_config->language) && (e_config->language[0] != 0)) @@ -109,7 +109,7 @@ e_intl_post_init(void) return 1; } -EAPI int +EINTERN int e_intl_post_shutdown(void) { if (_e_intl_exit_handler) diff --git a/src/bin/e_intl.h b/src/bin/e_intl.h index e1730bd28..643ddca46 100644 --- a/src/bin/e_intl.h +++ b/src/bin/e_intl.h @@ -35,10 +35,10 @@ struct _E_Locale_Parts const char *modifier; }; -EAPI int e_intl_init(void); -EAPI int e_intl_shutdown(void); -EAPI int e_intl_post_init(void); -EAPI int e_intl_post_shutdown(void); +EINTERN int e_intl_init(void); +EINTERN int e_intl_shutdown(void); +EINTERN int e_intl_post_init(void); +EINTERN int e_intl_post_shutdown(void); /* Setting & Getting Language */ EAPI void e_intl_language_set(const char *lang); EAPI const char *e_intl_language_get(void); diff --git a/src/bin/e_intl_data.c b/src/bin/e_intl_data.c index ba4b90087..9a230144d 100644 --- a/src/bin/e_intl_data.c +++ b/src/bin/e_intl_data.c @@ -6,7 +6,7 @@ */ static Eet_Data_Descriptor *_e_intl_input_method_config_edd = NULL; -EAPI int +EINTERN int e_intl_data_init(void) { _e_intl_input_method_config_edd = E_CONFIG_DD_NEW("input_method_config", E_Input_Method_Config); @@ -21,7 +21,7 @@ e_intl_data_init(void) return 1; } -EAPI int +EINTERN int e_intl_data_shutdown(void) { E_CONFIG_DD_FREE(_e_intl_input_method_config_edd); diff --git a/src/bin/e_intl_data.h b/src/bin/e_intl_data.h index 139217f47..8798be9ce 100644 --- a/src/bin/e_intl_data.h +++ b/src/bin/e_intl_data.h @@ -19,8 +19,8 @@ struct _E_Input_Method_Config const char *e_im_setup_exec; }; -EAPI int e_intl_data_init(void); -EAPI int e_intl_data_shutdown(void); +EINTERN int e_intl_data_init(void); +EINTERN int e_intl_data_shutdown(void); EAPI E_Input_Method_Config *e_intl_input_method_config_read (Eet_File *imc_file); EAPI int e_intl_input_method_config_write (Eet_File *imc_file, E_Input_Method_Config *imc); EAPI void e_intl_input_method_config_free (E_Input_Method_Config *imc); diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c index a0638c37b..31280b68b 100644 --- a/src/bin/e_ipc.c +++ b/src/bin/e_ipc.c @@ -11,7 +11,7 @@ static Ecore_Ipc_Server *_e_ipc_server = NULL; #endif /* externally accessible functions */ -EAPI int +EINTERN int e_ipc_init(void) { #ifdef USE_IPC @@ -77,7 +77,7 @@ e_ipc_init(void) return 1; } -EAPI int +EINTERN int e_ipc_shutdown(void) { #ifdef USE_IPC diff --git a/src/bin/e_ipc.h b/src/bin/e_ipc.h index 19ef94cb8..85ac7be8d 100644 --- a/src/bin/e_ipc.h +++ b/src/bin/e_ipc.h @@ -25,8 +25,8 @@ typedef int E_Ipc_Op; #ifndef E_IPC_H #define E_IPC_H -EAPI int e_ipc_init(void); -EAPI int e_ipc_shutdown(void); +EINTERN int e_ipc_init(void); +EINTERN int e_ipc_shutdown(void); #endif #endif diff --git a/src/bin/e_ipc_codec.c b/src/bin/e_ipc_codec.c index b0cc56d15..19b518fb6 100644 --- a/src/bin/e_ipc_codec.c +++ b/src/bin/e_ipc_codec.c @@ -34,7 +34,7 @@ static Eet_Data_Descriptor *_e_ipc_str_4int_list_edd = NULL; Edd = eet_data_descriptor_stream_new(&Eddc); /* externally accessible functions */ -EAPI int +EINTERN int e_ipc_codec_init(void) { Eet_Data_Descriptor_Class eddc; @@ -138,7 +138,7 @@ e_ipc_codec_init(void) return 1; } -EAPI void +EINTERN void e_ipc_codec_shutdown(void) { E_CONFIG_DD_FREE(_e_ipc_int_edd); diff --git a/src/bin/e_ipc_codec.h b/src/bin/e_ipc_codec.h index 04ae940e7..499baa26b 100644 --- a/src/bin/e_ipc_codec.h +++ b/src/bin/e_ipc_codec.h @@ -95,8 +95,8 @@ struct _E_Ipc_Str_4Int int val1, val2, val3, val4; }; -EAPI int e_ipc_codec_init(void); -EAPI void e_ipc_codec_shutdown(void); +EINTERN int e_ipc_codec_init(void); +EINTERN void e_ipc_codec_shutdown(void); EAPI int e_ipc_codec_int_dec(char *data, int bytes, int *dest); EAPI void *e_ipc_codec_int_enc(int val, int *size_ret); diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 4cb3b57b1..96cedd8d0 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -1008,7 +1008,7 @@ main(int argc, char **argv) e_init_status_set(_("Setup Mouse")); TS("mouse"); /* setup mouse accel */ - if (!e_mouse_init()) + if (!e_mouse_update()) { e_error_message_show(_("Enlightenment cannot configure the mouse settings.")); _e_main_shutdown(-1); @@ -1134,8 +1134,8 @@ main(int argc, char **argv) e_test(); e_init_status_set(_("Configure Shelves")); - TS("shelf config init"); - e_shelf_config_init(); + TS("shelf config update"); + e_shelf_config_update(); TS("manage all windows"); _e_main_manage_all(); diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c index 1b5cef5b8..a15188dde 100644 --- a/src/bin/e_manager.c +++ b/src/bin/e_manager.c @@ -45,7 +45,7 @@ static Eina_Hash *frame_extents = NULL; static Ecore_Timer *timer_post_screensaver_lock = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_manager_init(void) { ecore_x_screensaver_event_listen_set(1); @@ -53,7 +53,7 @@ e_manager_init(void) return 1; } -EAPI int +EINTERN int e_manager_shutdown(void) { E_FREE_LIST(managers, e_object_del); diff --git a/src/bin/e_manager.h b/src/bin/e_manager.h index e4e18b386..d8fe44575 100644 --- a/src/bin/e_manager.h +++ b/src/bin/e_manager.h @@ -44,8 +44,8 @@ struct _E_Manager E_Manager_Comp *comp; }; -EAPI int e_manager_init(void); -EAPI int e_manager_shutdown(void); +EINTERN int e_manager_init(void); +EINTERN int e_manager_shutdown(void); EAPI Eina_List *e_manager_list(void); EAPI E_Manager *e_manager_new(Ecore_X_Window root, int num); diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 4beacb7e0..3a0fdcda0 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -135,7 +135,7 @@ _e_menu_list_free_unref(Eina_List *l) } /* externally accessible functions */ -EAPI int +EINTERN int e_menu_init(void) { _e_menu_key_down_handler = @@ -163,7 +163,7 @@ e_menu_init(void) return 1; } -EAPI int +EINTERN int e_menu_shutdown(void) { E_Menu *m; diff --git a/src/bin/e_menu.h b/src/bin/e_menu.h index 939278b27..6cd9e707f 100644 --- a/src/bin/e_menu.h +++ b/src/bin/e_menu.h @@ -155,8 +155,8 @@ struct _E_Menu_Category_Callback }; -EAPI int e_menu_init(void); -EAPI int e_menu_shutdown(void); +EINTERN int e_menu_init(void); +EINTERN int e_menu_shutdown(void); EAPI E_Menu *e_menu_new(void); EAPI void e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir); diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 8c2176c30..d46153ecb 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -24,7 +24,7 @@ EAPI int E_EVENT_MODULE_UPDATE = 0; EAPI int E_EVENT_MODULE_INIT_END = 0; /* externally accessible functions */ -EAPI int +EINTERN int e_module_init(void) { E_EVENT_MODULE_UPDATE = ecore_event_type_new(); @@ -32,7 +32,7 @@ e_module_init(void) return 1; } -EAPI int +EINTERN int e_module_shutdown(void) { E_Module *m; diff --git a/src/bin/e_module.h b/src/bin/e_module.h index cce2d6c15..97426813c 100644 --- a/src/bin/e_module.h +++ b/src/bin/e_module.h @@ -51,8 +51,8 @@ struct _E_Module_Api const char *name; }; -EAPI int e_module_init(void); -EAPI int e_module_shutdown(void); +EINTERN int e_module_init(void); +EINTERN int e_module_shutdown(void); EAPI void e_module_all_load(void); EAPI E_Module *e_module_new(const char *name); diff --git a/src/bin/e_mouse.c b/src/bin/e_mouse.c index babe55aaa..e10114505 100644 --- a/src/bin/e_mouse.c +++ b/src/bin/e_mouse.c @@ -1,7 +1,7 @@ #include "e.h" EAPI int -e_mouse_init(void) +e_mouse_update(void) { unsigned char map[256]; int n; diff --git a/src/bin/e_mouse.h b/src/bin/e_mouse.h index c3b8b93b9..39115c6ea 100644 --- a/src/bin/e_mouse.h +++ b/src/bin/e_mouse.h @@ -10,7 +10,7 @@ typedef enum _E_Mouse_Hand #ifndef E_MOUSE_H #define E_MOUSE_H -EAPI int e_mouse_init(void); +EAPI int e_mouse_update(void); #endif #endif diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c index d71d851bb..cd401620b 100644 --- a/src/bin/e_moveresize.c +++ b/src/bin/e_moveresize.c @@ -18,7 +18,7 @@ static int obj_y = 0; static int obj_w = 0; static int obj_h = 0; -EAPI int +EINTERN int e_moveresize_init(void) { E_Border_Hook *h; @@ -39,7 +39,7 @@ e_moveresize_init(void) return 1; } -EAPI int +EINTERN int e_moveresize_shutdown(void) { E_Border_Hook *h; diff --git a/src/bin/e_moveresize.h b/src/bin/e_moveresize.h index 934768cde..45cbe2054 100644 --- a/src/bin/e_moveresize.h +++ b/src/bin/e_moveresize.h @@ -4,8 +4,8 @@ #ifndef E_MOVERESIZE_H #define E_MOVERESIZE_H -EAPI int e_moveresize_init(void); -EAPI int e_moveresize_shutdown(void); +EINTERN int e_moveresize_init(void); +EINTERN int e_moveresize_shutdown(void); #endif #endif diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c index c833cfdfb..e9ed98c96 100644 --- a/src/bin/e_msg.c +++ b/src/bin/e_msg.c @@ -32,7 +32,7 @@ static int E_EVENT_MSG = 0; static Ecore_Event_Handler *hand = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_msg_init(void) { E_EVENT_MSG = ecore_event_type_new(); @@ -40,7 +40,7 @@ e_msg_init(void) return 1; } -EAPI int +EINTERN int e_msg_shutdown(void) { while (handlers) e_msg_handler_del(eina_list_data_get(handlers)); diff --git a/src/bin/e_msg.h b/src/bin/e_msg.h index 78483312f..247903f17 100644 --- a/src/bin/e_msg.h +++ b/src/bin/e_msg.h @@ -6,8 +6,8 @@ typedef struct _E_Msg_Handler E_Msg_Handler; #ifndef E_MSG_H #define E_MSG_H -EAPI int e_msg_init(void); -EAPI int e_msg_shutdown(void); +EINTERN int e_msg_init(void); +EINTERN int e_msg_shutdown(void); EAPI void e_msg_send(const char *name, const char *info, int val, E_Object *obj, void *msgdata, void (*afterfunc) (void *data, E_Object *obj, void *msgdata), void *afterdata); EAPI E_Msg_Handler *e_msg_handler_add(void (*func) (void *data, const char *name, const char *info, int val, E_Object *obj, void *msgdata), void *data); diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c index 3657ba3e9..69ae909ab 100644 --- a/src/bin/e_msgbus.c +++ b/src/bin/e_msgbus.c @@ -22,7 +22,7 @@ static DBusMessage* _e_msgbus_profile_delete_cb(E_DBus_Object *obj, DBusMessage static E_Msgbus_Data *_e_msgbus_data = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_msgbus_init(void) { E_DBus_Interface *iface; @@ -93,7 +93,7 @@ e_msgbus_init(void) return 1; } -EAPI int +EINTERN int e_msgbus_shutdown(void) { if (_e_msgbus_data->obj) diff --git a/src/bin/e_msgbus.h b/src/bin/e_msgbus.h index c5a478975..c677586a4 100644 --- a/src/bin/e_msgbus.h +++ b/src/bin/e_msgbus.h @@ -14,8 +14,8 @@ struct _E_Msgbus_Data E_DBus_Object *obj; }; -EAPI int e_msgbus_init(void); -EAPI int e_msgbus_shutdown(void); +EINTERN int e_msgbus_init(void); +EINTERN int e_msgbus_shutdown(void); EAPI void e_msgbus_interface_attach(E_DBus_Interface *iface); EAPI void e_msgbus_interface_detach(E_DBus_Interface *iface); diff --git a/src/bin/e_order.c b/src/bin/e_order.c index 4be516f6c..c95aab09d 100644 --- a/src/bin/e_order.c +++ b/src/bin/e_order.c @@ -11,7 +11,7 @@ static Eina_List *orders = NULL; static Eina_List *handlers = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_order_init(void) { handlers = @@ -23,7 +23,7 @@ e_order_init(void) return 1; } -EAPI int +EINTERN int e_order_shutdown(void) { orders = eina_list_free(orders); diff --git a/src/bin/e_order.h b/src/bin/e_order.h index 44dac5368..3e86979f3 100644 --- a/src/bin/e_order.h +++ b/src/bin/e_order.h @@ -23,8 +23,8 @@ struct _E_Order } cb; }; -EAPI int e_order_init(void); -EAPI int e_order_shutdown(void); +EINTERN int e_order_init(void); +EINTERN int e_order_shutdown(void); EAPI E_Order *e_order_new(const char *path); EAPI void e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), void *data); diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c index e69e0097b..7405b4635 100644 --- a/src/bin/e_pointer.c +++ b/src/bin/e_pointer.c @@ -34,7 +34,7 @@ static Eina_Bool _e_pointer_cb_idle_timer_wait(void *data); static Eina_Bool _e_pointer_cb_idle_poller(void *data); /* externally accessible functions */ -EAPI int +EINTERN int e_pointer_init(void) { handlers = @@ -56,7 +56,7 @@ e_pointer_init(void) return 1; } -EAPI int +EINTERN int e_pointer_shutdown(void) { E_FREE_LIST(handlers, ecore_event_handler_del); diff --git a/src/bin/e_pointer.h b/src/bin/e_pointer.h index 99fae9dea..2694c0901 100644 --- a/src/bin/e_pointer.h +++ b/src/bin/e_pointer.h @@ -36,8 +36,8 @@ struct _E_Pointer } hot; }; -EAPI int e_pointer_init(void); -EAPI int e_pointer_shutdown(void); +EINTERN int e_pointer_init(void); +EINTERN int e_pointer_shutdown(void); EAPI E_Pointer *e_pointer_window_new(Ecore_X_Window win, int filled); EAPI void e_pointer_hide(E_Pointer *p); EAPI void e_pointer_type_push(E_Pointer *p, void *obj, const char *type); diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c index 3c028eccb..7bff29750 100644 --- a/src/bin/e_popup.c +++ b/src/bin/e_popup.c @@ -12,7 +12,7 @@ static Eina_Hash *_e_popup_hash = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_popup_init(void) { _e_popup_window_shape_handler = @@ -22,7 +22,7 @@ e_popup_init(void) return 1; } -EAPI int +EINTERN int e_popup_shutdown(void) { if (_e_popup_hash) diff --git a/src/bin/e_popup.h b/src/bin/e_popup.h index af820b150..3c9497840 100644 --- a/src/bin/e_popup.h +++ b/src/bin/e_popup.h @@ -29,8 +29,8 @@ struct _E_Popup Ecore_Idle_Enterer *idle_enterer; }; -EAPI int e_popup_init(void); -EAPI int e_popup_shutdown(void); +EINTERN int e_popup_init(void); +EINTERN int e_popup_shutdown(void); EAPI E_Popup *e_popup_new(E_Zone *zone, int x, int y, int w, int h); EAPI void e_popup_name_set(E_Popup *pop, const char *name); diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c index 8ab379a30..e073d527e 100644 --- a/src/bin/e_powersave.c +++ b/src/bin/e_powersave.c @@ -23,7 +23,7 @@ static E_Powersave_Mode powersave_mode = E_POWERSAVE_MODE_LOW; static double defer_time = 5.0; /* externally accessible functions */ -EAPI int +EINTERN int e_powersave_init(void) { _e_powersave_mode_eval(); @@ -31,7 +31,7 @@ e_powersave_init(void) return 1; } -EAPI int +EINTERN int e_powersave_shutdown(void) { return 1; diff --git a/src/bin/e_powersave.h b/src/bin/e_powersave.h index 235500e9c..d31ee6f43 100644 --- a/src/bin/e_powersave.h +++ b/src/bin/e_powersave.h @@ -23,8 +23,8 @@ struct _E_Event_Powersave_Update E_Powersave_Mode mode; }; -EAPI int e_powersave_init(void); -EAPI int e_powersave_shutdown(void); +EINTERN int e_powersave_init(void); +EINTERN int e_powersave_shutdown(void); EAPI E_Powersave_Deferred_Action *e_powersave_deferred_action_add(void (*func) (void *data), const void *data); EAPI void e_powersave_deferred_action_del(E_Powersave_Deferred_Action *pa); diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c index cad081d2c..bfaed36df 100644 --- a/src/bin/e_prefix.c +++ b/src/bin/e_prefix.c @@ -173,7 +173,7 @@ e_prefix_determine(char *argv0) return 0; } -EAPI void +EINTERN void e_prefix_shutdown(void) { E_FREE(_exe_path); diff --git a/src/bin/e_prefix.h b/src/bin/e_prefix.h index 1332e6a8b..3ab3d438e 100644 --- a/src/bin/e_prefix.h +++ b/src/bin/e_prefix.h @@ -5,7 +5,7 @@ #define E_PREFIX_H EAPI int e_prefix_determine(char *argv0); -EAPI void e_prefix_shutdown(void); +EINTERN void e_prefix_shutdown(void); EAPI void e_prefix_fallback(void); EAPI const char *e_prefix_get(void); EAPI const char *e_prefix_locale_get(void); diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c index 3c0949acd..b5ede3f3c 100644 --- a/src/bin/e_randr.c +++ b/src/bin/e_randr.c @@ -94,13 +94,13 @@ static Eina_Bool _e_randr_outputs_are_clones(E_Randr_Output_Info *output_info, E E_Randr_Screen_Info *e_randr_screen_info = NULL; static Eina_List *_e_randr_event_handlers = NULL; -EAPI Eina_Bool +EINTERN Eina_Bool e_randr_init(void) { return _e_randr_init(); } -EAPI int +EINTERN int e_randr_shutdown(void) { _e_randr_shutdown(); diff --git a/src/bin/e_randr.h b/src/bin/e_randr.h index b4bdffb11..331fa11c7 100644 --- a/src/bin/e_randr.h +++ b/src/bin/e_randr.h @@ -148,8 +148,8 @@ struct _E_Randr_Screen_Restore_Info E_Randr_Screen_Restore_Info_Union rrvd_restore_info; }; -EAPI Eina_Bool e_randr_init(void); -EAPI int e_randr_shutdown(void); +EINTERN Eina_Bool e_randr_init(void); +EINTERN int e_randr_shutdown(void); extern E_Randr_Screen_Info *e_randr_screen_info; diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c index 10a320069..44d95d810 100644 --- a/src/bin/e_remember.c +++ b/src/bin/e_remember.c @@ -30,7 +30,7 @@ static Eina_List *handlers = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_remember_init(E_Startup_Mode mode) { Eina_List *l = NULL; @@ -66,7 +66,7 @@ e_remember_init(E_Startup_Mode mode) return 1; } -EAPI int +EINTERN int e_remember_shutdown(void) { E_Border_Hook *h; diff --git a/src/bin/e_remember.h b/src/bin/e_remember.h index 63a25ae4b..a9bc6c128 100644 --- a/src/bin/e_remember.h +++ b/src/bin/e_remember.h @@ -97,8 +97,8 @@ struct _E_Remember } prop; }; -EAPI int e_remember_init(E_Startup_Mode mode); -EAPI int e_remember_shutdown(void); +EINTERN int e_remember_init(E_Startup_Mode mode); +EINTERN int e_remember_shutdown(void); EAPI E_Remember *e_remember_new(void); EAPI int e_remember_usable_get(E_Remember *rem); EAPI void e_remember_use(E_Remember *rem); diff --git a/src/bin/e_scale.c b/src/bin/e_scale.c index acdbaa6c7..85d807dc8 100644 --- a/src/bin/e_scale.c +++ b/src/bin/e_scale.c @@ -2,14 +2,14 @@ EAPI double e_scale = 1.0; -EAPI int +EINTERN int e_scale_init(void) { e_scale_update(); return 1; } -EAPI int +EINTERN int e_scale_shutdown(void) { return 1; diff --git a/src/bin/e_scale.h b/src/bin/e_scale.h index 86d7e7869..6468c3359 100644 --- a/src/bin/e_scale.h +++ b/src/bin/e_scale.h @@ -3,8 +3,8 @@ #ifndef E_SCALE_H #define E_SCALE_H -EAPI int e_scale_init(void); -EAPI int e_scale_shutdown(void); +EINTERN int e_scale_init(void); +EINTERN int e_scale_shutdown(void); EAPI void e_scale_update(void); extern EAPI double e_scale; diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c index edc8971cf..923520e66 100644 --- a/src/bin/e_screensaver.c +++ b/src/bin/e_screensaver.c @@ -204,7 +204,7 @@ _e_screensaver_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, return ECORE_CALLBACK_PASS_ON; } -EAPI int +EINTERN int e_screensaver_init(void) { _e_screensaver_handler_config_mode = ecore_event_handler_add @@ -244,7 +244,7 @@ e_screensaver_init(void) return 1; } -EAPI int +EINTERN int e_screensaver_shutdown(void) { if (_e_screensaver_handler_config_mode) diff --git a/src/bin/e_screensaver.h b/src/bin/e_screensaver.h index c4456ca9a..bd42f9b6e 100644 --- a/src/bin/e_screensaver.h +++ b/src/bin/e_screensaver.h @@ -3,8 +3,8 @@ #ifndef E_SCREENSAVER_H #define E_SCREENSAVER_H -EAPI int e_screensaver_init(void); -EAPI int e_screensaver_shutdown(void); +EINTERN int e_screensaver_init(void); +EINTERN int e_screensaver_shutdown(void); EAPI void e_screensaver_update(void); diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index ef2068c62..659542ad6 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -33,13 +33,13 @@ static Eina_List *shelves = NULL; static Eina_Hash *winid_shelves = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_shelf_init(void) { return 1; } -EAPI int +EINTERN int e_shelf_shutdown(void) { while (shelves) @@ -54,7 +54,7 @@ e_shelf_shutdown(void) } EAPI void -e_shelf_config_init(void) +e_shelf_config_update(void) { Eina_List *l; E_Config_Shelf *cf_es; diff --git a/src/bin/e_shelf.h b/src/bin/e_shelf.h index 6bb8c7bc6..c571dc2a3 100644 --- a/src/bin/e_shelf.h +++ b/src/bin/e_shelf.h @@ -45,9 +45,9 @@ struct _E_Shelf unsigned int locked; }; -EAPI int e_shelf_init(void); -EAPI int e_shelf_shutdown(void); -EAPI void e_shelf_config_init(void); +EINTERN int e_shelf_init(void); +EINTERN int e_shelf_shutdown(void); +EAPI void e_shelf_config_update(void); EAPI Eina_List *e_shelf_list(void); EAPI E_Shelf *e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, int layer, int id); EAPI void e_shelf_zone_move_resize_handle(E_Zone *zone); diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c index b16c69acd..1ef4acc32 100644 --- a/src/bin/e_sys.c +++ b/src/bin/e_sys.c @@ -36,7 +36,7 @@ static const int E_LOGOUT_AUTO_TIME = 60; static const int E_LOGOUT_WAIT_TIME = 15; /* externally accessible functions */ -EAPI int +EINTERN int e_sys_init(void) { /* this is not optimal - but it does work cleanly */ @@ -47,7 +47,7 @@ e_sys_init(void) return 1; } -EAPI int +EINTERN int e_sys_shutdown(void) { if (_e_sys_exe_exit_handler) diff --git a/src/bin/e_sys.h b/src/bin/e_sys.h index 55abb7459..7f372ecb6 100644 --- a/src/bin/e_sys.h +++ b/src/bin/e_sys.h @@ -31,8 +31,8 @@ struct _E_Sys_Con_Action #ifndef E_SYS_H #define E_SYS_H -EAPI int e_sys_init(void); -EAPI int e_sys_shutdown(void); +EINTERN int e_sys_init(void); +EINTERN int e_sys_shutdown(void); EAPI int e_sys_action_possible_get(E_Sys_Action a); EAPI int e_sys_action_do(E_Sys_Action a, char *param); diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c index e51f5b997..d05f46308 100644 --- a/src/bin/e_theme.c +++ b/src/bin/e_theme.c @@ -30,7 +30,7 @@ static E_Fm2_Mime_Handler *theme_hdl = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_theme_init(void) { E_Config_Theme *et; @@ -66,7 +66,7 @@ e_theme_init(void) return 1; } -EAPI int +EINTERN int e_theme_shutdown(void) { const char *str; diff --git a/src/bin/e_theme.h b/src/bin/e_theme.h index 4058d7415..1a469cea1 100644 --- a/src/bin/e_theme.h +++ b/src/bin/e_theme.h @@ -3,8 +3,8 @@ #ifndef E_THEME_H #define E_THEME_H -EAPI int e_theme_init(void); -EAPI int e_theme_shutdown(void); +EINTERN int e_theme_init(void); +EINTERN int e_theme_shutdown(void); EAPI int e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group); EAPI const char *e_theme_edje_file_get(const char *category, const char *group); diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c index cad23b0a1..0029ffd31 100644 --- a/src/bin/e_thumb.c +++ b/src/bin/e_thumb.c @@ -38,7 +38,7 @@ static Ecore_Event_Handler *_exe_del_handler = NULL; static Ecore_Timer *_kill_timer = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_thumb_init(void) { _exe_del_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, @@ -48,7 +48,7 @@ e_thumb_init(void) return 1; } -EAPI int +EINTERN int e_thumb_shutdown(void) { _e_thumb_thumbnailers_kill_cancel(); diff --git a/src/bin/e_thumb.h b/src/bin/e_thumb.h index 63b024012..a38090f26 100644 --- a/src/bin/e_thumb.h +++ b/src/bin/e_thumb.h @@ -5,8 +5,8 @@ #define E_THUMB_H -EAPI int e_thumb_init(void); -EAPI int e_thumb_shutdown(void); +EINTERN int e_thumb_init(void); +EINTERN int e_thumb_shutdown(void); EAPI Evas_Object *e_thumb_icon_add(Evas *evas); EAPI void e_thumb_icon_file_set(Evas_Object *obj, const char *file, const char *key); diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c index f601f2d75..7c299bfc4 100644 --- a/src/bin/e_toolbar.c +++ b/src/bin/e_toolbar.c @@ -22,13 +22,13 @@ static void _e_toolbar_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Men /* local vars */ static Eina_List *toolbars = NULL; -EAPI int +EINTERN int e_toolbar_init(void) { return 1; } -EAPI int +EINTERN int e_toolbar_shutdown(void) { while (toolbars) diff --git a/src/bin/e_toolbar.h b/src/bin/e_toolbar.h index 7858eda48..79ed14be0 100644 --- a/src/bin/e_toolbar.h +++ b/src/bin/e_toolbar.h @@ -26,8 +26,8 @@ struct _E_Toolbar Evas_Object *o_base, *o_event; }; -EAPI int e_toolbar_init(void); -EAPI int e_toolbar_shutdown(void); +EINTERN int e_toolbar_init(void); +EINTERN int e_toolbar_shutdown(void); EAPI E_Toolbar *e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2); EAPI void e_toolbar_fwin_set(E_Toolbar *tbar, E_Win *fwin); EAPI E_Win *e_toolbar_fwin_get(E_Toolbar *tbar); diff --git a/src/bin/e_win.c b/src/bin/e_win.c index bd1e9dcf9..d60642048 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -13,13 +13,13 @@ static void _e_win_cb_delete(Ecore_Evas *ee); static Eina_List *wins = NULL; /* externally accessible functions */ -EAPI int +EINTERN int e_win_init(void) { return 1; } -EAPI int +EINTERN int e_win_shutdown(void) { /* diff --git a/src/bin/e_win.h b/src/bin/e_win.h index 64d931789..024592da3 100644 --- a/src/bin/e_win.h +++ b/src/bin/e_win.h @@ -37,8 +37,8 @@ struct _E_Win E_Pointer *pointer; }; -EAPI int e_win_init (void); -EAPI int e_win_shutdown (void); +EINTERN int e_win_init (void); +EINTERN int e_win_shutdown (void); EAPI E_Win *e_win_new (E_Container *con); EAPI void e_win_show (E_Win *win); EAPI void e_win_hide (E_Win *win); diff --git a/src/bin/e_xinerama.c b/src/bin/e_xinerama.c index aefaba183..5181ffeb9 100644 --- a/src/bin/e_xinerama.c +++ b/src/bin/e_xinerama.c @@ -8,14 +8,14 @@ static Eina_List *all_screens = NULL; static Eina_List *chosen_screens = NULL; static Eina_List *fake_screens = NULL; -EAPI int +EINTERN int e_xinerama_init(void) { _e_xinerama_update(); return 1; } -EAPI int +EINTERN int e_xinerama_shutdown(void) { _e_xinerama_clean(); diff --git a/src/bin/e_xinerama.h b/src/bin/e_xinerama.h index 8a0df1118..523774573 100644 --- a/src/bin/e_xinerama.h +++ b/src/bin/e_xinerama.h @@ -12,8 +12,8 @@ struct _E_Screen int x, y, w, h; }; -EAPI int e_xinerama_init(void); -EAPI int e_xinerama_shutdown(void); +EINTERN int e_xinerama_init(void); +EINTERN int e_xinerama_shutdown(void); EAPI void e_xinerama_update(void); EAPI const Eina_List *e_xinerama_screens_get(void); EAPI const Eina_List *e_xinerama_screens_all_get(void); diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 745474d0f..d43ee5468 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -38,7 +38,7 @@ EAPI int E_EVENT_ZONE_EDGE_MOVE = 0; #define E_ZONE_CORNER_RATIO 0.025; -EAPI int +EINTERN int e_zone_init(void) { E_EVENT_ZONE_DESK_COUNT_SET = ecore_event_type_new(); @@ -52,7 +52,7 @@ e_zone_init(void) return 1; } -EAPI int +EINTERN int e_zone_shutdown(void) { return 1; diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h index 5b1892037..30f060d60 100644 --- a/src/bin/e_zone.h +++ b/src/bin/e_zone.h @@ -121,8 +121,8 @@ struct _E_Event_Zone_Edge int modifiers; }; -EAPI int e_zone_init(void); -EAPI int e_zone_shutdown(void); +EINTERN int e_zone_init(void); +EINTERN int e_zone_shutdown(void); EAPI E_Zone *e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h); EAPI void e_zone_name_set(E_Zone *zone, const char *name); EAPI void e_zone_move(E_Zone *zone, int x, int y);