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
devs/princeamd/enlightenment-0.17-elive
Gustavo Sverzut Barbieri 12 years ago
parent c5642870c3
commit 6f2213cb25
  1. 4
      src/bin/e_acpi.c
  2. 4
      src/bin/e_acpi.h
  3. 4
      src/bin/e_actions.c
  4. 4
      src/bin/e_actions.h
  5. 5
      src/bin/e_alert.c
  6. 4
      src/bin/e_alert.h
  7. 4
      src/bin/e_atoms.c
  8. 4
      src/bin/e_atoms.h
  9. 4
      src/bin/e_bg.c
  10. 4
      src/bin/e_bg.h
  11. 4
      src/bin/e_bindings.c
  12. 4
      src/bin/e_bindings.h
  13. 4
      src/bin/e_border.c
  14. 4
      src/bin/e_border.h
  15. 4
      src/bin/e_color_class.c
  16. 4
      src/bin/e_color_class.h
  17. 4
      src/bin/e_config.c
  18. 4
      src/bin/e_config.h
  19. 2
      src/bin/e_configure.c
  20. 2
      src/bin/e_configure.h
  21. 4
      src/bin/e_container.c
  22. 4
      src/bin/e_container.h
  23. 4
      src/bin/e_desk.c
  24. 4
      src/bin/e_desk.h
  25. 4
      src/bin/e_desklock.c
  26. 4
      src/bin/e_desklock.h
  27. 4
      src/bin/e_dnd.c
  28. 4
      src/bin/e_dnd.h
  29. 4
      src/bin/e_dpms.c
  30. 4
      src/bin/e_dpms.h
  31. 4
      src/bin/e_exec.c
  32. 4
      src/bin/e_exec.h
  33. 4
      src/bin/e_exehist.c
  34. 4
      src/bin/e_exehist.h
  35. 4
      src/bin/e_filereg.c
  36. 4
      src/bin/e_filereg.h
  37. 4
      src/bin/e_fm.c
  38. 4
      src/bin/e_fm.h
  39. 4
      src/bin/e_fm_custom.c
  40. 4
      src/bin/e_fm_custom.h
  41. 4
      src/bin/e_fm_op_registry.c
  42. 4
      src/bin/e_fm_op_registry.h
  43. 4
      src/bin/e_focus.c
  44. 4
      src/bin/e_focus.h
  45. 4
      src/bin/e_font.c
  46. 4
      src/bin/e_font.h
  47. 4
      src/bin/e_gadcon.c
  48. 4
      src/bin/e_gadcon.h
  49. 4
      src/bin/e_grabinput.c
  50. 4
      src/bin/e_grabinput.h
  51. 6
      src/bin/e_hints.c
  52. 6
      src/bin/e_hints.h
  53. 4
      src/bin/e_init.c
  54. 4
      src/bin/e_init.h
  55. 46
      src/bin/e_init_main.c
  56. 2
      src/bin/e_int_menus.c
  57. 8
      src/bin/e_intl.c
  58. 8
      src/bin/e_intl.h
  59. 4
      src/bin/e_intl_data.c
  60. 4
      src/bin/e_intl_data.h
  61. 4
      src/bin/e_ipc.c
  62. 4
      src/bin/e_ipc.h
  63. 4
      src/bin/e_ipc_codec.c
  64. 4
      src/bin/e_ipc_codec.h
  65. 6
      src/bin/e_main.c
  66. 4
      src/bin/e_manager.c
  67. 4
      src/bin/e_manager.h
  68. 4
      src/bin/e_menu.c
  69. 4
      src/bin/e_menu.h
  70. 4
      src/bin/e_module.c
  71. 4
      src/bin/e_module.h
  72. 2
      src/bin/e_mouse.c
  73. 2
      src/bin/e_mouse.h
  74. 4
      src/bin/e_moveresize.c
  75. 4
      src/bin/e_moveresize.h
  76. 4
      src/bin/e_msg.c
  77. 4
      src/bin/e_msg.h
  78. 4
      src/bin/e_msgbus.c
  79. 4
      src/bin/e_msgbus.h
  80. 4
      src/bin/e_order.c
  81. 4
      src/bin/e_order.h
  82. 4
      src/bin/e_pointer.c
  83. 4
      src/bin/e_pointer.h
  84. 4
      src/bin/e_popup.c
  85. 4
      src/bin/e_popup.h
  86. 4
      src/bin/e_powersave.c
  87. 4
      src/bin/e_powersave.h
  88. 2
      src/bin/e_prefix.c
  89. 2
      src/bin/e_prefix.h
  90. 4
      src/bin/e_randr.c
  91. 4
      src/bin/e_randr.h
  92. 4
      src/bin/e_remember.c
  93. 4
      src/bin/e_remember.h
  94. 4
      src/bin/e_scale.c
  95. 4
      src/bin/e_scale.h
  96. 4
      src/bin/e_screensaver.c
  97. 4
      src/bin/e_screensaver.h
  98. 6
      src/bin/e_shelf.c
  99. 6
      src/bin/e_shelf.h
  100. 4
      src/bin/e_sys.c
  101. Some files were not shown because too many files have changed in this diff Show More

@ -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;

@ -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);

@ -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();

@ -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);

@ -1,3 +1,4 @@
#include "e.h"
#include "e_alert.h"
#include <stdio.h>
@ -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);

@ -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);

@ -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 */

@ -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

@ -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;

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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;

@ -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,

@ -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);

@ -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);

@ -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");

@ -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;

@ -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);

@ -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);

@ -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;

@ -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);

@ -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();

@ -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);

@ -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);

@ -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);

@ -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)

@ -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);

@ -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];

@ -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);

@ -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)

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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--;

@ -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);

@ -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;

@ -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);

@ -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;

@ -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);

@ -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 */

@ -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);

@ -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);

@ -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);

@ -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;

@ -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);

@ -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;

@ -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);

@ -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 */

@ -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);

@ -10,13 +10,51 @@
#include <Evas.h>
#include <Edje.h>
#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)

@ -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

@ -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)

@ -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);

@ -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);

@ -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);

@ -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

@ -25,8 +25,8 @@ typedef int E_Ipc_Op;
#ifndef E_IPC_H
#define E_IPC_H