aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-05-07 15:13:10 -0400
committerChris Michael <cp.michael@samsung.com>2015-05-07 15:13:10 -0400
commit0a94e8ba71f81db78363e4d4e7df8a8b9020216d (patch)
tree1511219387622b5fa810bbe619f4f5d93d9b9ef8
parentFix T2385 : internal windows not showing resize cursor (diff)
downloadenlightenment-0a94e8ba71f81db78363e4d4e7df8a8b9020216d.tar.gz
enlightenment: Make E build again with EFL from git
sed -i 's/EAPI/E_API/g' Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/bin/e.h50
-rw-r--r--src/bin/e_about.c4
-rw-r--r--src/bin/e_about.h4
-rw-r--r--src/bin/e_acpi.c6
-rw-r--r--src/bin/e_acpi.h6
-rw-r--r--src/bin/e_actions.c18
-rw-r--r--src/bin/e_actions.h18
-rw-r--r--src/bin/e_alert.c6
-rw-r--r--src/bin/e_alert.h2
-rw-r--r--src/bin/e_atoms.c22
-rw-r--r--src/bin/e_atoms.h22
-rw-r--r--src/bin/e_auth.c4
-rw-r--r--src/bin/e_auth.h4
-rw-r--r--src/bin/e_backlight.c16
-rw-r--r--src/bin/e_backlight.h16
-rw-r--r--src/bin/e_bg.c16
-rw-r--r--src/bin/e_bg.h20
-rw-r--r--src/bin/e_bindings.c120
-rw-r--r--src/bin/e_bindings.h134
-rw-r--r--src/bin/e_client.c190
-rw-r--r--src/bin/e_client.h192
-rw-r--r--src/bin/e_color.h6
-rw-r--r--src/bin/e_color_dialog.c2
-rw-r--r--src/bin/e_color_dialog.h12
-rw-r--r--src/bin/e_comp.c66
-rw-r--r--src/bin/e_comp.h72
-rw-r--r--src/bin/e_comp_canvas.c36
-rw-r--r--src/bin/e_comp_canvas.h38
-rw-r--r--src/bin/e_comp_cfdata.c8
-rw-r--r--src/bin/e_comp_cfdata.h8
-rw-r--r--src/bin/e_comp_object.c94
-rw-r--r--src/bin/e_comp_object.h94
-rw-r--r--src/bin/e_comp_wl.c10
-rw-r--r--src/bin/e_comp_wl.h10
-rw-r--r--src/bin/e_comp_wl_input.c6
-rw-r--r--src/bin/e_comp_wl_input.h6
-rw-r--r--src/bin/e_comp_x.h2
-rw-r--r--src/bin/e_comp_x_randr.c14
-rw-r--r--src/bin/e_comp_x_randr.h14
-rw-r--r--src/bin/e_config.c70
-rw-r--r--src/bin/e_config.h88
-rw-r--r--src/bin/e_config_data.c6
-rw-r--r--src/bin/e_config_data.h6
-rw-r--r--src/bin/e_config_dialog.c10
-rw-r--r--src/bin/e_config_dialog.h10
-rw-r--r--src/bin/e_configure.c20
-rw-r--r--src/bin/e_configure.h20
-rw-r--r--src/bin/e_confirm_dialog.c2
-rw-r--r--src/bin/e_confirm_dialog.h2
-rw-r--r--src/bin/e_datastore.c6
-rw-r--r--src/bin/e_datastore.h6
-rw-r--r--src/bin/e_dbusmenu.c10
-rw-r--r--src/bin/e_dbusmenu.h10
-rw-r--r--src/bin/e_desk.c64
-rw-r--r--src/bin/e_desk.h70
-rw-r--r--src/bin/e_deskenv.c2
-rw-r--r--src/bin/e_deskenv.h2
-rw-r--r--src/bin/e_desklock.c24
-rw-r--r--src/bin/e_desklock.h24
-rw-r--r--src/bin/e_deskmirror.c16
-rw-r--r--src/bin/e_deskmirror.h16
-rw-r--r--src/bin/e_desktop_editor.c6
-rw-r--r--src/bin/e_desktop_editor.h6
-rw-r--r--src/bin/e_dialog.c26
-rw-r--r--src/bin/e_dialog.h26
-rw-r--r--src/bin/e_dnd.c46
-rw-r--r--src/bin/e_dnd.h46
-rw-r--r--src/bin/e_dpms.c4
-rw-r--r--src/bin/e_dpms.h4
-rw-r--r--src/bin/e_entry_dialog.c2
-rw-r--r--src/bin/e_entry_dialog.h2
-rw-r--r--src/bin/e_env.c4
-rw-r--r--src/bin/e_env.h4
-rw-r--r--src/bin/e_error.c2
-rw-r--r--src/bin/e_error.h2
-rw-r--r--src/bin/e_exec.c32
-rw-r--r--src/bin/e_exec.h34
-rw-r--r--src/bin/e_exehist.c24
-rw-r--r--src/bin/e_exehist.h24
-rw-r--r--src/bin/e_filereg.c6
-rw-r--r--src/bin/e_filereg.h6
-rw-r--r--src/bin/e_flowlayout.c56
-rw-r--r--src/bin/e_flowlayout.h54
-rw-r--r--src/bin/e_fm.c132
-rw-r--r--src/bin/e_fm.h144
-rw-r--r--src/bin/e_fm/e_fm_ipc.h19
-rw-r--r--src/bin/e_fm/e_fm_main.c18
-rw-r--r--src/bin/e_fm/e_fm_main.h25
-rw-r--r--src/bin/e_fm/e_fm_main_udisks2.c4
-rw-r--r--src/bin/e_fm_cmdline.c27
-rw-r--r--src/bin/e_fm_custom.c12
-rw-r--r--src/bin/e_fm_custom.h12
-rw-r--r--src/bin/e_fm_device.c42
-rw-r--r--src/bin/e_fm_device.h42
-rw-r--r--src/bin/e_fm_mime.c30
-rw-r--r--src/bin/e_fm_mime.h30
-rw-r--r--src/bin/e_fm_op_registry.c30
-rw-r--r--src/bin/e_fm_op_registry.h30
-rw-r--r--src/bin/e_fm_prop.c2
-rw-r--r--src/bin/e_fm_prop.h2
-rw-r--r--src/bin/e_focus.c12
-rw-r--r--src/bin/e_focus.h16
-rw-r--r--src/bin/e_font.c36
-rw-r--r--src/bin/e_font.h36
-rw-r--r--src/bin/e_gadcon.c170
-rw-r--r--src/bin/e_gadcon.h172
-rw-r--r--src/bin/e_gadcon_popup.c12
-rw-r--r--src/bin/e_gadcon_popup.h12
-rw-r--r--src/bin/e_grab_dialog.c2
-rw-r--r--src/bin/e_grab_dialog.h2
-rw-r--r--src/bin/e_grabinput.c14
-rw-r--r--src/bin/e_grabinput.h14
-rw-r--r--src/bin/e_hints.c82
-rw-r--r--src/bin/e_hints.h74
-rw-r--r--src/bin/e_icon.c50
-rw-r--r--src/bin/e_icon.h50
-rw-r--r--src/bin/e_ilist.c80
-rw-r--r--src/bin/e_ilist.h80
-rw-r--r--src/bin/e_import_config_dialog.c2
-rw-r--r--src/bin/e_import_config_dialog.h2
-rw-r--r--src/bin/e_import_dialog.c2
-rw-r--r--src/bin/e_import_dialog.h2
-rw-r--r--src/bin/e_init.c18
-rw-r--r--src/bin/e_init.h22
-rw-r--r--src/bin/e_int_client_locks.c2
-rw-r--r--src/bin/e_int_client_locks.h2
-rw-r--r--src/bin/e_int_client_menu.c12
-rw-r--r--src/bin/e_int_client_menu.h12
-rw-r--r--src/bin/e_int_client_prop.c2
-rw-r--r--src/bin/e_int_client_prop.h2
-rw-r--r--src/bin/e_int_client_remember.c4
-rw-r--r--src/bin/e_int_client_remember.h4
-rw-r--r--src/bin/e_int_config_comp.c2
-rw-r--r--src/bin/e_int_config_comp_match.c2
-rw-r--r--src/bin/e_int_config_modules.c2
-rw-r--r--src/bin/e_int_config_modules.h2
-rw-r--r--src/bin/e_int_gadcon_config.c6
-rw-r--r--src/bin/e_int_gadcon_config.h6
-rw-r--r--src/bin/e_int_menus.c26
-rw-r--r--src/bin/e_int_menus.h28
-rw-r--r--src/bin/e_int_shelf_config.c2
-rw-r--r--src/bin/e_int_shelf_config.h2
-rw-r--r--src/bin/e_int_toolbar_config.c2
-rw-r--r--src/bin/e_int_toolbar_config.h2
-rw-r--r--src/bin/e_intl.c20
-rw-r--r--src/bin/e_intl.h26
-rw-r--r--src/bin/e_intl_data.c6
-rw-r--r--src/bin/e_intl_data.h6
-rw-r--r--src/bin/e_ipc_codec.c84
-rw-r--r--src/bin/e_ipc_codec.h102
-rw-r--r--src/bin/e_layout.c42
-rw-r--r--src/bin/e_layout.h42
-rw-r--r--src/bin/e_livethumb.c12
-rw-r--r--src/bin/e_livethumb.h12
-rw-r--r--src/bin/e_main.c18
-rw-r--r--src/bin/e_maximize.c8
-rw-r--r--src/bin/e_maximize.h8
-rw-r--r--src/bin/e_menu.c84
-rw-r--r--src/bin/e_menu.h96
-rw-r--r--src/bin/e_module.c36
-rw-r--r--src/bin/e_module.h36
-rw-r--r--src/bin/e_mouse.c2
-rw-r--r--src/bin/e_mouse.h2
-rw-r--r--src/bin/e_moveresize.c4
-rw-r--r--src/bin/e_moveresize.h4
-rw-r--r--src/bin/e_msg.c6
-rw-r--r--src/bin/e_msg.h6
-rw-r--r--src/bin/e_msgbus.c2
-rw-r--r--src/bin/e_msgbus.h2
-rw-r--r--src/bin/e_notification.c10
-rw-r--r--src/bin/e_notification.h10
-rw-r--r--src/bin/e_obj_dialog.c12
-rw-r--r--src/bin/e_obj_dialog.h12
-rw-r--r--src/bin/e_object.c40
-rw-r--r--src/bin/e_object.h44
-rw-r--r--src/bin/e_open.c27
-rw-r--r--src/bin/e_order.c18
-rw-r--r--src/bin/e_order.h20
-rw-r--r--src/bin/e_pan.c14
-rw-r--r--src/bin/e_pan.h14
-rw-r--r--src/bin/e_path.c22
-rw-r--r--src/bin/e_path.h24
-rw-r--r--src/bin/e_pixmap.c70
-rw-r--r--src/bin/e_pixmap.h70
-rw-r--r--src/bin/e_place.c10
-rw-r--r--src/bin/e_place.h10
-rw-r--r--src/bin/e_pointer.c20
-rw-r--r--src/bin/e_pointer.h20
-rw-r--r--src/bin/e_powersave.c16
-rw-r--r--src/bin/e_powersave.h12
-rw-r--r--src/bin/e_prefix.c20
-rw-r--r--src/bin/e_prefix.h20
-rw-r--r--src/bin/e_randr2.c18
-rw-r--r--src/bin/e_randr2.h18
-rw-r--r--src/bin/e_remember.c26
-rw-r--r--src/bin/e_remember.h26
-rw-r--r--src/bin/e_resist.c4
-rw-r--r--src/bin/e_resist.h4
-rw-r--r--src/bin/e_scale.c4
-rw-r--r--src/bin/e_scale.h4
-rw-r--r--src/bin/e_screensaver.c18
-rw-r--r--src/bin/e_screensaver.h18
-rw-r--r--src/bin/e_scrollframe.c40
-rw-r--r--src/bin/e_scrollframe.h40
-rw-r--r--src/bin/e_sha1.c2
-rw-r--r--src/bin/e_sha1.h14
-rw-r--r--src/bin/e_shelf.c60
-rw-r--r--src/bin/e_shelf.h60
-rw-r--r--src/bin/e_signals.c10
-rw-r--r--src/bin/e_signals.h10
-rw-r--r--src/bin/e_slidecore.c10
-rw-r--r--src/bin/e_slidecore.h10
-rw-r--r--src/bin/e_slider.c38
-rw-r--r--src/bin/e_slider.h38
-rw-r--r--src/bin/e_slidesel.c8
-rw-r--r--src/bin/e_slidesel.h8
-rw-r--r--src/bin/e_start_main.c29
-rw-r--r--src/bin/e_startup.c2
-rw-r--r--src/bin/e_startup.h2
-rw-r--r--src/bin/e_sys.c18
-rw-r--r--src/bin/e_sys.h18
-rw-r--r--src/bin/e_test.c2
-rw-r--r--src/bin/e_test.h2
-rw-r--r--src/bin/e_theme.c24
-rw-r--r--src/bin/e_theme.h24
-rw-r--r--src/bin/e_theme_about.c4
-rw-r--r--src/bin/e_theme_about.h4
-rw-r--r--src/bin/e_thumb.c18
-rw-r--r--src/bin/e_thumb.h18
-rw-r--r--src/bin/e_toolbar.c14
-rw-r--r--src/bin/e_toolbar.h14
-rw-r--r--src/bin/e_user.c20
-rw-r--r--src/bin/e_user.h20
-rw-r--r--src/bin/e_utils.c104
-rw-r--r--src/bin/e_utils.h90
-rw-r--r--src/bin/e_uuid_store.h8
-rw-r--r--src/bin/e_widget.c60
-rw-r--r--src/bin/e_widget.h60
-rw-r--r--src/bin/e_widget_aspect.c8
-rw-r--r--src/bin/e_widget_aspect.h8
-rw-r--r--src/bin/e_widget_bgpreview.c8
-rw-r--r--src/bin/e_widget_bgpreview.h8
-rw-r--r--src/bin/e_widget_button.c6
-rw-r--r--src/bin/e_widget_button.h6
-rw-r--r--src/bin/e_widget_check.c14
-rw-r--r--src/bin/e_widget_check.h14
-rw-r--r--src/bin/e_widget_color_well.h6
-rw-r--r--src/bin/e_widget_config_list.c12
-rw-r--r--src/bin/e_widget_config_list.h12
-rw-r--r--src/bin/e_widget_entry.c14
-rw-r--r--src/bin/e_widget_entry.h14
-rw-r--r--src/bin/e_widget_filepreview.c8
-rw-r--r--src/bin/e_widget_filepreview.h8
-rw-r--r--src/bin/e_widget_flist.c22
-rw-r--r--src/bin/e_widget_flist.h22
-rw-r--r--src/bin/e_widget_font_preview.c4
-rw-r--r--src/bin/e_widget_font_preview.h4
-rw-r--r--src/bin/e_widget_framelist.c10
-rw-r--r--src/bin/e_widget_framelist.h10
-rw-r--r--src/bin/e_widget_frametable.c12
-rw-r--r--src/bin/e_widget_frametable.h12
-rw-r--r--src/bin/e_widget_fsel.c10
-rw-r--r--src/bin/e_widget_fsel.h10
-rw-r--r--src/bin/e_widget_ilist.c106
-rw-r--r--src/bin/e_widget_ilist.h106
-rw-r--r--src/bin/e_widget_image.c10
-rw-r--r--src/bin/e_widget_image.h10
-rw-r--r--src/bin/e_widget_label.c4
-rw-r--r--src/bin/e_widget_label.h4
-rw-r--r--src/bin/e_widget_list.c10
-rw-r--r--src/bin/e_widget_list.h10
-rw-r--r--src/bin/e_widget_preview.c18
-rw-r--r--src/bin/e_widget_preview.h18
-rw-r--r--src/bin/e_widget_radio.c8
-rw-r--r--src/bin/e_widget_radio.h8
-rw-r--r--src/bin/e_widget_scrollframe.c14
-rw-r--r--src/bin/e_widget_scrollframe.h14
-rw-r--r--src/bin/e_widget_slider.c18
-rw-r--r--src/bin/e_widget_slider.h18
-rw-r--r--src/bin/e_widget_table.c10
-rw-r--r--src/bin/e_widget_table.h10
-rw-r--r--src/bin/e_widget_textblock.c6
-rw-r--r--src/bin/e_widget_textblock.h6
-rw-r--r--src/bin/e_widget_toolbar.c24
-rw-r--r--src/bin/e_widget_toolbar.h24
-rw-r--r--src/bin/e_widget_toolbook.c6
-rw-r--r--src/bin/e_widget_toolbook.h6
-rw-r--r--src/bin/e_win.c20
-rw-r--r--src/bin/e_win.h20
-rw-r--r--src/bin/e_xinerama.c12
-rw-r--r--src/bin/e_xinerama.h12
-rw-r--r--src/bin/e_xkb.c28
-rw-r--r--src/bin/e_xkb.h28
-rw-r--r--src/bin/e_xsettings.c2
-rw-r--r--src/bin/e_xsettings.h2
-rw-r--r--src/bin/e_zone.c78
-rw-r--r--src/bin/e_zone.h82
-rw-r--r--src/bin/e_zoomap.c22
-rw-r--r--src/bin/e_zoomap.h22
-rw-r--r--src/modules/access/e_mod_main.c8
-rw-r--r--src/modules/appmenu/e_mod_main.c8
-rw-r--r--src/modules/backlight/e_mod_main.c8
-rw-r--r--src/modules/battery/e_mod_main.c8
-rw-r--r--src/modules/battery/e_mod_main.h8
-rw-r--r--src/modules/bluez4/e_mod_main.c8
-rw-r--r--src/modules/bluez4/e_mod_main.h8
-rw-r--r--src/modules/clock/e_mod_main.c8
-rw-r--r--src/modules/clock/e_mod_main.h8
-rw-r--r--src/modules/conf/e_mod_main.c8
-rw-r--r--src/modules/conf_applications/e_mod_main.c8
-rw-r--r--src/modules/conf_bindings/e_mod_main.c8
-rw-r--r--src/modules/conf_dialogs/e_mod_main.c8
-rw-r--r--src/modules/conf_display/e_mod_main.c8
-rw-r--r--src/modules/conf_interaction/e_mod_main.c8
-rw-r--r--src/modules/conf_intl/e_mod_main.c8
-rw-r--r--src/modules/conf_menus/e_mod_main.c8
-rw-r--r--src/modules/conf_paths/e_mod_main.c8
-rw-r--r--src/modules/conf_performance/e_mod_main.c8
-rw-r--r--src/modules/conf_randr/e_mod_main.c8
-rw-r--r--src/modules/conf_randr/e_mod_main.h8
-rw-r--r--src/modules/conf_shelves/e_mod_main.c8
-rw-r--r--src/modules/conf_theme/e_mod_main.c6
-rw-r--r--src/modules/conf_window_manipulation/e_mod_main.c8
-rw-r--r--src/modules/conf_window_remembers/e_mod_main.c8
-rw-r--r--src/modules/connman/e_connman.c4
-rw-r--r--src/modules/connman/e_mod_main.c8
-rw-r--r--src/modules/connman/e_mod_main.h8
-rw-r--r--src/modules/cpufreq/e_mod_main.c8
-rw-r--r--src/modules/cpufreq/e_mod_main.h8
-rw-r--r--src/modules/everything/e_mod_main.c8
-rw-r--r--src/modules/everything/e_mod_main.h12
-rw-r--r--src/modules/everything/evry_config.c4
-rw-r--r--src/modules/fileman/e_mod_main.c8
-rw-r--r--src/modules/fileman_opinfo/e_mod_main.c8
-rw-r--r--src/modules/gadman/e_mod_main.c8
-rw-r--r--src/modules/geolocation/e_mod_main.c8
-rw-r--r--src/modules/ibar/e_mod_main.c8
-rw-r--r--src/modules/ibar/e_mod_main.h8
-rw-r--r--src/modules/ibox/e_mod_main.c8
-rw-r--r--src/modules/ibox/e_mod_main.h8
-rw-r--r--src/modules/layout/e_mod_main.c8
-rw-r--r--src/modules/lokker/e_mod_main.c6
-rw-r--r--src/modules/lokker/e_mod_main.h2
-rw-r--r--src/modules/mixer/e_mod_main.c8
-rw-r--r--src/modules/mixer/e_mod_main.h8
-rw-r--r--src/modules/msgbus/e_mod_main.c8
-rw-r--r--src/modules/music-control/e_mod_main.c8
-rw-r--r--src/modules/music-control/e_mod_main.h8
-rw-r--r--src/modules/notification/e_mod_main.c8
-rw-r--r--src/modules/notification/e_mod_main.h8
-rw-r--r--src/modules/packagekit/e_mod_main.c8
-rw-r--r--src/modules/packagekit/e_mod_main.h8
-rw-r--r--src/modules/pager/e_mod_main.c8
-rw-r--r--src/modules/pager/e_mod_main.h8
-rw-r--r--src/modules/pager_plain/e_mod_main.c8
-rw-r--r--src/modules/pager_plain/e_mod_main.h8
-rw-r--r--src/modules/policy_mobile/e_mod_main.c8
-rw-r--r--src/modules/quickaccess/e_mod_main.c8
-rw-r--r--src/modules/quickaccess/e_mod_main.h2
-rw-r--r--src/modules/shot/e_mod_main.c8
-rw-r--r--src/modules/start/e_mod_main.c8
-rw-r--r--src/modules/syscon/e_mod_main.c6
-rw-r--r--src/modules/syscon/e_syscon_gadget.c2
-rw-r--r--src/modules/systray/e_mod_main.c8
-rw-r--r--src/modules/systray/e_mod_main.h8
-rw-r--r--src/modules/tasks/e_mod_main.c8
-rw-r--r--src/modules/tasks/e_mod_main.h8
-rw-r--r--src/modules/teamwork/e_mod_main.c8
-rw-r--r--src/modules/teamwork/e_mod_main.h2
-rw-r--r--src/modules/temperature/e_mod_main.c8
-rw-r--r--src/modules/temperature/e_mod_main.h8
-rw-r--r--src/modules/tiling/e_mod_tiling.c8
-rw-r--r--src/modules/tiling/e_mod_tiling.h8
-rw-r--r--src/modules/winlist/e_mod_main.c8
-rw-r--r--src/modules/wizard/e_mod_main.c8
-rw-r--r--src/modules/wizard/e_wizard.c26
-rw-r--r--src/modules/wizard/e_wizard.h26
-rw-r--r--src/modules/wizard/page_000.c10
-rw-r--r--src/modules/wizard/page_010.c10
-rw-r--r--src/modules/wizard/page_011.c10
-rw-r--r--src/modules/wizard/page_020.c10
-rw-r--r--src/modules/wizard/page_030.c10
-rw-r--r--src/modules/wizard/page_040.c10
-rw-r--r--src/modules/wizard/page_050.c10
-rw-r--r--src/modules/wizard/page_060.c10
-rw-r--r--src/modules/wizard/page_070.c10
-rw-r--r--src/modules/wizard/page_080.c10
-rw-r--r--src/modules/wizard/page_090.c10
-rw-r--r--src/modules/wizard/page_100.c10
-rw-r--r--src/modules/wizard/page_110.c10
-rw-r--r--src/modules/wizard/page_120.c10
-rw-r--r--src/modules/wizard/page_130.c10
-rw-r--r--src/modules/wizard/page_150.c4
-rw-r--r--src/modules/wizard/page_160.c10
-rw-r--r--src/modules/wizard/page_170.c10
-rw-r--r--src/modules/wizard/page_180.c10
-rw-r--r--src/modules/wizard/page_200.c10
-rw-r--r--src/modules/wl_desktop_shell/e_mod_main.c6
-rw-r--r--src/modules/wl_drm/e_mod_main.c6
-rw-r--r--src/modules/wl_fb/e_mod_main.c6
-rw-r--r--src/modules/wl_screenshot/e_mod_main.c8
-rw-r--r--src/modules/wl_x11/e_mod_main.c6
-rw-r--r--src/modules/xkbswitch/e_mod_main.c8
403 files changed, 4111 insertions, 4004 deletions
diff --git a/src/bin/e.h b/src/bin/e.h
index f78f6fb85..c45078a73 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -131,14 +131,14 @@ void *alloca (size_t);
# include <uuid.h>
# endif
-# ifdef EAPI
-# undef EAPI
+# ifdef E_API
+# undef E_API
# endif
# ifdef WIN32
# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
+# define E_API __declspec(dllexport)
# else
-# define EAPI __declspec(dllimport)
+# define E_API __declspec(dllimport)
# endif
# else
# ifdef __GNUC__
@@ -147,12 +147,12 @@ void *alloca (size_t);
# if 0
# pragma GCC visibility push(hidden)
# endif
-# define EAPI __attribute__ ((visibility("default")))
+# define E_API __attribute__ ((visibility("default")))
# else
-# define EAPI
+# define E_API
# endif
# else
-# define EAPI
+# define E_API
# endif
# endif
@@ -296,30 +296,30 @@ typedef struct _E_Rect E_Rect;
# undef E_TYPEDEFS
# include "e_includes.h"
-EAPI double e_main_ts(const char *str);
+E_API double e_main_ts(const char *str);
struct _E_Rect
{
int x, y, w, h;
};
-extern EAPI E_Path *path_data;
-extern EAPI E_Path *path_images;
-extern EAPI E_Path *path_fonts;
-extern EAPI E_Path *path_themes;
-extern EAPI E_Path *path_icons;
-extern EAPI E_Path *path_modules;
-extern EAPI E_Path *path_backgrounds;
-extern EAPI E_Path *path_messages;
-extern EAPI Eina_Bool good;
-extern EAPI Eina_Bool evil;
-extern EAPI Eina_Bool starting;
-extern EAPI Eina_Bool stopping;
-extern EAPI Eina_Bool restart;
-extern EAPI Eina_Bool e_nopause;
-
-extern EAPI Eina_Bool e_precache_end;
-extern EAPI Eina_Bool x_fatal;
+extern E_API E_Path *path_data;
+extern E_API E_Path *path_images;
+extern E_API E_Path *path_fonts;
+extern E_API E_Path *path_themes;
+extern E_API E_Path *path_icons;
+extern E_API E_Path *path_modules;
+extern E_API E_Path *path_backgrounds;
+extern E_API E_Path *path_messages;
+extern E_API Eina_Bool good;
+extern E_API Eina_Bool evil;
+extern E_API Eina_Bool starting;
+extern E_API Eina_Bool stopping;
+extern E_API Eina_Bool restart;
+extern E_API Eina_Bool e_nopause;
+
+extern E_API Eina_Bool e_precache_end;
+extern E_API Eina_Bool x_fatal;
extern EINTERN const char *e_first_frame;
extern EINTERN double e_first_frame_start_time;
diff --git a/src/bin/e_about.c b/src/bin/e_about.c
index 6b57c9d28..242d66bb6 100644
--- a/src/bin/e_about.c
+++ b/src/bin/e_about.c
@@ -6,7 +6,7 @@
/* externally accessible functions */
-EAPI E_About *
+E_API E_About *
e_about_new(void)
{
E_Obj_Dialog *od;
@@ -110,7 +110,7 @@ e_about_new(void)
return (E_About *)od;
}
-EAPI void
+E_API void
e_about_show(E_About *about)
{
e_obj_dialog_show((E_Obj_Dialog *)about);
diff --git a/src/bin/e_about.h b/src/bin/e_about.h
index bff33e393..367d4e0e6 100644
--- a/src/bin/e_about.h
+++ b/src/bin/e_about.h
@@ -6,8 +6,8 @@ typedef struct _E_Obj_Dialog E_About;
#ifndef E_ABOUT_H
#define E_ABOUT_H
-EAPI E_About *e_about_new (void);
-EAPI void e_about_show (E_About *about);
+E_API E_About *e_about_new (void);
+E_API void e_about_show (E_About *about);
#endif
#endif
diff --git a/src/bin/e_acpi.c b/src/bin/e_acpi.c
index 07e0854ea..ef6715140 100644
--- a/src/bin/e_acpi.c
+++ b/src/bin/e_acpi.c
@@ -123,7 +123,7 @@ static E_ACPI_Device_Multiplexed _devices_multiplexed[] =
};
/* public variables */
-EAPI int E_EVENT_ACPI = 0;
+E_API int E_EVENT_ACPI = 0;
/* public functions */
EINTERN int
@@ -200,13 +200,13 @@ e_acpi_lid_is_closed(void)
return lid_is_closed;
}
-EAPI void
+E_API void
e_acpi_events_freeze(void)
{
_e_acpi_events_frozen++;
}
-EAPI void
+E_API void
e_acpi_events_thaw(void)
{
_e_acpi_events_frozen--;
diff --git a/src/bin/e_acpi.h b/src/bin/e_acpi.h
index f8a5481a9..edf42d322 100644
--- a/src/bin/e_acpi.h
+++ b/src/bin/e_acpi.h
@@ -73,10 +73,10 @@ EINTERN int e_acpi_shutdown(void);
EINTERN E_Acpi_Lid_Status e_acpi_lid_status_get(void);
EINTERN Eina_Bool e_acpi_lid_is_closed(void);
-EAPI void e_acpi_events_freeze(void);
-EAPI void e_acpi_events_thaw(void);
+E_API void e_acpi_events_freeze(void);
+E_API void e_acpi_events_thaw(void);
-extern EAPI int E_EVENT_ACPI;
+extern E_API int E_EVENT_ACPI;
# endif
#endif
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 1f62c54b2..07c8a9170 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -3484,13 +3484,13 @@ e_actions_shutdown(void)
return 1;
}
-EAPI Eina_List *
+E_API Eina_List *
e_action_name_list(void)
{
return action_names;
}
-EAPI E_Action *
+E_API E_Action *
e_action_add(const char *name)
{
E_Action *act;
@@ -3508,7 +3508,7 @@ e_action_add(const char *name)
return act;
}
-EAPI void
+E_API void
e_action_del(const char *name)
{
E_Action *act;
@@ -3517,7 +3517,7 @@ e_action_del(const char *name)
if (act) _e_action_free(act);
}
-EAPI E_Action *
+E_API E_Action *
e_action_find(const char *name)
{
E_Action *act;
@@ -3526,7 +3526,7 @@ e_action_find(const char *name)
return act;
}
-EAPI const char *
+E_API const char *
e_action_predef_label_get(const char *action, const char *params)
{
E_Action_Group *actg = NULL;
@@ -3552,7 +3552,7 @@ e_action_predef_label_get(const char *action, const char *params)
return NULL;
}
-EAPI void
+E_API void
e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable)
{
E_Action_Group *actg = NULL;
@@ -3598,7 +3598,7 @@ e_action_predef_name_set(const char *act_grp, const char *act_name, const char *
actg->acts = eina_list_append(actg->acts, actd);
}
-EAPI void
+E_API void
e_action_predef_name_del(const char *act_grp, const char *act_name)
{
E_Action_Group *actg = NULL;
@@ -3637,7 +3637,7 @@ e_action_predef_name_del(const char *act_grp, const char *act_name)
}
}
-EAPI void
+E_API void
e_action_predef_name_all_del(void)
{
E_Action_Group *actg = NULL;
@@ -3660,7 +3660,7 @@ e_action_predef_name_all_del(void)
action_groups = NULL;
}
-EAPI Eina_List *
+E_API Eina_List *
e_action_groups_get(void)
{
return action_groups;
diff --git a/src/bin/e_actions.h b/src/bin/e_actions.h
index 5b2ec40bd..2b8fe8059 100644
--- a/src/bin/e_actions.h
+++ b/src/bin/e_actions.h
@@ -48,17 +48,17 @@ struct _E_Action_Group
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);
+E_API Eina_List *e_action_name_list(void);
+E_API E_Action *e_action_add(const char *name);
/* e_action_del allows, for example, modules to define their own actions dynamically. */
-EAPI void e_action_del(const char *name);
-EAPI E_Action *e_action_find(const char *name);
+E_API void e_action_del(const char *name);
+E_API E_Action *e_action_find(const char *name);
-EAPI const char *e_action_predef_label_get(const char *action, const char *params);
-EAPI void e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable);
-EAPI void e_action_predef_name_del(const char *act_grp, const char *act_name);
-EAPI void e_action_predef_name_all_del(void);
-EAPI Eina_List *e_action_groups_get(void);
+E_API const char *e_action_predef_label_get(const char *action, const char *params);
+E_API void e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable);
+E_API void e_action_predef_name_del(const char *act_grp, const char *act_name);
+E_API void e_action_predef_name_all_del(void);
+E_API Eina_List *e_action_groups_get(void);
#endif
#endif
diff --git a/src/bin/e_alert.c b/src/bin/e_alert.c
index 1868d3238..c6a1f0a5d 100644
--- a/src/bin/e_alert.c
+++ b/src/bin/e_alert.c
@@ -2,7 +2,7 @@
#include <sys/wait.h>
/* public variables */
-EAPI unsigned long _e_alert_composite_win = 0;
+E_API unsigned long _e_alert_composite_win = 0;
EINTERN int
e_alert_init(void)
@@ -16,7 +16,7 @@ e_alert_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window comp)
{
#ifndef HAVE_WAYLAND_ONLY
@@ -34,7 +34,7 @@ e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window comp)
#endif
}
-EAPI void
+E_API void
e_alert_show(void)
{
if (!e_nopause)
diff --git a/src/bin/e_alert.h b/src/bin/e_alert.h
index dead6c743..0f1ef3a8d 100644
--- a/src/bin/e_alert.h
+++ b/src/bin/e_alert.h
@@ -13,7 +13,7 @@ typedef enum _E_Alert_Op_Type
EINTERN int e_alert_init(void);
EINTERN int e_alert_shutdown(void);
-EAPI void e_alert_show(void);
+E_API void e_alert_show(void);
#endif
#endif
diff --git a/src/bin/e_atoms.c b/src/bin/e_atoms.c
index a84c7591c..94e63d8c8 100644
--- a/src/bin/e_atoms.c
+++ b/src/bin/e_atoms.c
@@ -2,17 +2,17 @@
/* Atoms */
#ifndef HAVE_WAYLAND_ONLY
-EAPI Ecore_X_Atom E_ATOM_MANAGED = 0;
-EAPI Ecore_X_Atom E_ATOM_ZONE = 0;
-EAPI Ecore_X_Atom E_ATOM_DESK = 0;
-EAPI Ecore_X_Atom E_ATOM_MAPPED = 0;
-EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION = 0;
-EAPI Ecore_X_Atom E_ATOM_HIDDEN = 0;
-EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE = 0;
-EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE = 0;
-EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0;
-EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0;
-EAPI Ecore_X_Atom E_ATOM_ZONE_GEOMETRY = 0;
+E_API Ecore_X_Atom E_ATOM_MANAGED = 0;
+E_API Ecore_X_Atom E_ATOM_ZONE = 0;
+E_API Ecore_X_Atom E_ATOM_DESK = 0;
+E_API Ecore_X_Atom E_ATOM_MAPPED = 0;
+E_API Ecore_X_Atom E_ATOM_SHADE_DIRECTION = 0;
+E_API Ecore_X_Atom E_ATOM_HIDDEN = 0;
+E_API Ecore_X_Atom E_ATOM_BORDER_SIZE = 0;
+E_API Ecore_X_Atom E_ATOM_WINDOW_STATE = 0;
+E_API Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0;
+E_API Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0;
+E_API Ecore_X_Atom E_ATOM_ZONE_GEOMETRY = 0;
#endif
/* externally accessible functions */
diff --git a/src/bin/e_atoms.h b/src/bin/e_atoms.h
index d01b364f4..be94fc585 100644
--- a/src/bin/e_atoms.h
+++ b/src/bin/e_atoms.h
@@ -4,26 +4,26 @@
#define E_ATOMS_H
/* an "overall" atom to see that we recognise the window */
-extern EAPI Ecore_X_Atom E_ATOM_MANAGED;
+extern E_API Ecore_X_Atom E_ATOM_MANAGED;
/* basic window properties */
-extern EAPI Ecore_X_Atom E_ATOM_ZONE;
-extern EAPI Ecore_X_Atom E_ATOM_DESK;
-extern EAPI Ecore_X_Atom E_ATOM_MAPPED;
-extern EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION;
-extern EAPI Ecore_X_Atom E_ATOM_HIDDEN;
-extern EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE;
-extern EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE;
+extern E_API Ecore_X_Atom E_ATOM_ZONE;
+extern E_API Ecore_X_Atom E_ATOM_DESK;
+extern E_API Ecore_X_Atom E_ATOM_MAPPED;
+extern E_API Ecore_X_Atom E_ATOM_SHADE_DIRECTION;
+extern E_API Ecore_X_Atom E_ATOM_HIDDEN;
+extern E_API Ecore_X_Atom E_ATOM_BORDER_SIZE;
+extern E_API Ecore_X_Atom E_ATOM_DESKTOP_FILE;
/* extra e window states */
/* if we add more states, we need to fix
* * e_hints_window_e_state_get()
* * e_hints_window_e_state_set()
* * _e_win_state_update() + e_win
*/
-extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE;
-extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED;
+extern E_API Ecore_X_Atom E_ATOM_WINDOW_STATE;
+extern E_API Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED;
-extern EAPI Ecore_X_Atom E_ATOM_ZONE_GEOMETRY;
+extern E_API Ecore_X_Atom E_ATOM_ZONE_GEOMETRY;
EINTERN int e_atoms_init(void);
EINTERN int e_atoms_shutdown(void);
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
index 6d23d8be2..78d171c2f 100644
--- a/src/bin/e_auth.c
+++ b/src/bin/e_auth.c
@@ -130,7 +130,7 @@ _auth_pam_init(E_Auth *da)
}
#endif // HAVE_PAM && !__FreeBSD__
-EAPI int
+E_API int
#if defined(__FreeBSD__)
e_auth_begin(char *passwd)
{
@@ -225,7 +225,7 @@ e_auth_begin(char *passwd EINA_UNUSED)
}
#endif
-EAPI char *
+E_API char *
e_auth_hostname_get(void)
{
return strdup("localhost");
diff --git a/src/bin/e_auth.h b/src/bin/e_auth.h
index a106e079f..a91f064d1 100644
--- a/src/bin/e_auth.h
+++ b/src/bin/e_auth.h
@@ -1,8 +1,8 @@
#ifndef E_AUTH_H
#define E_AUTH_H
-EAPI int e_auth_begin(char *passwd);
-EAPI char *e_auth_hostname_get(void);
+E_API int e_auth_begin(char *passwd);
+E_API char *e_auth_hostname_get(void);
static inline int
e_auth_hash_djb2(const char *key, int len)
diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c
index 92c8a0dc8..9d6418ce1 100644
--- a/src/bin/e_backlight.c
+++ b/src/bin/e_backlight.c
@@ -50,7 +50,7 @@ static int bl_mib[CTL_MAXNAME];
static int bl_mib_len = -1;
#endif
-EAPI int E_EVENT_BACKLIGHT_CHANGE = -1;
+E_API int E_EVENT_BACKLIGHT_CHANGE = -1;
EINTERN int
e_backlight_init(void)
@@ -101,14 +101,14 @@ e_backlight_shutdown(void)
return 1;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_backlight_exists(void)
{
if (sysmode == MODE_NONE) return EINA_FALSE;
return EINA_TRUE;
}
-EAPI void
+E_API void
e_backlight_update(void)
{
if (bl_avail == EINA_FALSE) return;
@@ -116,7 +116,7 @@ e_backlight_update(void)
_e_backlight_update();
}
-EAPI void
+E_API void
e_backlight_level_set(E_Zone *zone, double val, double tim)
{
double bl_now;
@@ -154,14 +154,14 @@ e_backlight_level_set(E_Zone *zone, double val, double tim)
bl_anim_toval = val;
}
-EAPI double
+E_API double
e_backlight_level_get(E_Zone *zone EINA_UNUSED)
{
// zone == NULL == everything
return e_bl_val;
}
-EAPI void
+E_API void
e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
{
E_Backlight_Mode pmode;
@@ -189,14 +189,14 @@ e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
e_backlight_level_set(zone, 1.0, -1.0);
}
-EAPI E_Backlight_Mode
+E_API E_Backlight_Mode
e_backlight_mode_get(E_Zone *zone EINA_UNUSED)
{
// zone == NULL == everything
return e_config->backlight.mode;
}
-EAPI const Eina_List *
+E_API const Eina_List *
e_backlight_devices_get(void)
{
return bl_devs;
diff --git a/src/bin/e_backlight.h b/src/bin/e_backlight.h
index bee7c66e9..0a8b239bd 100644
--- a/src/bin/e_backlight.h
+++ b/src/bin/e_backlight.h
@@ -18,7 +18,7 @@ typedef enum _E_Backlight_Mode
#ifndef E_BACKLIGHT_H
#define E_BACKLIGHT_H
-extern EAPI int E_EVENT_BACKLIGHT_CHANGE;
+extern E_API int E_EVENT_BACKLIGHT_CHANGE;
//struct _E_Screen
//{
@@ -28,13 +28,13 @@ extern EAPI int E_EVENT_BACKLIGHT_CHANGE;
EINTERN int e_backlight_init(void);
EINTERN int e_backlight_shutdown(void);
-EAPI Eina_Bool e_backlight_exists(void);
-EAPI void e_backlight_update(void);
-EAPI void e_backlight_level_set(E_Zone *zone, double val, double tim);
-EAPI double e_backlight_level_get(E_Zone *zone);
-EAPI void e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode);
-EAPI E_Backlight_Mode e_backlight_mode_get(E_Zone *zone);
-EAPI const Eina_List *e_backlight_devices_get(void);
+E_API Eina_Bool e_backlight_exists(void);
+E_API void e_backlight_update(void);
+E_API void e_backlight_level_set(E_Zone *zone, double val, double tim);
+E_API double e_backlight_level_get(E_Zone *zone);
+E_API void e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode);
+E_API E_Backlight_Mode e_backlight_mode_get(E_Zone *zone);
+E_API const Eina_List *e_backlight_devices_get(void);
#endif
#endif
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 42fe14360..5a593aba4 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -8,7 +8,7 @@ static int e_bg_handler_test(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
static void _e_bg_handler_image_imported(const char *image_path, void *data);
/* local subsystem globals */
-EAPI int E_EVENT_BG_UPDATE = 0;
+E_API int E_EVENT_BG_UPDATE = 0;
static E_Fm2_Mime_Handler *bg_hdl = NULL;
/* externally accessible functions */
@@ -75,7 +75,7 @@ e_bg_shutdown(void)
* Use -1 as a wild card for each parameter.
* The most specific match will be returned
*/
-EAPI const E_Config_Desktop_Background *
+E_API const E_Config_Desktop_Background *
e_bg_config_get(int zone_num, int desk_x, int desk_y)
{
Eina_List *l, *entries;
@@ -140,7 +140,7 @@ e_bg_config_get(int zone_num, int desk_x, int desk_y)
return bg;
}
-EAPI Eina_Stringshare *
+E_API Eina_Stringshare *
e_bg_file_get(int zone_num, int desk_x, int desk_y)
{
const E_Config_Desktop_Background *cfbg;
@@ -188,7 +188,7 @@ e_bg_file_get(int zone_num, int desk_x, int desk_y)
return bgfile;
}
-EAPI void
+E_API void
e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
{
Evas_Object *o;
@@ -289,7 +289,7 @@ end:
eina_stringshare_del(bgfile);
}
-EAPI void
+E_API void
e_bg_default_set(const char *file)
{
E_Event_Bg_Update *ev;
@@ -325,7 +325,7 @@ e_bg_default_set(const char *file)
ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL);
}
-EAPI void
+E_API void
e_bg_add(int zone, int desk_x, int desk_y, const char *file)
{
const Eina_List *l;
@@ -364,7 +364,7 @@ e_bg_add(int zone, int desk_x, int desk_y, const char *file)
ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL);
}
-EAPI void
+E_API void
e_bg_del(int zone, int desk_x, int desk_y)
{
Eina_List *l;
@@ -391,7 +391,7 @@ e_bg_del(int zone, int desk_x, int desk_y)
ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL);
}
-EAPI void
+E_API void
e_bg_update(void)
{
const Eina_List *l;
diff --git a/src/bin/e_bg.h b/src/bin/e_bg.h
index b901e908c..65414d3f3 100644
--- a/src/bin/e_bg.h
+++ b/src/bin/e_bg.h
@@ -15,7 +15,7 @@ typedef struct _E_Bg_Image_Import_Handle E_Bg_Image_Import_Handle;
#ifndef E_BG_H
#define E_BG_H
-extern EAPI int E_EVENT_BG_UPDATE;
+extern E_API int E_EVENT_BG_UPDATE;
struct _E_Event_Bg_Update
{
@@ -27,16 +27,16 @@ struct _E_Event_Bg_Update
EINTERN int e_bg_init(void);
EINTERN int e_bg_shutdown(void);
-EAPI const E_Config_Desktop_Background *e_bg_config_get(int zone_num, int desk_x, int desk_y);
-EAPI Eina_Stringshare *e_bg_file_get(int zone_num, int desk_x, int desk_y);
-EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
-EAPI void e_bg_add(int zone, int desk_x, int desk_y, const char *file);
-EAPI void e_bg_del(int zone, int desk_x, int desk_y);
-EAPI void e_bg_default_set(const char *file);
-EAPI void e_bg_update(void);
+E_API const E_Config_Desktop_Background *e_bg_config_get(int zone_num, int desk_x, int desk_y);
+E_API Eina_Stringshare *e_bg_file_get(int zone_num, int desk_x, int desk_y);
+E_API void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
+E_API void e_bg_add(int zone, int desk_x, int desk_y, const char *file);
+E_API void e_bg_del(int zone, int desk_x, int desk_y);
+E_API void e_bg_default_set(const char *file);
+E_API void e_bg_update(void);
-EAPI E_Bg_Image_Import_Handle *e_bg_image_import_new(const char *image_file, void (*cb)(void *data, const char *edje_file), const void *data);
-EAPI void e_bg_image_import_cancel(E_Bg_Image_Import_Handle *handle);
+E_API E_Bg_Image_Import_Handle *e_bg_image_import_new(const char *image_file, void (*cb)(void *data, const char *edje_file), const void *data);
+E_API void e_bg_image_import_cancel(E_Bg_Image_Import_Handle *handle);
#endif
#endif
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index f59e0179e..fffb68a8c 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -100,7 +100,7 @@ e_bindings_shutdown(void)
return 1;
}
-EAPI int
+E_API int
e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers)
{
int mod = 0;
@@ -116,7 +116,7 @@ e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers)
return mod;
}
-EAPI void
+E_API void
e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event)
{
memset(event, 0, sizeof(E_Binding_Event_Wheel));
@@ -128,7 +128,7 @@ e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_
event->modifiers = _e_bindings_modifiers(ev->modifiers);
}
-EAPI void
+E_API void
e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev, E_Binding_Event_Mouse_Button *event)
{
memset(event, 0, sizeof(E_Binding_Event_Mouse_Button));
@@ -142,7 +142,7 @@ e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev,
event->triple_click = !!ev->triple_click;
}
-EAPI void
+E_API void
e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event)
{
memset(event, 0, sizeof(E_Binding_Event_Wheel));
@@ -177,7 +177,7 @@ e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Bi
*/
}
-EAPI int
+E_API int
e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers)
{
int mod = 0;
@@ -191,7 +191,7 @@ e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers)
return mod;
}
-EAPI void
+E_API void
e_bindings_evas_event_mouse_button_convert(const Evas_Event_Mouse_Down *ev, E_Binding_Event_Mouse_Button *event)
{
memset(event, 0, sizeof(E_Binding_Event_Mouse_Button));
@@ -226,7 +226,7 @@ e_bindings_evas_event_mouse_button_convert(const Evas_Event_Mouse_Down *ev, E_Bi
*/
}
-EAPI void
+E_API void
e_bindings_signal_reset(void)
{
E_Config_Binding_Signal *ebs;
@@ -255,7 +255,7 @@ e_bindings_signal_reset(void)
}
}
-EAPI void
+E_API void
e_bindings_acpi_reset(void)
{
E_Config_Binding_Acpi *eba;
@@ -268,7 +268,7 @@ e_bindings_acpi_reset(void)
eba->action, eba->params);
}
-EAPI void
+E_API void
e_bindings_wheel_reset(void)
{
E_Config_Binding_Wheel *ebw;
@@ -281,7 +281,7 @@ e_bindings_wheel_reset(void)
ebw->any_mod, ebw->action, ebw->params);
}
-EAPI void
+E_API void
e_bindings_edge_reset(void)
{
E_Config_Binding_Edge *ebe;
@@ -294,7 +294,7 @@ e_bindings_edge_reset(void)
ebe->any_mod, ebe->action, ebe->params, ebe->delay);
}
-EAPI void
+E_API void
e_bindings_mouse_reset(void)
{
E_Config_Binding_Mouse *ebm;
@@ -307,7 +307,7 @@ e_bindings_mouse_reset(void)
ebm->any_mod, ebm->action, ebm->params);
}
-EAPI void
+E_API void
e_bindings_key_reset(void)
{
E_Config_Binding_Key *ebk;
@@ -322,7 +322,7 @@ e_bindings_key_reset(void)
e_comp_canvas_keys_grab();
}
-EAPI void
+E_API void
e_bindings_reset(void)
{
e_bindings_signal_reset();
@@ -332,7 +332,7 @@ e_bindings_reset(void)
e_bindings_key_reset();
}
-EAPI void
+E_API void
e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
E_Binding_Mouse *binding;
@@ -347,7 +347,7 @@ e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
mouse_bindings = eina_list_append(mouse_bindings, binding);
}
-EAPI void
+E_API void
e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
E_Binding_Mouse *binding;
@@ -371,7 +371,7 @@ e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
}
}
-EAPI void
+E_API void
e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{
E_Binding_Mouse *binding;
@@ -396,7 +396,7 @@ e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win)
#endif
}
-EAPI void
+E_API void
e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{
E_Binding_Mouse *binding;
@@ -417,7 +417,7 @@ e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
#endif
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Button *ev, E_Binding_Mouse **bind_ret)
{
E_Binding_Mouse *binding;
@@ -441,7 +441,7 @@ e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Butto
return NULL;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev)
{
E_Action *act;
@@ -459,7 +459,7 @@ e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Bind
return act;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Down *ev)
{
E_Binding_Event_Mouse_Button event;
@@ -469,7 +469,7 @@ e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, E
return e_bindings_mouse_down_event_handle(ctxt, obj, &event);
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev)
{
E_Binding_Event_Mouse_Button event;
@@ -479,7 +479,7 @@ e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj,
return e_bindings_mouse_down_event_handle(ctxt, obj, &event);
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev)
{
E_Action *act;
@@ -497,7 +497,7 @@ e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Bindin
return act;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Up *ev)
{
E_Binding_Event_Mouse_Button event;
@@ -507,7 +507,7 @@ e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Eva
return e_bindings_mouse_up_event_handle(ctxt, obj, &event);
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev)
{
E_Binding_Event_Mouse_Button event;
@@ -517,7 +517,7 @@ e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ec
return e_bindings_mouse_up_event_handle(ctxt, obj, &event);
}
-EAPI void
+E_API void
e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
E_Binding_Key *binding;
@@ -532,7 +532,7 @@ e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m
key_bindings = eina_list_append(key_bindings, binding);
}
-EAPI E_Binding_Key *
+E_API E_Binding_Key *
e_bindings_key_get(const char *action)
{
E_Binding_Key *binding;
@@ -546,7 +546,7 @@ e_bindings_key_get(const char *action)
return NULL;
}
-EAPI E_Binding_Key *
+E_API E_Binding_Key *
e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod)
{
E_Binding_Key *binding;
@@ -564,7 +564,7 @@ e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod)
return NULL;
}
-EAPI void
+E_API void
e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
E_Binding_Key *binding;
@@ -588,7 +588,7 @@ e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m
}
}
-EAPI void
+E_API void
e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{
E_Binding_Key *binding;
@@ -612,7 +612,7 @@ e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win)
#endif
}
-EAPI void
+E_API void
e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{
E_Binding_Key *binding;
@@ -636,7 +636,7 @@ e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
#endif
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev)
{
E_Binding_Modifier mod = 0;
@@ -669,7 +669,7 @@ e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Ev
return NULL;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev)
{
E_Binding_Modifier mod = 0;
@@ -702,7 +702,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Even
return NULL;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
{
E_Binding_Modifier mod = 0;
@@ -727,7 +727,7 @@ e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
return NULL;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
{
E_Binding_Modifier mod = 0;
@@ -752,7 +752,7 @@ e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
return NULL;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_bindings_key_allowed(const char *key)
{
if (!key) return EINA_FALSE;
@@ -779,7 +779,7 @@ e_bindings_key_allowed(const char *key)
}
-EAPI void
+E_API void
e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay)
{
E_Binding_Edge *binding;
@@ -798,7 +798,7 @@ e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_onl
e_zone_edge_new(edge);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_bindings_edge_flippable_get(E_Zone_Edge edge)
{
E_Binding_Edge *binding;
@@ -816,7 +816,7 @@ e_bindings_edge_flippable_get(E_Zone_Edge edge)
return EINA_FALSE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_bindings_edge_non_flippable_get(E_Zone_Edge edge)
{
E_Binding_Edge *binding;
@@ -835,7 +835,7 @@ e_bindings_edge_non_flippable_get(E_Zone_Edge edge)
return EINA_FALSE;
}
-EAPI E_Binding_Edge *
+E_API E_Binding_Edge *
e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click)
{
E_Binding_Edge *binding;
@@ -853,7 +853,7 @@ e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click)
return NULL;
}
-EAPI void
+E_API void
e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay)
{
E_Binding_Edge *binding;
@@ -885,7 +885,7 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_onl
e_zone_edge_free(edge);
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
{
E_Binding_Modifier mod = 0;
@@ -935,7 +935,7 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
return act;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
{
E_Binding_Modifier mod = 0;
@@ -977,7 +977,7 @@ e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_
return act;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
{
E_Binding_Modifier mod = 0;
@@ -1014,7 +1014,7 @@ e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event
return act;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
{
E_Binding_Modifier mod = 0;
@@ -1042,7 +1042,7 @@ e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
return act;
}
-EAPI void
+E_API void
e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
E_Binding_Signal *binding;
@@ -1058,7 +1058,7 @@ e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src,
signal_bindings = eina_list_append(signal_bindings, binding);
}
-EAPI void
+E_API void
e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
E_Binding_Signal *binding;
@@ -1085,7 +1085,7 @@ e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src,
}
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Signal **bind_ret)
{
E_Binding_Modifier mod = 0;
@@ -1115,7 +1115,7 @@ e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src,
return NULL;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src)
{
E_Action *act;
@@ -1136,7 +1136,7 @@ e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig,
return act;
}
-EAPI void
+E_API void
e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
E_Binding_Wheel *binding;
@@ -1152,7 +1152,7 @@ e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
wheel_bindings = eina_list_append(wheel_bindings, binding);
}
-EAPI void
+E_API void
e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
E_Binding_Wheel *binding;
@@ -1177,7 +1177,7 @@ e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
}
}
-EAPI void
+E_API void
e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{
E_Binding_Wheel *binding;
@@ -1216,7 +1216,7 @@ e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win)
#endif
}
-EAPI void
+E_API void
e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{
E_Binding_Wheel *binding;
@@ -1254,7 +1254,7 @@ e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
#endif
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Binding_Wheel **bind_ret)
{
E_Binding_Wheel *binding;
@@ -1279,7 +1279,7 @@ e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Bindi
return NULL;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Wheel *ev)
{
E_Action *act;
@@ -1297,7 +1297,7 @@ e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_E
return act;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Wheel *ev)
{
E_Binding_Event_Wheel event;
@@ -1307,7 +1307,7 @@ e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_E
return e_bindings_wheel_event_handle(ctxt, obj, &event);
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Wheel *ev)
{
E_Binding_Event_Wheel event;
@@ -1317,7 +1317,7 @@ e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore
return e_bindings_wheel_event_handle(ctxt, obj, &event);
}
-EAPI void
+E_API void
e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
{
E_Binding_Acpi *binding;
@@ -1331,7 +1331,7 @@ e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *ac
acpi_bindings = eina_list_append(acpi_bindings, binding);
}
-EAPI void
+E_API void
e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
{
E_Binding_Acpi *binding;
@@ -1353,7 +1353,7 @@ e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *ac
}
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret)
{
E_Binding_Acpi *binding;
@@ -1382,7 +1382,7 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **
return NULL;
}
-EAPI E_Action *
+E_API E_Action *
e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev)
{
E_Action *act;
diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h
index 6014ddd3b..effec66ab 100644
--- a/src/bin/e_bindings.h
+++ b/src/bin/e_bindings.h
@@ -133,73 +133,73 @@ struct _E_Binding_Acpi
EINTERN int e_bindings_init(void);
EINTERN int e_bindings_shutdown(void);
-EAPI void e_bindings_mouse_reset(void);
-EAPI void e_bindings_key_reset(void);
-EAPI void e_bindings_wheel_reset(void);
-EAPI void e_bindings_edge_reset(void);
-EAPI void e_bindings_signal_reset(void);
-EAPI void e_bindings_reset(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);
-EAPI void e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win);
-EAPI void e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
-EAPI E_Action *e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Button *ev, E_Binding_Mouse **bind_ret);
-EAPI E_Action *e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev);
-EAPI E_Action *e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Down *ev);
-EAPI E_Action *e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev);
-EAPI E_Action *e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev);
-EAPI E_Action *e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Up *ev);
-EAPI E_Action *e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev);
-
-EAPI void e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EAPI void e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EAPI E_Binding_Key *e_bindings_key_get(const char *action);
-EAPI E_Binding_Key *e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod);
-EAPI void e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win);
-EAPI void e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
-EAPI E_Action *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
-EAPI E_Action *e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
-EAPI E_Action *e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
-EAPI E_Action *e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
-
-EAPI Eina_Bool e_bindings_key_allowed(const char *key);
-
-EAPI void e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
-EAPI Eina_Bool e_bindings_edge_flippable_get(E_Zone_Edge edge);
-EAPI Eina_Bool e_bindings_edge_non_flippable_get(E_Zone_Edge edge);
-EAPI E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click);
-EAPI void e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
-EAPI E_Action *e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
-EAPI E_Action *e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
-EAPI E_Action *e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
-EAPI E_Action *e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
-
-EAPI void e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EAPI void e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EAPI E_Action *e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Signal **bind_ret);
-EAPI E_Action *e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src);
-
-EAPI void e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EAPI void e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EAPI void e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win);
-EAPI void e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
-EAPI E_Action *e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Binding_Wheel **bind_ret);
-EAPI E_Action *e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Wheel *ev);
-EAPI E_Action *e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Wheel *ev);
-EAPI E_Action *e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Wheel *ev);
-
-EAPI void e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params);
-EAPI void e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params);
-EAPI E_Action *e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret);
-EAPI E_Action *e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev);
-
-EAPI int e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers);
-EAPI int e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers);
-EAPI void e_bindings_evas_event_mouse_button_convert(const Evas_Event_Mouse_Down *ev, E_Binding_Event_Mouse_Button *event);
-EAPI void e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event);
-EAPI void e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev, E_Binding_Event_Mouse_Button *event);
-EAPI void e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event);
+E_API void e_bindings_mouse_reset(void);
+E_API void e_bindings_key_reset(void);
+E_API void e_bindings_wheel_reset(void);
+E_API void e_bindings_edge_reset(void);
+E_API void e_bindings_signal_reset(void);
+E_API void e_bindings_reset(void);
+
+E_API void e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+E_API void e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+E_API void e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win);
+E_API void e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
+E_API E_Action *e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Button *ev, E_Binding_Mouse **bind_ret);
+E_API E_Action *e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev);
+E_API E_Action *e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Down *ev);
+E_API E_Action *e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev);
+E_API E_Action *e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev);
+E_API E_Action *e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Up *ev);
+E_API E_Action *e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev);
+
+E_API void e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+E_API void e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+E_API E_Binding_Key *e_bindings_key_get(const char *action);
+E_API E_Binding_Key *e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod);
+E_API void e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win);
+E_API void e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
+E_API E_Action *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
+E_API E_Action *e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
+E_API E_Action *e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
+E_API E_Action *e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
+
+E_API Eina_Bool e_bindings_key_allowed(const char *key);
+
+E_API void e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
+E_API Eina_Bool e_bindings_edge_flippable_get(E_Zone_Edge edge);
+E_API Eina_Bool e_bindings_edge_non_flippable_get(E_Zone_Edge edge);
+E_API E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click);
+E_API void e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
+E_API E_Action *e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
+E_API E_Action *e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
+E_API E_Action *e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
+E_API E_Action *e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
+
+E_API void e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+E_API void e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+E_API E_Action *e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Signal **bind_ret);
+E_API E_Action *e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src);
+
+E_API void e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+E_API void e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+E_API void e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win);
+E_API void e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
+E_API E_Action *e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Binding_Wheel **bind_ret);
+E_API E_Action *e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Wheel *ev);
+E_API E_Action *e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Wheel *ev);
+E_API E_Action *e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Wheel *ev);
+
+E_API void e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params);
+E_API void e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params);
+E_API E_Action *e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret);
+E_API E_Action *e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev);
+
+E_API int e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers);
+E_API int e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers);
+E_API void e_bindings_evas_event_mouse_button_convert(const Evas_Event_Mouse_Down *ev, E_Binding_Event_Mouse_Button *event);
+E_API void e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event);
+E_API void e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev, E_Binding_Event_Mouse_Button *event);
+E_API void e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event);
#endif
#endif
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index cc3544114..ec8ded4d0 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3,22 +3,22 @@
static int _e_client_hooks_delete = 0;
static int _e_client_hooks_walking = 0;
-EAPI int E_EVENT_CLIENT_ADD = -1;
-EAPI int E_EVENT_CLIENT_REMOVE = -1;
-EAPI int E_EVENT_CLIENT_ZONE_SET = -1;
-EAPI int E_EVENT_CLIENT_DESK_SET = -1;
-EAPI int E_EVENT_CLIENT_RESIZE = -1;
-EAPI int E_EVENT_CLIENT_MOVE = -1;
-EAPI int E_EVENT_CLIENT_SHOW = -1;
-EAPI int E_EVENT_CLIENT_HIDE = -1;
-EAPI int E_EVENT_CLIENT_ICONIFY = -1;
-EAPI int E_EVENT_CLIENT_UNICONIFY = -1;
-EAPI int E_EVENT_CLIENT_STACK = -1;
-EAPI int E_EVENT_CLIENT_FOCUS_IN = -1;
-EAPI int E_EVENT_CLIENT_FOCUS_OUT = -1;
-EAPI int E_EVENT_CLIENT_PROPERTY = -1;
-EAPI int E_EVENT_CLIENT_FULLSCREEN = -1;
-EAPI int E_EVENT_CLIENT_UNFULLSCREEN = -1;
+E_API int E_EVENT_CLIENT_ADD = -1;
+E_API int E_EVENT_CLIENT_REMOVE = -1;
+E_API int E_EVENT_CLIENT_ZONE_SET = -1;
+E_API int E_EVENT_CLIENT_DESK_SET = -1;
+E_API int E_EVENT_CLIENT_RESIZE = -1;
+E_API int E_EVENT_CLIENT_MOVE = -1;
+E_API int E_EVENT_CLIENT_SHOW = -1;
+E_API int E_EVENT_CLIENT_HIDE = -1;
+E_API int E_EVENT_CLIENT_ICONIFY = -1;
+E_API int E_EVENT_CLIENT_UNICONIFY = -1;
+E_API int E_EVENT_CLIENT_STACK = -1;
+E_API int E_EVENT_CLIENT_FOCUS_IN = -1;
+E_API int E_EVENT_CLIENT_FOCUS_OUT = -1;
+E_API int E_EVENT_CLIENT_PROPERTY = -1;
+E_API int E_EVENT_CLIENT_FULLSCREEN = -1;
+E_API int E_EVENT_CLIENT_UNFULLSCREEN = -1;
static Eina_Hash *clients_hash = NULL; // pixmap->client
@@ -2425,7 +2425,7 @@ e_client_shutdown(void)
warp_client = NULL;
}
-EAPI E_Client *
+E_API E_Client *
e_client_new(E_Pixmap *cp, int first_map, int internal)
{
E_Client *ec;
@@ -2554,7 +2554,7 @@ e_client_new(E_Pixmap *cp, int first_map, int internal)
return ec;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_client_desk_window_profile_available_check(E_Client *ec, const char *profile)
{
int i;
@@ -2575,7 +2575,7 @@ e_client_desk_window_profile_available_check(E_Client *ec, const char *profile)
return EINA_FALSE;
}
-EAPI void
+E_API void
e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk)
{
E_OBJECT_CHECK(ec);
@@ -2609,7 +2609,7 @@ e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk)
e_object_ref(E_OBJECT(ec->e.state.profile.wait_desk));
}
-EAPI void
+E_API void
e_client_desk_set(E_Client *ec, E_Desk *desk)
{
E_Event_Client_Desk_Set *ev;
@@ -2691,26 +2691,26 @@ e_client_desk_set(E_Client *ec, E_Desk *desk)
evas_object_smart_callback_call(ec->frame, "desk_change", ec);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_client_comp_grabbed_get(void)
{
return comp_grabbed;
}
-EAPI E_Client *
+E_API E_Client *
e_client_action_get(void)
{
return action_client;
}
-EAPI E_Client *
+E_API E_Client *
e_client_warping_get(void)
{
return warp_client;
}
-EAPI Eina_List *
+E_API Eina_List *
e_clients_immortal_list(void)
{
const Eina_List *l;
@@ -2727,7 +2727,7 @@ e_clients_immortal_list(void)
//////////////////////////////////////////////////////////
-EAPI void
+E_API void
e_client_mouse_in(E_Client *ec, int x, int y)
{
if (comp_grabbed) return;
@@ -2741,7 +2741,7 @@ e_client_mouse_in(E_Client *ec, int x, int y)
e_focus_event_mouse_in(ec);
}
-EAPI void
+E_API void
e_client_mouse_out(E_Client *ec, int x, int y)
{
if (comp_grabbed) return;
@@ -2757,7 +2757,7 @@ e_client_mouse_out(E_Client *ec, int x, int y)
e_focus_event_mouse_out(ec);
}
-EAPI void
+E_API void
e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -2768,7 +2768,7 @@ e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev
e_bindings_wheel_event_handle(E_BINDING_CONTEXT_WINDOW, E_OBJECT(ec), ev);
}
-EAPI void
+E_API void
e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev)
{
Eina_Bool did_act = EINA_FALSE;
@@ -2830,7 +2830,7 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Even
ec->mouse.current.my = output->y;
}
-EAPI void
+E_API void
e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -2871,7 +2871,7 @@ e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_
ec->drag.start = 0;
}
-EAPI void
+E_API void
e_client_mouse_move(E_Client *ec, Evas_Point *output)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -2974,7 +2974,7 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output)
}
///////////////////////////////////////////////////////
-EAPI void
+E_API void
e_client_res_change_geometry_save(E_Client *ec)
{
E_OBJECT_CHECK(ec);
@@ -2992,7 +2992,7 @@ e_client_res_change_geometry_save(E_Client *ec)
ec->pre_res_change.saved.h = ec->saved.h;
}
-EAPI void
+E_API void
e_client_res_change_geometry_restore(E_Client *ec)
{
struct
@@ -3064,7 +3064,7 @@ e_client_res_change_geometry_restore(E_Client *ec)
memcpy(&ec->pre_res_change, &pre_res_change, sizeof(pre_res_change));
}
-EAPI void
+E_API void
e_client_zone_set(E_Client *ec, E_Zone *zone)
{
E_Event_Client_Zone_Set *ev;
@@ -3127,7 +3127,7 @@ e_client_zone_set(E_Client *ec, E_Zone *zone)
ec->pre_res_change.valid = 0;
}
-EAPI void
+E_API void
e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h)
{
E_OBJECT_CHECK(ec);
@@ -3144,7 +3144,7 @@ e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h)
}
}
-EAPI E_Client *
+E_API E_Client *
e_client_above_get(const E_Client *ec)
{
unsigned int x;
@@ -3171,7 +3171,7 @@ e_client_above_get(const E_Client *ec)
return NULL;
}
-EAPI E_Client *
+E_API E_Client *
e_client_below_get(const E_Client *ec)
{
unsigned int x;
@@ -3205,7 +3205,7 @@ e_client_below_get(const E_Client *ec)
return NULL;
}
-EAPI E_Client *
+E_API E_Client *
e_client_bottom_get(void)
{
unsigned int x;
@@ -3222,7 +3222,7 @@ e_client_bottom_get(void)
return NULL;
}
-EAPI E_Client *
+E_API E_Client *
e_client_top_get(void)
{
unsigned int x;
@@ -3239,7 +3239,7 @@ e_client_top_get(void)
return NULL;
}
-EAPI unsigned int
+E_API unsigned int
e_clients_count(void)
{
return eina_list_count(e_comp->clients);
@@ -3250,7 +3250,7 @@ e_clients_count(void)
* Set a callback which will be called just prior to updating the
* move coordinates for a border
*/
-EAPI void
+E_API void
e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb)
{
ec->move_intercept_cb = cb;
@@ -3258,7 +3258,7 @@ e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb)
///////////////////////////////////////
-EAPI E_Client_Hook *
+E_API E_Client_Hook *
e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data)
{
E_Client_Hook *ch;
@@ -3273,7 +3273,7 @@ e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const vo
return ch;
}
-EAPI void
+E_API void
e_client_hook_del(E_Client_Hook *ch)
{
ch->delete_me = 1;
@@ -3288,39 +3288,39 @@ e_client_hook_del(E_Client_Hook *ch)
///////////////////////////////////////
-EAPI void
+E_API void
e_client_focus_latest_set(E_Client *ec)
{
focus_stack = eina_list_remove(focus_stack, ec);
focus_stack = eina_list_prepend(focus_stack, ec);
}
-EAPI void
+E_API void
e_client_raise_latest_set(E_Client *ec)
{
raise_stack = eina_list_remove(raise_stack, ec);
raise_stack = eina_list_prepend(raise_stack, ec);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_client_focus_track_enabled(void)
{
return !focus_track_frozen;
}
-EAPI void
+E_API void
e_client_focus_track_freeze(void)
{
focus_track_frozen++;
}
-EAPI void
+E_API void
e_client_focus_track_thaw(void)
{
focus_track_frozen--;
}
-EAPI void
+E_API void
e_client_refocus(void)
{
E_Client *ec;
@@ -3361,7 +3361,7 @@ e_client_refocus(void)
* the last focused window should get focus).
*
*/
-EAPI void
+E_API void
e_client_focus_set_with_pointer(E_Client *ec)
{
E_OBJECT_CHECK(ec);
@@ -3487,7 +3487,7 @@ e_client_focused_set(E_Client *ec)
_e_client_event_simple(ec, E_EVENT_CLIENT_FOCUS_IN);
}
-EAPI void
+E_API void
e_client_activate(E_Client *ec, Eina_Bool just_do_it)
{
E_OBJECT_CHECK(ec);
@@ -3526,31 +3526,31 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
}
}
-EAPI E_Client *
+E_API E_Client *
e_client_focused_get(void)
{
return focused;
}
-EAPI Eina_List *
+E_API Eina_List *
e_client_focus_stack_get(void)
{
return focus_stack;
}
-YOLO EAPI void
+YOLO E_API void
e_client_focus_stack_set(Eina_List *l)
{
focus_stack = l;
}
-EAPI Eina_List *
+E_API Eina_List *
e_client_raise_stack_get(void)
{
return raise_stack;
}
-EAPI Eina_List *
+E_API Eina_List *
e_client_lost_windows_get(E_Zone *zone)
{
Eina_List *list = NULL;
@@ -3579,7 +3579,7 @@ e_client_lost_windows_get(E_Zone *zone)
///////////////////////////////////////
-EAPI void
+E_API void
e_client_shade(E_Client *ec, E_Direction dir)
{
E_OBJECT_CHECK(ec);
@@ -3607,7 +3607,7 @@ e_client_shade(E_Client *ec, E_Direction dir)
e_remember_update(ec);
}
-EAPI void
+E_API void
e_client_unshade(E_Client *ec, E_Direction dir)
{
E_OBJECT_CHECK(ec);
@@ -3635,7 +3635,7 @@ e_client_unshade(E_Client *ec, E_Direction dir)
///////////////////////////////////////
-EAPI void
+E_API void
e_client_maximize(E_Client *ec, E_Maximize max)
{
E_OBJECT_CHECK(ec);
@@ -3697,7 +3697,7 @@ e_client_maximize(E_Client *ec, E_Maximize max)
evas_object_smart_callback_call(ec->frame, "maximize_done", NULL);
}
-EAPI void
+E_API void
e_client_unmaximize(E_Client *ec, E_Maximize max)
{
E_OBJECT_CHECK(ec);
@@ -3807,7 +3807,7 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL);
}
-EAPI void
+E_API void
e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
{
int x, y, w, h;
@@ -3887,7 +3887,7 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
e_remember_update(ec);
}
-EAPI void
+E_API void
e_client_unfullscreen(E_Client *ec)
{
E_OBJECT_CHECK(ec);
@@ -3928,7 +3928,7 @@ e_client_unfullscreen(E_Client *ec)
///////////////////////////////////////
-EAPI void
+E_API void
e_client_iconify(E_Client *ec)
{
E_OBJECT_CHECK(ec);
@@ -3962,7 +3962,7 @@ e_client_iconify(E_Client *ec)
e_remember_update(ec);
}
-EAPI void
+E_API void
e_client_uniconify(E_Client *ec)
{
E_Desk *desk;
@@ -3994,7 +3994,7 @@ e_client_uniconify(E_Client *ec)
///////////////////////////////////////
-EAPI void
+E_API void
e_client_urgent_set(E_Client *ec, Eina_Bool urgent)
{
E_OBJECT_CHECK(ec);
@@ -4024,7 +4024,7 @@ e_client_urgent_set(E_Client *ec, Eina_Bool urgent)
///////////////////////////////////////
-EAPI void
+E_API void
e_client_stick(E_Client *ec)
{
E_Desk *desk;
@@ -4058,7 +4058,7 @@ e_client_stick(E_Client *ec)
e_remember_update(ec);
}
-EAPI void
+E_API void
e_client_unstick(E_Client *ec)
{
E_Desk *desk;
@@ -4093,7 +4093,7 @@ e_client_unstick(E_Client *ec)
e_remember_update(ec);
}
-EAPI void
+E_API void
e_client_pinned_set(E_Client *ec, Eina_Bool set)
{
E_Layer layer;
@@ -4114,7 +4114,7 @@ e_client_pinned_set(E_Client *ec, Eina_Bool set)
///////////////////////////////////////
-EAPI Eina_Bool
+E_API Eina_Bool
e_client_border_set(E_Client *ec, const char *name)
{
Eina_Stringshare *pborder;
@@ -4144,7 +4144,7 @@ e_client_border_set(E_Client *ec, const char *name)
///////////////////////////////////////
-EAPI void
+E_API void
e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden)
{
E_OBJECT_CHECK(ec);
@@ -4159,7 +4159,7 @@ e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden)
///////////////////////////////////////
-EAPI void
+E_API void
e_client_act_move_keyboard(E_Client *ec)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -4180,7 +4180,7 @@ e_client_act_move_keyboard(E_Client *ec)
action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_client_move_mouse_down, NULL);
}
-EAPI void
+E_API void
e_client_act_resize_keyboard(E_Client *ec)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -4201,7 +4201,7 @@ e_client_act_resize_keyboard(E_Client *ec)
action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_client_resize_mouse_down, NULL);
}
-EAPI void
+E_API void
e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
{
E_OBJECT_CHECK(ec);
@@ -4223,7 +4223,7 @@ e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
}
}
-EAPI void
+E_API void
e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED)
{
E_OBJECT_CHECK(ec);
@@ -4236,7 +4236,7 @@ e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED
_e_client_action_finish();
}
-EAPI void
+E_API void
e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
{
E_OBJECT_CHECK(ec);
@@ -4301,7 +4301,7 @@ e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
e_pointer_mode_push(ec, ec->resize_mode);
}
-EAPI void
+E_API void
e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED)
{
E_OBJECT_CHECK(ec);
@@ -4317,7 +4317,7 @@ e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUS
_e_client_action_finish();
}
-EAPI void
+E_API void
e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key)
{
E_OBJECT_CHECK(ec);
@@ -4335,7 +4335,7 @@ e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key)
}
}
-EAPI void
+E_API void
e_client_act_close_begin(E_Client *ec)
{
E_OBJECT_CHECK(ec);
@@ -4353,7 +4353,7 @@ e_client_act_close_begin(E_Client *ec)
}
}
-EAPI void
+E_API void
e_client_act_kill_begin(E_Client *ec)
{
E_OBJECT_CHECK(ec);
@@ -4374,7 +4374,7 @@ e_client_act_kill_begin(E_Client *ec)
////////////////////////////////////////////////
-EAPI Evas_Object *
+E_API Evas_Object *
e_client_icon_add(E_Client *ec, Evas *evas)
{
Evas_Object *o;
@@ -4465,7 +4465,7 @@ e_client_icon_add(E_Client *ec, Evas *evas)
////////////////////////////////////////////
-EAPI void
+E_API void
e_client_ping(E_Client *ec)
{
E_OBJECT_CHECK(ec);
@@ -4482,7 +4482,7 @@ e_client_ping(E_Client *ec)
////////////////////////////////////////////
-EAPI void
+E_API void
e_client_move_cancel(void)
{
if (!ecmove) return;
@@ -4504,7 +4504,7 @@ e_client_move_cancel(void)
_e_client_move_end(ecmove);
}
-EAPI void
+E_API void
e_client_resize_cancel(void)
{
if (!ecresize) return;
@@ -4526,7 +4526,7 @@ e_client_resize_cancel(void)
_e_client_resize_end(ecresize);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_client_resize_begin(E_Client *ec)
{
if ((ec->shaded) || (ec->shading) ||
@@ -4555,7 +4555,7 @@ error:
////////////////////////////////////////////
-EAPI void
+E_API void
e_client_frame_recalc(E_Client *ec)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -4565,7 +4565,7 @@ e_client_frame_recalc(E_Client *ec)
////////////////////////////////////////////
-EAPI void
+E_API void
e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED)
{
E_OBJECT_CHECK(ec);
@@ -4579,7 +4579,7 @@ e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_U
_e_client_moveinfo_gather(ec, sig);
}
-EAPI void
+E_API void
e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
{
E_OBJECT_CHECK(ec);
@@ -4591,7 +4591,7 @@ e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *
e_zone_flip_coords_handle(ec->zone, -1, -1);
}
-EAPI void
+E_API void
e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED)
{
int resize_mode = E_POINTER_RESIZE_BR;
@@ -4639,7 +4639,7 @@ e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, con
e_pointer_mode_push(ec, ec->resize_mode);
}
-EAPI void
+E_API void
e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
{
E_OBJECT_CHECK(ec);
@@ -4653,7 +4653,7 @@ e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char
////////////////////////////////////////////
-EAPI void
+E_API void
e_client_resize_limit(E_Client *ec, int *w, int *h)
{
double a;
@@ -4750,7 +4750,7 @@ e_client_resize_limit(E_Client *ec, int *w, int *h)
-EAPI E_Client *
+E_API E_Client *
e_client_under_pointer_get(E_Desk *desk, E_Client *exclude)
{
int x, y;
@@ -4782,7 +4782,7 @@ e_client_under_pointer_get(E_Desk *desk, E_Client *exclude)
////////////////////////////////////////////
-EAPI int
+E_API int
e_client_pointer_warp_to_center_now(E_Client *ec)
{
if (e_config->disable_all_pointer_warps) return 0;
@@ -4800,7 +4800,7 @@ e_client_pointer_warp_to_center_now(E_Client *ec)
return 1;
}
-EAPI int
+E_API int
e_client_pointer_warp_to_center(E_Client *ec)
{
int x, y;
@@ -4849,7 +4849,7 @@ e_client_pointer_warp_to_center(E_Client *ec)
////////////////////////////////////////////
-EAPI void
+E_API void
e_client_redirected_set(E_Client *ec, Eina_Bool set)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -4871,7 +4871,7 @@ e_client_redirected_set(E_Client *ec, Eina_Bool set)
////////////////////////////////////////////
-EAPI Eina_Bool
+E_API Eina_Bool
e_client_is_stacking(const E_Client *ec)
{
return e_comp->layers[e_comp_canvas_layer_map(ec->layer)].obj == ec->frame;
@@ -4879,7 +4879,7 @@ e_client_is_stacking(const E_Client *ec)
////////////////////////////////////////////
-EAPI void
+E_API void
e_client_layout_cb_set(E_Client_Layout_Cb cb)
{
if (_e_client_layout_cb && cb)
diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index d0b4c3953..2144e0c03 100644
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -720,107 +720,107 @@ struct E_Client
for (EC = e_client_top_get(); EC; EC = e_client_below_get(EC))
-EAPI extern int E_EVENT_CLIENT_ADD;
-EAPI extern int E_EVENT_CLIENT_REMOVE;
-EAPI extern int E_EVENT_CLIENT_ZONE_SET;
-EAPI extern int E_EVENT_CLIENT_DESK_SET;
-EAPI extern int E_EVENT_CLIENT_RESIZE;
-EAPI extern int E_EVENT_CLIENT_MOVE;
-EAPI extern int E_EVENT_CLIENT_SHOW;
-EAPI extern int E_EVENT_CLIENT_HIDE;
-EAPI extern int E_EVENT_CLIENT_ICONIFY;
-EAPI extern int E_EVENT_CLIENT_UNICONIFY;
-EAPI extern int E_EVENT_CLIENT_STACK;
-EAPI extern int E_EVENT_CLIENT_FOCUS_IN;
-EAPI extern int E_EVENT_CLIENT_FOCUS_OUT;
-EAPI extern int E_EVENT_CLIENT_PROPERTY;
-EAPI extern int E_EVENT_CLIENT_FULLSCREEN;
-EAPI extern int E_EVENT_CLIENT_UNFULLSCREEN;
+E_API extern int E_EVENT_CLIENT_ADD;
+E_API extern int E_EVENT_CLIENT_REMOVE;
+E_API extern int E_EVENT_CLIENT_ZONE_SET;
+E_API extern int E_EVENT_CLIENT_DESK_SET;
+E_API extern int E_EVENT_CLIENT_RESIZE;
+E_API extern int E_EVENT_CLIENT_MOVE;
+E_API extern int E_EVENT_CLIENT_SHOW;
+E_API extern int E_EVENT_CLIENT_HIDE;
+E_API extern int E_EVENT_CLIENT_ICONIFY;
+E_API extern int E_EVENT_CLIENT_UNICONIFY;
+E_API extern int E_EVENT_CLIENT_STACK;
+E_API extern int E_EVENT_CLIENT_FOCUS_IN;
+E_API extern int E_EVENT_CLIENT_FOCUS_OUT;
+E_API extern int E_EVENT_CLIENT_PROPERTY;
+E_API extern int E_EVENT_CLIENT_FULLSCREEN;
+E_API extern int E_EVENT_CLIENT_UNFULLSCREEN;
EINTERN void e_client_idler_before(void);
EINTERN Eina_Bool e_client_init(void);
EINTERN void e_client_shutdown(void);
-EAPI E_Client *e_client_new(E_Pixmap *cp, int first_map, int internal);
-EAPI void e_client_desk_set(E_Client *ec, E_Desk *desk);
-EAPI Eina_Bool e_client_comp_grabbed_get(void);
-EAPI E_Client *e_client_action_get(void);
-EAPI E_Client *e_client_warping_get(void);
-EAPI Eina_List *e_clients_immortal_list(void);
-EAPI void e_client_mouse_in(E_Client *ec, int x, int y);
-EAPI void e_client_mouse_out(E_Client *ec, int x, int y);
-EAPI void e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev);
-EAPI void e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev);
-EAPI void e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev);
-EAPI void e_client_mouse_move(E_Client *ec, Evas_Point *output);
-EAPI void e_client_res_change_geometry_save(E_Client *bd);
-EAPI void e_client_res_change_geometry_restore(E_Client *ec);
-EAPI void e_client_zone_set(E_Client *ec, E_Zone *zone);
-EAPI void e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h);
-EAPI E_Client *e_client_above_get(const E_Client *ec);
-EAPI E_Client *e_client_below_get(const E_Client *ec);
-EAPI E_Client *e_client_bottom_get(void);
-EAPI E_Client *e_client_top_get(void);
-EAPI unsigned int e_clients_count(void);
-EAPI void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb);
-EAPI E_Client_Hook *e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data);
-EAPI void e_client_hook_del(E_Client_Hook *ch);
-EAPI void e_client_focus_latest_set(E_Client *ec);
-EAPI void e_client_raise_latest_set(E_Client *ec);
-EAPI Eina_Bool e_client_focus_track_enabled(void);
-EAPI void e_client_focus_track_freeze(void);
-EAPI void e_client_focus_track_thaw(void);
-EAPI void e_client_refocus(void);
-EAPI void e_client_focus_set_with_pointer(E_Client *ec);
-EAPI void e_client_activate(E_Client *ec, Eina_Bool just_do_it);
-EAPI E_Client *e_client_focused_get(void);
-EAPI Eina_List *e_client_focus_stack_get(void);
-EAPI Eina_List *e_client_raise_stack_get(void);
-EAPI Eina_List *e_client_lost_windows_get(E_Zone *zone);
-EAPI void e_client_shade(E_Client *ec, E_Direction dir);
-EAPI void e_client_unshade(E_Client *ec, E_Direction dir);
-EAPI void e_client_maximize(E_Client *ec, E_Maximize max);
-EAPI void e_client_unmaximize(E_Client *ec, E_Maximize max);
-EAPI void e_client_fullscreen(E_Client *ec, E_Fullscreen policy);
-EAPI void e_client_unfullscreen(E_Client *ec);
-EAPI void e_client_iconify(E_Client *ec);
-EAPI void e_client_uniconify(E_Client *ec);
-EAPI void e_client_urgent_set(E_Client *ec, Eina_Bool urgent);
-EAPI void e_client_stick(E_Client *ec);
-EAPI void e_client_unstick(E_Client *ec);
-EAPI void e_client_pinned_set(E_Client *ec, Eina_Bool set);
-EAPI void e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden);
-EAPI Eina_Bool e_client_border_set(E_Client *ec, const char *name);
-EAPI void e_client_act_move_keyboard(E_Client *ec);
-EAPI void e_client_act_resize_keyboard(E_Client *ec);
-EAPI void e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev);
-EAPI void e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
-EAPI void e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev);
-EAPI void e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
-EAPI void e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key);
-EAPI void e_client_act_close_begin(E_Client *ec);
-EAPI void e_client_act_kill_begin(E_Client *ec);
-EAPI Evas_Object *e_client_icon_add(E_Client *ec, Evas *evas);
-EAPI void e_client_ping(E_Client *cw);
-EAPI void e_client_move_cancel(void);
-EAPI void e_client_resize_cancel(void);
-EAPI Eina_Bool e_client_resize_begin(E_Client *ec);
-EAPI void e_client_frame_recalc(E_Client *ec);
-EAPI void e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED);
-EAPI void e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
-EAPI void e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED);
-EAPI void e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
-EAPI void e_client_resize_limit(E_Client *ec, int *w, int *h);
-EAPI E_Client *e_client_under_pointer_get(E_Desk *desk, E_Client *exclude);
-EAPI int e_client_pointer_warp_to_center_now(E_Client *ec);
-EAPI int e_client_pointer_warp_to_center(E_Client *ec);
-EAPI void e_client_redirected_set(E_Client *ec, Eina_Bool set);
-EAPI Eina_Bool e_client_is_stacking(const E_Client *ec);
-EAPI Eina_Bool e_client_desk_window_profile_available_check(E_Client *ec, const char *profile);
-EAPI void e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk);
-EAPI void e_client_layout_cb_set(E_Client_Layout_Cb cb);
-
-YOLO EAPI void e_client_focus_stack_set(Eina_List *l);
+E_API E_Client *e_client_new(E_Pixmap *cp, int first_map, int internal);
+E_API void e_client_desk_set(E_Client *ec, E_Desk *desk);
+E_API Eina_Bool e_client_comp_grabbed_get(void);
+E_API E_Client *e_client_action_get(void);
+E_API E_Client *e_client_warping_get(void);
+E_API Eina_List *e_clients_immortal_list(void);
+E_API void e_client_mouse_in(E_Client *ec, int x, int y);
+E_API void e_client_mouse_out(E_Client *ec, int x, int y);
+E_API void e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev);
+E_API void e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev);
+E_API void e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev);
+E_API void e_client_mouse_move(E_Client *ec, Evas_Point *output);
+E_API void e_client_res_change_geometry_save(E_Client *bd);
+E_API void e_client_res_change_geometry_restore(E_Client *ec);
+E_API void e_client_zone_set(E_Client *ec, E_Zone *zone);
+E_API void e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h);
+E_API E_Client *e_client_above_get(const E_Client *ec);
+E_API E_Client *e_client_below_get(const E_Client *ec);
+E_API E_Client *e_client_bottom_get(void);
+E_API E_Client *e_client_top_get(void);
+E_API unsigned int e_clients_count(void);
+E_API void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb);
+E_API E_Client_Hook *e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data);
+E_API void e_client_hook_del(E_Client_Hook *ch);
+E_API void e_client_focus_latest_set(E_Client *ec);
+E_API void e_client_raise_latest_set(E_Client *ec);
+E_API Eina_Bool e_client_focus_track_enabled(void);
+E_API void e_client_focus_track_freeze(void);
+E_API void e_client_focus_track_thaw(void);
+E_API void e_client_refocus(void);
+E_API void e_client_focus_set_with_pointer(E_Client *ec);
+E_API void e_client_activate(E_Client *ec, Eina_Bool just_do_it);
+E_API E_Client *e_client_focused_get(void);
+E_API Eina_List *e_client_focus_stack_get(void);
+E_API Eina_List *e_client_raise_stack_get(void);
+E_API Eina_List *e_client_lost_windows_get(E_Zone *zone);
+E_API void e_client_shade(E_Client *ec, E_Direction dir);
+E_API void e_client_unshade(E_Client *ec, E_Direction dir);
+E_API void e_client_maximize(E_Client *ec, E_Maximize max);
+E_API void e_client_unmaximize(E_Client *ec, E_Maximize max);
+E_API void e_client_fullscreen(E_Client *ec, E_Fullscreen policy);
+E_API void e_client_unfullscreen(E_Client *ec);
+E_API void e_client_iconify(E_Client *ec);
+E_API void e_client_uniconify(E_Client *ec);
+E_API void e_client_urgent_set(E_Client *ec, Eina_Bool urgent);
+E_API void e_client_stick(E_Client *ec);
+E_API void e_client_unstick(E_Client *ec);
+E_API void e_client_pinned_set(E_Client *ec, Eina_Bool set);
+E_API void e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden);
+E_API Eina_Bool e_client_border_set(E_Client *ec, const char *name);
+E_API void e_client_act_move_keyboard(E_Client *ec);
+E_API void e_client_act_resize_keyboard(E_Client *ec);
+E_API void e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev);
+E_API void e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
+E_API void e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev);
+E_API void e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
+E_API void e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key);
+E_API void e_client_act_close_begin(E_Client *ec);
+E_API void e_client_act_kill_begin(E_Client *ec);
+E_API Evas_Object *e_client_icon_add(E_Client *ec, Evas *evas);
+E_API void e_client_ping(E_Client *cw);
+E_API void e_client_move_cancel(void);
+E_API void e_client_resize_cancel(void);
+E_API Eina_Bool e_client_resize_begin(E_Client *ec);
+E_API void e_client_frame_recalc(E_Client *ec);
+E_API void e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED);
+E_API void e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
+E_API void e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED);
+E_API void e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
+E_API void e_client_resize_limit(E_Client *ec, int *w, int *h);
+E_API E_Client *e_client_under_pointer_get(E_Desk *desk, E_Client *exclude);
+E_API int e_client_pointer_warp_to_center_now(E_Client *ec);
+E_API int e_client_pointer_warp_to_center(E_Client *ec);
+E_API void e_client_redirected_set(E_Client *ec, Eina_Bool set);
+E_API Eina_Bool e_client_is_stacking(const E_Client *ec);
+E_API Eina_Bool e_client_desk_window_profile_available_check(E_Client *ec, const char *profile);
+E_API void e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk);
+E_API void e_client_layout_cb_set(E_Client_Layout_Cb cb);
+
+YOLO E_API void e_client_focus_stack_set(Eina_List *l);
#include "e_client.x"
#endif
diff --git a/src/bin/e_color.h b/src/bin/e_color.h
index ed4b1f0f9..4f6ee9714 100644
--- a/src/bin/e_color.h
+++ b/src/bin/e_color.h
@@ -25,8 +25,8 @@ struct _E_Color
int a;
};
-EAPI void e_color_update_rgb (E_Color *ec);
-EAPI void e_color_update_hsv (E_Color *ec);
-EAPI void e_color_copy (const E_Color *from, E_Color *to);
+E_API void e_color_update_rgb (E_Color *ec);
+E_API void e_color_update_hsv (E_Color *ec);
+E_API void e_color_copy (const E_Color *from, E_Color *to);
#endif
#endif
diff --git a/src/bin/e_color_dialog.c b/src/bin/e_color_dialog.c
index 25fe253df..86ab5edb5 100644
--- a/src/bin/e_color_dialog.c
+++ b/src/bin/e_color_dialog.c
@@ -102,7 +102,7 @@ e_color_dialog_cancel_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dia
dia->cancel_data = data;
}
-EAPI void
+E_API void
e_color_dialog_change_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data)
{
dia->change_func = func;
diff --git a/src/bin/e_color_dialog.h b/src/bin/e_color_dialog.h
index f959942a2..b83fa80bf 100644
--- a/src/bin/e_color_dialog.h
+++ b/src/bin/e_color_dialog.h
@@ -24,14 +24,14 @@ struct _E_Color_Dialog
void *change_data;
};
-EAPI E_Color_Dialog *e_color_dialog_new (const E_Color *initial_color, Eina_Bool alpha_enabled);
-EAPI void e_color_dialog_show (E_Color_Dialog *dia);
-EAPI void e_color_dialog_title_set (E_Color_Dialog *dia, const char *title);
+E_API E_Color_Dialog *e_color_dialog_new (const E_Color *initial_color, Eina_Bool alpha_enabled);
+E_API void e_color_dialog_show (E_Color_Dialog *dia);
+E_API void e_color_dialog_title_set (E_Color_Dialog *dia, const char *title);
/* select and change pass the current color back, cancel passes the initial color */
-EAPI void e_color_dialog_select_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
-EAPI void e_color_dialog_cancel_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
-EAPI void e_color_dialog_change_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
+E_API void e_color_dialog_select_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
+E_API void e_color_dialog_cancel_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
+E_API void e_color_dialog_change_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
#endif
#endif
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 59b3ee5b5..df79d2326 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -21,7 +21,7 @@
static Eina_List *handlers = NULL;
static Eina_List *hooks = NULL;
-EAPI E_Comp *e_comp = NULL;
+E_API E_Comp *e_comp = NULL;
static Eina_Hash *ignores = NULL;
static Eina_List *actions = NULL;
@@ -36,9 +36,9 @@ static double ecore_frametime = 0;
static int _e_comp_log_dom = -1;
-EAPI int E_EVENT_COMPOSITOR_RESIZE = -1;
-EAPI int E_EVENT_COMPOSITOR_DISABLE = -1;
-EAPI int E_EVENT_COMPOSITOR_ENABLE = -1;
+E_API int E_EVENT_COMPOSITOR_RESIZE = -1;
+E_API int E_EVENT_COMPOSITOR_DISABLE = -1;
+E_API int E_EVENT_COMPOSITOR_ENABLE = -1;
//////////////////////////////////////////////////////////////////////////
#undef DBG
@@ -1266,7 +1266,7 @@ e_comp_style_selector_create(Evas *evas, const char **source)
return oi;
}
-EAPI E_Comp *
+E_API E_Comp *
e_comp_new(void)
{
if (e_comp)
@@ -1280,7 +1280,7 @@ e_comp_new(void)
return e_comp;
}
-EAPI int
+E_API int
e_comp_internal_save(void)
{
return e_config_domain_save("e_comp", conf_edd, conf);
@@ -1318,7 +1318,7 @@ e_comp_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_comp_render_queue(void)
{
if (conf->lock_fps)
@@ -1337,7 +1337,7 @@ e_comp_render_queue(void)
}
}
-EAPI void
+E_API void
e_comp_shape_queue(void)
{
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return;
@@ -1345,7 +1345,7 @@ e_comp_shape_queue(void)
e_comp->shape_job = ecore_job_add(_e_comp_shapes_update_job, NULL);
}
-EAPI void
+E_API void
e_comp_shape_queue_block(Eina_Bool block)
{
e_comp->shape_queue_blocked = !!block;
@@ -1355,13 +1355,13 @@ e_comp_shape_queue_block(Eina_Bool block)
e_comp_shape_queue();
}
-EAPI E_Comp_Config *
+E_API E_Comp_Config *
e_comp_config_get(void)
{
return conf;
}
-EAPI void
+E_API void
e_comp_shadows_reset(void)
{
E_Client *ec;
@@ -1372,7 +1372,7 @@ e_comp_shadows_reset(void)
e_comp_object_frame_theme_set(ec->frame, E_COMP_OBJECT_FRAME_RESHADOW);
}
-EAPI Ecore_Window
+E_API Ecore_Window
e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y)
{
E_Client *ec;
@@ -1386,7 +1386,7 @@ e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y)
return e_comp->ee_win;
}
-EAPI void
+E_API void
e_comp_util_wins_print(void)
{
Evas_Object *o;
@@ -1411,7 +1411,7 @@ e_comp_util_wins_print(void)
fputc('\n', stderr);
}
-EAPI void
+E_API void
e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win)
{
E_Client *ec;
@@ -1423,7 +1423,7 @@ e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win)
if (ec->visible) evas_object_hide(ec->frame);
}
-EAPI void
+E_API void
e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win)
{
E_Client *ec;
@@ -1435,13 +1435,13 @@ e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win)
if (ec->visible) evas_object_show(ec->frame);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_ignore_win_find(Ecore_Window win)
{
return !!eina_hash_find(ignores, &win);
}
-EAPI void
+E_API void
e_comp_override_del()
{
e_comp->nocomp_override--;
@@ -1452,7 +1452,7 @@ e_comp_override_del()
}
}
-EAPI void
+E_API void
e_comp_override_add()
{
e_comp->nocomp_override++;
@@ -1461,7 +1461,7 @@ e_comp_override_add()
#if 0
FIXME
-EAPI void
+E_API void
e_comp_block_window_add(void)
{
e_comp->block_count++;
@@ -1476,7 +1476,7 @@ e_comp_block_window_add(void)
ecore_x_window_show(e_comp->block_win);
}
-EAPI void
+E_API void
e_comp_block_window_del(void)
{
if (!e_comp->block_count) return;
@@ -1487,14 +1487,14 @@ e_comp_block_window_del(void)
}
#endif
-EAPI E_Comp *
+E_API E_Comp *
e_comp_find_by_window(Ecore_Window win)
{
if ((e_comp->win == win) || (e_comp->ee_win == win) || (e_comp->root == win)) return e_comp;
return NULL;
}
-EAPI void
+E_API void
e_comp_override_timed_pop(void)
{
if (e_comp->nocomp_override <= 0) return;
@@ -1504,7 +1504,7 @@ e_comp_override_timed_pop(void)
e_comp->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, NULL);
}
-EAPI unsigned int
+E_API unsigned int
e_comp_e_object_layer_get(const E_Object *obj)
{
E_Gadcon *gc = NULL;
@@ -1538,7 +1538,7 @@ e_comp_e_object_layer_get(const E_Object *obj)
return 0;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd)
{
Eina_Bool ret = EINA_FALSE;
@@ -1561,7 +1561,7 @@ e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd)
return ret;
}
-EAPI void
+E_API void
e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd)
{
Ecore_Window mwin = 0, kwin = 0;
@@ -1586,45 +1586,45 @@ e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd)
e_client_refocus();
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_util_kbd_grabbed(void)
{
return e_menu_grab_window_get() || e_client_action_get() || e_grabinput_key_win_get();
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_util_mouse_grabbed(void)
{
return e_menu_grab_window_get() || e_client_action_get() || e_grabinput_mouse_win_get();
}
-EAPI void
+E_API void
e_comp_gl_set(Eina_Bool set)
{
gl_avail = !!set;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_gl_get(void)
{
return gl_avail;
}
-EAPI void
+E_API void
e_comp_button_bindings_ungrab_all(void)
{
if (e_comp->bindings_ungrab_cb)
e_comp->bindings_ungrab_cb();
}
-EAPI void
+E_API void
e_comp_button_bindings_grab_all(void)
{
if (e_comp->bindings_grab_cb)
e_comp->bindings_grab_cb();
}
-EAPI void
+E_API void
e_comp_client_redirect_toggle(E_Client *ec)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -1636,7 +1636,7 @@ e_comp_client_redirect_toggle(E_Client *ec)
e_comp_shape_queue();
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_util_object_is_above_nocomp(Evas_Object *obj)
{
Evas_Object *o;
diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index c48cc4861..6e4d6b733 100644
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -52,8 +52,8 @@ typedef enum _E_Layer
# include "e_comp_cfdata.h"
-extern EAPI int E_EVENT_COMPOSITOR_DISABLE;
-extern EAPI int E_EVENT_COMPOSITOR_ENABLE;
+extern E_API int E_EVENT_COMPOSITOR_DISABLE;
+extern E_API int E_EVENT_COMPOSITOR_ENABLE;
typedef void (*E_Comp_Grab_Cb)(void);
@@ -172,47 +172,47 @@ typedef enum
E_COMP_ENGINE_GL = 2
} E_Comp_Engine;
-extern EAPI E_Comp *e_comp;
+extern E_API E_Comp *e_comp;
EINTERN Eina_Bool e_comp_init(void);
-EAPI E_Comp *e_comp_new(void);
-EAPI int e_comp_internal_save(void);
+E_API E_Comp *e_comp_new(void);
+E_API int e_comp_internal_save(void);
EINTERN int e_comp_shutdown(void);
-EAPI void e_comp_render_queue(void);
-EAPI void e_comp_shape_queue(void);
-EAPI void e_comp_shape_queue_block(Eina_Bool block);
-EAPI E_Comp_Config *e_comp_config_get(void);
-EAPI const Eina_List *e_comp_list(void);
-EAPI void e_comp_shadows_reset(void);
-EAPI Ecore_Window e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y);
-EAPI void e_comp_util_wins_print(void);
-EAPI void e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win);
-EAPI void e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win);
-EAPI Eina_Bool e_comp_ignore_win_find(Ecore_Window win);
-EAPI void e_comp_override_del(void);
-EAPI void e_comp_override_add(void);
-EAPI void e_comp_block_window_add(void);
-EAPI void e_comp_block_window_del(void);
-EAPI E_Comp *e_comp_find_by_window(Ecore_Window win);
-EAPI void e_comp_override_timed_pop(void);
-EAPI unsigned int e_comp_e_object_layer_get(const E_Object *obj);
-EAPI Eina_Bool e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd);
-EAPI void e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd);
-EAPI void e_comp_gl_set(Eina_Bool set);
-EAPI Eina_Bool e_comp_gl_get(void);
-
-EAPI void e_comp_button_bindings_grab_all(void);
-EAPI void e_comp_button_bindings_ungrab_all(void);
-EAPI void e_comp_client_redirect_toggle(E_Client *ec);
-EAPI Eina_Bool e_comp_util_object_is_above_nocomp(Evas_Object *obj);
+E_API void e_comp_render_queue(void);
+E_API void e_comp_shape_queue(void);
+E_API void e_comp_shape_queue_block(Eina_Bool block);
+E_API E_Comp_Config *e_comp_config_get(void);
+E_API const Eina_List *e_comp_list(void);
+E_API void e_comp_shadows_reset(void);
+E_API Ecore_Window e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y);
+E_API void e_comp_util_wins_print(void);
+E_API void e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win);
+E_API void e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win);
+E_API Eina_Bool e_comp_ignore_win_find(Ecore_Window win);
+E_API void e_comp_override_del(void);
+E_API void e_comp_override_add(void);
+E_API void e_comp_block_window_add(void);
+E_API void e_comp_block_window_del(void);
+E_API E_Comp *e_comp_find_by_window(Ecore_Window win);
+E_API void e_comp_override_timed_pop(void);
+E_API unsigned int e_comp_e_object_layer_get(const E_Object *obj);
+E_API Eina_Bool e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd);
+E_API void e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd);
+E_API void e_comp_gl_set(Eina_Bool set);
+E_API Eina_Bool e_comp_gl_get(void);
+
+E_API void e_comp_button_bindings_grab_all(void);
+E_API void e_comp_button_bindings_ungrab_all(void);
+E_API void e_comp_client_redirect_toggle(E_Client *ec);
+E_API Eina_Bool e_comp_util_object_is_above_nocomp(Evas_Object *obj);
EINTERN Evas_Object *e_comp_style_selector_create(Evas *evas, const char **source);
-EAPI E_Config_Dialog *e_int_config_comp(Evas_Object *parent, const char *params);
-EAPI E_Config_Dialog *e_int_config_comp_match(Evas_Object *parent, const char *params);
+E_API E_Config_Dialog *e_int_config_comp(Evas_Object *parent, const char *params);
+E_API E_Config_Dialog *e_int_config_comp_match(Evas_Object *parent, const char *params);
-EAPI Eina_Bool e_comp_util_kbd_grabbed(void);
-EAPI Eina_Bool e_comp_util_mouse_grabbed(void);
+E_API Eina_Bool e_comp_util_kbd_grabbed(void);
+E_API Eina_Bool e_comp_util_mouse_grabbed(void);
static inline Eina_Bool
e_comp_util_client_is_fullscreen(const E_Client *ec)
diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index d33faec0d..92da5844b 100644
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -178,7 +178,7 @@ _e_comp_canvas_cb_zone_sort(const void *data1, const void *data2)
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_canvas_init(int w, int h)
{
Evas_Object *o;
@@ -252,7 +252,7 @@ e_comp_canvas_clear(void)
//////////////////////////////////////////////
-EAPI void
+E_API void
e_comp_canvas_resize(int w, int h)
{
e_comp->w = w;
@@ -260,19 +260,19 @@ e_comp_canvas_resize(int w, int h)
ecore_evas_resize(e_comp->ee, w, h);
}
-EAPI void
+E_API void
e_comp_all_freeze(void)
{
evas_event_freeze(e_comp->evas);
}
-EAPI void
+E_API void
e_comp_all_thaw(void)
{
evas_event_thaw(e_comp->evas);
}
-EAPI E_Zone *
+E_API E_Zone *
e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y)
{
const Eina_List *l;
@@ -283,7 +283,7 @@ e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y)
return NULL;
}
-EAPI E_Zone *
+E_API E_Zone *
e_comp_zone_number_get(int num)
{
Eina_List *l = NULL;
@@ -296,7 +296,7 @@ e_comp_zone_number_get(int num)
return NULL;
}
-EAPI E_Zone *
+E_API E_Zone *
e_comp_zone_id_get(int id)
{
Eina_List *l = NULL;
@@ -309,7 +309,7 @@ e_comp_zone_id_get(int id)
return NULL;
}
-EAPI E_Desk *
+E_API E_Desk *
e_comp_desk_window_profile_get(const char *profile)
{
Eina_List *l = NULL;
@@ -338,7 +338,7 @@ e_comp_desk_window_profile_get(const char *profile)
return NULL;
}
-EAPI void
+E_API void
e_comp_canvas_zone_update(E_Zone *zone)
{
Evas_Object *o;
@@ -389,7 +389,7 @@ e_comp_canvas_zone_update(E_Zone *zone)
evas_object_show(o);
}
-EAPI void
+E_API void
e_comp_canvas_update(void)
{
Eina_List *l, *screens, *zones = NULL, *ll;
@@ -528,7 +528,7 @@ e_comp_canvas_update(void)
}
}
-EAPI void
+E_API void
e_comp_canvas_fake_layers_init(void)
{
unsigned int layer;
@@ -544,7 +544,7 @@ e_comp_canvas_fake_layers_init(void)
}
}
-EAPI void
+E_API void
e_comp_canvas_fps_toggle(void)
{
E_Comp_Config *conf = e_comp_config_get();
@@ -554,7 +554,7 @@ e_comp_canvas_fps_toggle(void)
e_comp_render_queue();
}
-EAPI E_Layer
+E_API E_Layer
e_comp_canvas_layer_map_to(unsigned int layer)
{
switch (layer)
@@ -583,7 +583,7 @@ e_comp_canvas_layer_map_to(unsigned int layer)
return -INT_MAX;
}
-EAPI unsigned int
+E_API unsigned int
e_comp_canvas_layer_map(E_Layer layer)
{
switch (layer)
@@ -612,7 +612,7 @@ e_comp_canvas_layer_map(E_Layer layer)
return 9999;
}
-EAPI unsigned int
+E_API unsigned int
e_comp_canvas_client_layer_map(E_Layer layer)
{
switch (layer)
@@ -633,7 +633,7 @@ e_comp_canvas_client_layer_map(E_Layer layer)
return 9999;
}
-EAPI E_Layer
+E_API E_Layer
e_comp_canvas_client_layer_map_nearest(int layer)
{
#define LAYER_MAP(X) \
@@ -652,14 +652,14 @@ e_comp_canvas_client_layer_map_nearest(int layer)
return E_LAYER_CLIENT_PRIO;
}
-EAPI void
+E_API void
e_comp_canvas_keys_grab(void)
{
if (e_comp->root)
e_bindings_key_grab(E_BINDING_CONTEXT_ANY, e_comp->root);
}
-EAPI void
+E_API void
e_comp_canvas_keys_ungrab(void)
{
if (e_comp->root)
diff --git a/src/bin/e_comp_canvas.h b/src/bin/e_comp_canvas.h
index df22610d1..926a8fa80 100644
--- a/src/bin/e_comp_canvas.h
+++ b/src/bin/e_comp_canvas.h
@@ -6,27 +6,27 @@
#ifndef E_COMP_CANVAS_H
#define E_COMP_CANVAS_H
-extern EAPI int E_EVENT_COMPOSITOR_RESIZE;
+extern E_API int E_EVENT_COMPOSITOR_RESIZE;
-EAPI Eina_Bool e_comp_canvas_init(int w, int h);
+E_API Eina_Bool e_comp_canvas_init(int w, int h);
EINTERN void e_comp_canvas_clear(void);
-EAPI void e_comp_canvas_resize(int w, int h);
-EAPI void e_comp_all_freeze(void);
-EAPI void e_comp_all_thaw(void);
-EAPI E_Zone * e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y);
-EAPI E_Zone * e_comp_zone_number_get(int num);
-EAPI E_Zone * e_comp_zone_id_get(int id);
-EAPI E_Desk * e_comp_desk_window_profile_get(const char *profile);
-EAPI void e_comp_canvas_zone_update(E_Zone *zone);
-EAPI void e_comp_canvas_update(void);
-EAPI void e_comp_canvas_fake_layers_init(void);
-EAPI void e_comp_canvas_fps_toggle(void);
-EAPI E_Layer e_comp_canvas_layer_map_to(unsigned int layer);
-EAPI unsigned int e_comp_canvas_layer_map(E_Layer layer);
-EAPI unsigned int e_comp_canvas_client_layer_map(E_Layer layer);
-EAPI E_Layer e_comp_canvas_client_layer_map_nearest(int layer);
-EAPI void e_comp_canvas_keys_grab(void);
-EAPI void e_comp_canvas_keys_ungrab(void);
+E_API void e_comp_canvas_resize(int w, int h);
+E_API void e_comp_all_freeze(void);
+E_API void e_comp_all_thaw(void);
+E_API E_Zone * e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y);
+E_API E_Zone * e_comp_zone_number_get(int num);
+E_API E_Zone * e_comp_zone_id_get(int id);
+E_API E_Desk * e_comp_desk_window_profile_get(const char *profile);
+E_API void e_comp_canvas_zone_update(E_Zone *zone);
+E_API void e_comp_canvas_update(void);
+E_API void e_comp_canvas_fake_layers_init(void);
+E_API void e_comp_canvas_fps_toggle(void);
+E_API E_Layer e_comp_canvas_layer_map_to(unsigned int layer);
+E_API unsigned int e_comp_canvas_layer_map(E_Layer layer);
+E_API unsigned int e_comp_canvas_client_layer_map(E_Layer layer);
+E_API E_Layer e_comp_canvas_client_layer_map_nearest(int layer);
+E_API void e_comp_canvas_keys_grab(void);
+E_API void e_comp_canvas_keys_ungrab(void);
/* the following functions are used for adjusting root window coordinates
* to/from canvas coordinates.
diff --git a/src/bin/e_comp_cfdata.c b/src/bin/e_comp_cfdata.c
index 3f29ebbd7..1b022c3f3 100644
--- a/src/bin/e_comp_cfdata.c
+++ b/src/bin/e_comp_cfdata.c
@@ -1,7 +1,7 @@
#include "e.h"
#include "e_comp_cfdata.h"
-EAPI void
+E_API void
e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
{
*match_edd = E_CONFIG_DD_NEW("Comp_Match", E_Comp_Match);
@@ -70,7 +70,7 @@ e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
E_CONFIG_LIST(D, T, match.objects, *match_edd);
}
-EAPI E_Comp_Config *
+E_API E_Comp_Config *
e_comp_cfdata_config_new(void)
{
E_Comp_Config *cfg;
@@ -195,7 +195,7 @@ e_comp_cfdata_config_new(void)
return cfg;
}
-EAPI void
+E_API void
e_comp_cfdata_match_free(E_Comp_Match *m)
{
if (!m) return;
@@ -207,7 +207,7 @@ e_comp_cfdata_match_free(E_Comp_Match *m)
free(m);
}
-EAPI void
+E_API void
e_comp_cfdata_config_free(E_Comp_Config *cfg)
{
if (!cfg) return;
diff --git a/src/bin/e_comp_cfdata.h b/src/bin/e_comp_cfdata.h
index b1620eb43..f9558e43c 100644
--- a/src/bin/e_comp_cfdata.h
+++ b/src/bin/e_comp_cfdata.h
@@ -76,10 +76,10 @@ struct _E_Comp_Match
char no_shadow; // set whether shadow is disabled
};
-EAPI void e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd);
-EAPI E_Comp_Config *e_comp_cfdata_config_new(void);
-EAPI void e_comp_cfdata_config_free(E_Comp_Config *cfg);
-EAPI void e_comp_cfdata_match_free(E_Comp_Match *m);
+E_API void e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd);
+E_API E_Comp_Config *e_comp_cfdata_config_new(void);
+E_API void e_comp_cfdata_config_free(E_Comp_Config *cfg);
+E_API void e_comp_cfdata_match_free(E_Comp_Match *m);
#endif
#endif
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 45c1079c9..f211957da 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -137,7 +137,7 @@ static Evas_Smart *_e_comp_smart = NULL;
EINTERN void e_client_focused_set(E_Client *ec);
/* emitted every time a new noteworthy comp object is added */
-EAPI int E_EVENT_COMP_OBJECT_ADD = -1;
+E_API int E_EVENT_COMP_OBJECT_ADD = -1;
static void
_e_comp_object_event_free(void *d EINA_UNUSED, void *event)
@@ -2163,7 +2163,7 @@ _e_comp_smart_init(void)
}
}
-EAPI void
+E_API void
e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled)
{
API_ENTRY;
@@ -2308,7 +2308,7 @@ _e_comp_object_util_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
e_comp_shape_queue();
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type)
{
Evas_Object *o, *z = NULL;
@@ -2442,7 +2442,7 @@ e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type)
}
/* utility functions for deleting objects when their "owner" is deleted */
-EAPI void
+E_API void
e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del)
{
Eina_List *l;
@@ -2455,7 +2455,7 @@ e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del)
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _e_comp_object_util_del, NULL);
}
-EAPI void
+E_API void
e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del)
{
Eina_List *l;
@@ -2469,7 +2469,7 @@ e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del)
/////////////////////////////////////////////////////////
-EAPI Evas_Object *
+E_API Evas_Object *
e_comp_object_client_add(E_Client *ec)
{
Evas_Object *o;
@@ -2492,7 +2492,7 @@ e_comp_object_client_add(E_Client *ec)
}
/* utility functions for getting client inset */
-EAPI void
+E_API void
e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay)
{
API_ENTRY;
@@ -2506,7 +2506,7 @@ e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay)
if (ay) *ay = y - cw->client_inset.t;
}
-EAPI void
+E_API void
e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay)
{
API_ENTRY;
@@ -2520,7 +2520,7 @@ e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay
if (ay) *ay = y + cw->client_inset.t;
}
-EAPI void
+E_API void
e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah)
{
API_ENTRY;
@@ -2534,7 +2534,7 @@ e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah)
if (ah) *ah = h + cw->client_inset.t + cw->client_inset.b;
}
-EAPI void
+E_API void
e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah)
{
API_ENTRY;
@@ -2548,7 +2548,7 @@ e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah
if (ah) *ah = h - cw->client_inset.t - cw->client_inset.b;
}
-EAPI E_Client *
+E_API E_Client *
e_comp_object_client_get(Evas_Object *obj)
{
Evas_Object *o;
@@ -2561,7 +2561,7 @@ e_comp_object_client_get(Evas_Object *obj)
return cw ? cw->ec : NULL;
}
-EAPI void
+E_API void
e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h)
{
API_ENTRY;
@@ -2576,7 +2576,7 @@ e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h
}
}
-EAPI E_Zone *
+E_API E_Zone *
e_comp_object_util_zone_get(Evas_Object *obj)
{
E_Zone *zone;
@@ -2596,7 +2596,7 @@ e_comp_object_util_zone_get(Evas_Object *obj)
return zone;
}
-EAPI void
+E_API void
e_comp_object_util_center(Evas_Object *obj)
{
int x, y, w, h, ow, oh;
@@ -2616,7 +2616,7 @@ e_comp_object_util_center(Evas_Object *obj)
evas_object_move(obj, x, y);
}
-EAPI void
+E_API void
e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on)
{
int x, y, w, h, ow, oh;
@@ -2631,7 +2631,7 @@ e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on)
evas_object_move(obj, x + (w / 2) - (ow / 2), y + (h / 2) - (oh / 2));
}
-EAPI void
+E_API void
e_comp_object_util_fullscreen(Evas_Object *obj)
{
SOFT_ENTRY();
@@ -2645,7 +2645,7 @@ e_comp_object_util_fullscreen(Evas_Object *obj)
}
}
-EAPI void
+E_API void
e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y)
{
E_Zone *zone;
@@ -2663,7 +2663,7 @@ e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y)
if (y) *y = zy + (zh - oh) / 2;
}
-EAPI void
+E_API void
e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h)
{
API_ENTRY;
@@ -2697,7 +2697,7 @@ e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h)
}
}
-EAPI void
+E_API void
e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b)
{
API_ENTRY;
@@ -2707,7 +2707,7 @@ e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *
if (b) *b = cw->client_inset.b;
}
-EAPI void
+E_API void
e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h)
{
API_ENTRY;
@@ -2720,7 +2720,7 @@ e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w,
evas_object_geometry_get(cw->frame_icon, x, y, w, h);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_object_frame_title_set(Evas_Object *obj, const char *name)
{
API_ENTRY EINA_FALSE;
@@ -2731,14 +2731,14 @@ e_comp_object_frame_title_set(Evas_Object *obj, const char *name)
return EINA_TRUE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_object_frame_exists(Evas_Object *obj)
{
API_ENTRY EINA_FALSE;
return !!cw->frame_object;
}
-EAPI void
+E_API void
e_comp_object_frame_icon_update(Evas_Object *obj)
{
API_ENTRY;
@@ -2752,7 +2752,7 @@ e_comp_object_frame_icon_update(Evas_Object *obj)
E_FREE_FUNC(cw->frame_icon, evas_object_del);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_object_frame_theme_set(Evas_Object *obj, const char *name)
{
Evas_Object *o, *pbg;
@@ -2896,7 +2896,7 @@ reshadow:
return EINA_TRUE;
}
-EAPI void
+E_API void
e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src)
{
E_Comp_Object_Mover *prov;
@@ -2918,7 +2918,7 @@ e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src)
}
}
-EAPI void
+E_API void
e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data)
{
/* FIXME: at some point I guess this should use eo to inherit
@@ -2929,21 +2929,21 @@ e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char
edje_object_signal_callback_add(cw->shobj, sig, src, cb, (void*)data);
}
-EAPI void
+E_API void
e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb)
{
API_ENTRY;
edje_object_signal_callback_del(cw->shobj, sig, src, cb);
}
-EAPI void
+E_API void
e_comp_object_signal_callback_del_full(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data)
{
API_ENTRY;
edje_object_signal_callback_del_full(cw->shobj, sig, src, cb, (void*)data);
}
-EAPI void
+E_API void
e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h)
{
int tw, th;
@@ -3003,14 +3003,14 @@ e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h)
e_comp_object_render_update_add(obj);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_object_damage_exists(Evas_Object *obj)
{
API_ENTRY EINA_FALSE;
return cw->updates_exist;
}
-EAPI void
+E_API void
e_comp_object_render_update_add(Evas_Object *obj)
{
API_ENTRY;
@@ -3029,7 +3029,7 @@ e_comp_object_render_update_add(Evas_Object *obj)
e_comp_render_queue();
}
-EAPI void
+E_API void
e_comp_object_render_update_del(Evas_Object *obj)
{
API_ENTRY;
@@ -3048,7 +3048,7 @@ e_comp_object_render_update_del(Evas_Object *obj)
}
}
-EAPI void
+E_API void
e_comp_object_shape_apply(Evas_Object *obj)
{
Eina_List *l;
@@ -3152,7 +3152,7 @@ e_comp_object_shape_apply(Evas_Object *obj)
}
/* helper function to simplify toggling of redirection for display servers which support it */
-EAPI void
+E_API void
e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set)
{
API_ENTRY;
@@ -3190,7 +3190,7 @@ e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set)
}
}
-EAPI void
+E_API void
e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set)
{
Evas_Native_Surface ns;
@@ -3217,7 +3217,7 @@ e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set)
}
/* mark an object as dirty and setup damages */
-EAPI void
+E_API void
e_comp_object_dirty(Evas_Object *obj)
{
Eina_Iterator *it;
@@ -3303,7 +3303,7 @@ e_comp_object_dirty(Evas_Object *obj)
e_comp_object_render(obj);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_object_render(Evas_Object *obj)
{
Eina_Iterator *it;
@@ -3405,7 +3405,7 @@ e_comp_object_render(Evas_Object *obj)
}
/* create a duplicate of an evas object */
-EAPI Evas_Object *
+E_API Evas_Object *
e_comp_object_util_mirror_add(Evas_Object *obj)
{
Evas_Object *o;
@@ -3476,7 +3476,7 @@ e_comp_object_util_mirror_add(Evas_Object *obj)
//////////////////////////////////////////////////////
/* setup an api effect for a client */
-EAPI void
+E_API void
e_comp_object_effect_set(Evas_Object *obj, const char *effect)
{
char buf[4096];
@@ -3505,7 +3505,7 @@ e_comp_object_effect_set(Evas_Object *obj, const char *effect)
}
/* set params for embryo scripts in effect */
-EAPI void
+E_API void
e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count)
{
Edje_Message_Int_Set *msg;
@@ -3547,7 +3547,7 @@ _e_comp_object_effect_end_cb(void *data, Evas_Object *obj, const char *emission,
}
/* clip effect to client's zone */
-EAPI void
+E_API void
e_comp_object_effect_clip(Evas_Object *obj)
{
API_ENTRY;
@@ -3559,7 +3559,7 @@ e_comp_object_effect_clip(Evas_Object *obj)
}
/* unclip effect from client's zone */
-EAPI void
+E_API void
e_comp_object_effect_unclip(Evas_Object *obj)
{
API_ENTRY;
@@ -3569,7 +3569,7 @@ e_comp_object_effect_unclip(Evas_Object *obj)
}
/* start effect, running end_cb after */
-EAPI void
+E_API void
e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data)
{
API_ENTRY;
@@ -3589,7 +3589,7 @@ e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *
}
/* stop a currently-running effect immediately */
-EAPI void
+E_API void
e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb)
{
API_ENTRY;
@@ -3617,7 +3617,7 @@ _e_comp_object_effect_mover_sort_cb(E_Comp_Object_Mover *a, E_Comp_Object_Mover
}
/* add a function to trigger based on signal emissions for the purpose of modifying effects */
-EAPI E_Comp_Object_Mover *
+E_API E_Comp_Object_Mover *
e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data)
{
E_Comp_Object_Mover *prov;
@@ -3633,7 +3633,7 @@ e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb
return prov;
}
-EAPI void
+E_API void
e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov)
{
EINA_SAFETY_ON_NULL_RETURN(prov);
@@ -3723,7 +3723,7 @@ _e_comp_object_autoclose_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_O
e_client_refocus();
}
-EAPI void
+E_API void
e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb, E_Comp_Object_Key_Cb cb, const void *data)
{
SOFT_ENTRY();
diff --git a/src/bin/e_comp_object.h b/src/bin/e_comp_object.h
index 4aeaca785..adc8d2718 100644
--- a/src/bin/e_comp_object.h
+++ b/src/bin/e_comp_object.h
@@ -33,54 +33,54 @@ struct E_Comp_Object_Frame
};
-extern EAPI int E_EVENT_COMP_OBJECT_ADD;
+extern E_API int E_EVENT_COMP_OBJECT_ADD;
-EAPI void e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled);
-EAPI Evas_Object *e_comp_object_client_add(E_Client *ec);
-EAPI Evas_Object *e_comp_object_util_mirror_add(Evas_Object *obj);
-EAPI Evas_Object *e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type);
-EAPI void e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
-EAPI void e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
-EAPI void e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah);
-EAPI void e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah);
-EAPI void e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h);
-EAPI E_Client *e_comp_object_client_get(Evas_Object *obj);
-EAPI E_Zone *e_comp_object_util_zone_get(Evas_Object *obj);
-EAPI void e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del);
-EAPI void e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del);
-EAPI void e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb, E_Comp_Object_Key_Cb cb, const void *data);
-EAPI void e_comp_object_util_center(Evas_Object *obj);
-EAPI void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on);
-EAPI void e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y);
-EAPI void e_comp_object_util_fullscreen(Evas_Object *obj);
-EAPI void e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b);
-EAPI void e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h);
-EAPI Eina_Bool e_comp_object_frame_title_set(Evas_Object *obj, const char *name);
-EAPI Eina_Bool e_comp_object_frame_exists(Evas_Object *obj);
-EAPI void e_comp_object_frame_icon_update(Evas_Object *obj);
-EAPI Eina_Bool e_comp_object_frame_theme_set(Evas_Object *obj, const char *name);
-EAPI void e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src);
-EAPI void e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data);
-EAPI void e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb);
-EAPI void e_comp_object_signal_callback_del_full(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data);
-EAPI void e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h);
-EAPI void e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h);
-EAPI Eina_Bool e_comp_object_damage_exists(Evas_Object *obj);
-EAPI void e_comp_object_render_update_add(Evas_Object *obj);
-EAPI void e_comp_object_render_update_del(Evas_Object *obj);
-EAPI void e_comp_object_shape_apply(Evas_Object *obj);
-EAPI void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set);
-EAPI void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set);
-EAPI void e_comp_object_dirty(Evas_Object *obj);
-EAPI Eina_Bool e_comp_object_render(Evas_Object *obj);
-EAPI void e_comp_object_effect_set(Evas_Object *obj, const char *effect);
-EAPI void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count);
-EAPI void e_comp_object_effect_clip(Evas_Object *obj);
-EAPI void e_comp_object_effect_unclip(Evas_Object *obj);
-EAPI void e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data);
-EAPI void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb);
-EAPI E_Comp_Object_Mover *e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data);
-EAPI void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov);
+E_API void e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled);
+E_API Evas_Object *e_comp_object_client_add(E_Client *ec);
+E_API Evas_Object *e_comp_object_util_mirror_add(Evas_Object *obj);
+E_API Evas_Object *e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type);
+E_API void e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
+E_API void e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
+E_API void e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah);
+E_API void e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah);
+E_API void e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h);
+E_API E_Client *e_comp_object_client_get(Evas_Object *obj);
+E_API E_Zone *e_comp_object_util_zone_get(Evas_Object *obj);
+E_API void e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del);
+E_API void e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del);
+E_API void e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb, E_Comp_Object_Key_Cb cb, const void *data);
+E_API void e_comp_object_util_center(Evas_Object *obj);
+E_API void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on);
+E_API void e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y);
+E_API void e_comp_object_util_fullscreen(Evas_Object *obj);
+E_API void e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b);
+E_API void e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h);
+E_API Eina_Bool e_comp_object_frame_title_set(Evas_Object *obj, const char *name);
+E_API Eina_Bool e_comp_object_frame_exists(Evas_Object *obj);
+E_API void e_comp_object_frame_icon_update(Evas_Object *obj);
+E_API Eina_Bool e_comp_object_frame_theme_set(Evas_Object *obj, const char *name);
+E_API void e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src);
+E_API void e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data);
+E_API void e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb);
+E_API void e_comp_object_signal_callback_del_full(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data);
+E_API void e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h);
+E_API void e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h);
+E_API Eina_Bool e_comp_object_damage_exists(Evas_Object *obj);
+E_API void e_comp_object_render_update_add(Evas_Object *obj);
+E_API void e_comp_object_render_update_del(Evas_Object *obj);
+E_API void e_comp_object_shape_apply(Evas_Object *obj);
+E_API void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set);
+E_API void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set);
+E_API void e_comp_object_dirty(Evas_Object *obj);
+E_API Eina_Bool e_comp_object_render(Evas_Object *obj);
+E_API void e_comp_object_effect_set(Evas_Object *obj, const char *effect);
+E_API void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count);
+E_API void e_comp_object_effect_clip(Evas_Object *obj);
+E_API void e_comp_object_effect_unclip(Evas_Object *obj);
+E_API void e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data);
+E_API void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb);
+E_API E_Comp_Object_Mover *e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data);
+E_API void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov);
#endif
#endif
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index a8d6038a1..84236f3d7 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2468,7 +2468,7 @@ disp_err:
*
* @returns true on success, false if initialization failed.
*/
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_wl_init(void)
{
/* set gl available if we have ecore_evas support */
@@ -2544,7 +2544,7 @@ e_comp_wl_init(void)
*
* @returns the corresponding Wayland signal
*/
-EAPI struct wl_signal
+E_API struct wl_signal
e_comp_wl_surface_create_signal_get(void)
{
return e_comp->wl_comp_data->signals.surface.create;
@@ -2697,7 +2697,7 @@ e_comp_wl_buffer_reference(E_Comp_Wl_Buffer_Ref *ref, E_Comp_Wl_Buffer *buffer)
* @param resource that owns the desired buffer
* @returns a new E_Comp_Wl_Buffer object
*/
-EAPI E_Comp_Wl_Buffer *
+E_API E_Comp_Wl_Buffer *
e_comp_wl_buffer_get(struct wl_resource *resource)
{
E_Comp_Wl_Buffer *buffer;
@@ -2728,7 +2728,7 @@ e_comp_wl_buffer_get(struct wl_resource *resource)
*
* @returns time in seconds.
*/
-EAPI double
+E_API double
e_comp_wl_idle_time_get(void)
{
return (ecore_loop_time_get() - _last_event_time);
@@ -2770,7 +2770,7 @@ _e_comp_wl_output_get(Eina_List *outputs, const char *id)
*
* @returns True if a display output object could be added or updated
*/
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_wl_output_init(const char *id, const char *make, const char *model,
int x, int y, int w, int h, int pw, int ph,
unsigned int refresh, unsigned int subpixel,
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 2fc47148b..8b3454cf0 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -277,7 +277,7 @@ struct _E_Comp_Wl_Output
double scale;
};
-EAPI Eina_Bool e_comp_wl_init(void);
+E_API Eina_Bool e_comp_wl_init(void);
EINTERN void e_comp_wl_shutdown(void);
EINTERN struct wl_resource *e_comp_wl_surface_create(struct wl_client *client, int version, uint32_t id);
@@ -286,11 +286,11 @@ EINTERN void e_comp_wl_surface_attach(E_Client *ec, E_Comp_Wl_Buffer *buffer);
EINTERN Eina_Bool e_comp_wl_surface_commit(E_Client *ec);
EINTERN Eina_Bool e_comp_wl_subsurface_commit(E_Client *ec);
EINTERN void e_comp_wl_buffer_reference(E_Comp_Wl_Buffer_Ref *ref, E_Comp_Wl_Buffer *buffer);
-EAPI E_Comp_Wl_Buffer *e_comp_wl_buffer_get(struct wl_resource *resource);
+E_API E_Comp_Wl_Buffer *e_comp_wl_buffer_get(struct wl_resource *resource);
-EAPI struct wl_signal e_comp_wl_surface_create_signal_get(void);
-EAPI double e_comp_wl_idle_time_get(void);
-EAPI Eina_Bool e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform);
+E_API struct wl_signal e_comp_wl_surface_create_signal_get(void);
+E_API double e_comp_wl_idle_time_get(void);
+E_API Eina_Bool e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform);
# endif
#endif
diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index d0729b78a..e529b46d1 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -524,7 +524,7 @@ e_comp_wl_input_keyboard_state_update(E_Comp_Data *cdata, uint32_t keycode, Eina
xkb_state_update_key(cdata->xkb.state, keycode + 8, dir);
}
-EAPI void
+E_API void
e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled)
{
/* check for valid compositor data */
@@ -538,7 +538,7 @@ e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled)
_e_comp_wl_input_update_seat_caps(cdata);
}
-EAPI void
+E_API void
e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled)
{
/* check for valid compositor data */
@@ -552,7 +552,7 @@ e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled)
_e_comp_wl_input_update_seat_caps(cdata);
}
-EAPI void
+E_API void
e_comp_wl_input_keymap_set(E_Comp_Data *cdata, const char *rules, const char *model, const char *layout)
{
struct xkb_keymap *keymap;
diff --git a/src/bin/e_comp_wl_input.h b/src/bin/e_comp_wl_input.h
index a0b360426..19cad872d 100644
--- a/src/bin/e_comp_wl_input.h
+++ b/src/bin/e_comp_wl_input.h
@@ -13,10 +13,10 @@ EINTERN void e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata);
EINTERN void e_comp_wl_input_keyboard_state_update(E_Comp_Data *cdata, uint32_t keycode, Eina_Bool pressed);
EINTERN void e_comp_wl_input_keyboard_enter_send(E_Client *client);
-EAPI void e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled);
-EAPI void e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled);
+E_API void e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled);
+E_API void e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled);
-EAPI void e_comp_wl_input_keymap_set(E_Comp_Data *cdata, const char *rules, const char *model, const char *layout);
+E_API void e_comp_wl_input_keymap_set(E_Comp_Data *cdata, const char *rules, const char *model, const char *layout);
# endif
#endif
diff --git a/src/bin/e_comp_x.h b/src/bin/e_comp_x.h
index f25477047..4f96a2c44 100644
--- a/src/bin/e_comp_x.h
+++ b/src/bin/e_comp_x.h
@@ -108,7 +108,7 @@ struct _E_Comp_X_Client_Data
EINTERN Eina_Bool e_comp_x_init(void);
EINTERN void e_comp_x_shutdown(void);
-EAPI void e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window win);
+E_API void e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window win);
EINTERN void e_comp_x_nocomp_end(void);
# endif
#endif
diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c
index a0ca05832..5a42be143 100644
--- a/src/bin/e_comp_x_randr.c
+++ b/src/bin/e_comp_x_randr.c
@@ -412,7 +412,7 @@ _mode_screen_find(Ecore_X_Window root, E_Randr2_Screen *s, Ecore_X_Randr_Output
return mode;
}
-EAPI void
+E_API void
e_comp_x_randr_init(void)
{
// add handler for randr screen change events
@@ -430,7 +430,7 @@ e_comp_x_randr_init(void)
}
}
-EAPI void
+E_API void
e_comp_x_randr_shutdown(void)
{
// clear up event listening
@@ -442,7 +442,7 @@ e_comp_x_randr_shutdown(void)
E_FREE_LIST(handlers, ecore_event_handler_del);
}
-EAPI void
+E_API void
e_comp_x_randr_config_apply(void)
{
Eina_List *l;
@@ -622,14 +622,14 @@ e_comp_x_randr_config_apply(void)
// event_ignore = EINA_TRUE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_x_randr_available(void)
{
// is randr extn there?
return ecore_x_randr_query();
}
-EAPI E_Randr2 *
+E_API E_Randr2 *
e_comp_x_randr_create(void)
{
Ecore_X_Randr_Crtc *crtcs = NULL;
@@ -826,7 +826,7 @@ e_comp_x_randr_create(void)
return r;
}
-EAPI void
+E_API void
e_comp_x_randr_screen_iface_set(void)
{
if (e_comp->screen)
@@ -834,7 +834,7 @@ e_comp_x_randr_screen_iface_set(void)
e_comp->screen = &xiface;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_comp_x_randr_canvas_new(Ecore_Window parent, int w, int h)
{
Eina_Bool ret = EINA_TRUE;
diff --git a/src/bin/e_comp_x_randr.h b/src/bin/e_comp_x_randr.h
index 84932d649..41ca659a6 100644
--- a/src/bin/e_comp_x_randr.h
+++ b/src/bin/e_comp_x_randr.h
@@ -1,12 +1,12 @@
#ifndef E_COMP_X_RANDR_H
# define E_COMP_X_RANDR_H
-EAPI void e_comp_x_randr_init(void);
-EAPI void e_comp_x_randr_shutdown(void);
-EAPI void e_comp_x_randr_config_apply(void);
-EAPI Eina_Bool e_comp_x_randr_available(void);
-EAPI E_Randr2 *e_comp_x_randr_create(void);
+E_API void e_comp_x_randr_init(void);
+E_API void e_comp_x_randr_shutdown(void);
+E_API void e_comp_x_randr_config_apply(void);
+E_API Eina_Bool e_comp_x_randr_available(void);
+E_API E_Randr2 *e_comp_x_randr_create(void);
-EAPI void e_comp_x_randr_screen_iface_set(void);
-EAPI Eina_Bool e_comp_x_randr_canvas_new(Ecore_Window parent, int w, int h);
+E_API void e_comp_x_randr_screen_iface_set(void);
+E_API Eina_Bool e_comp_x_randr_canvas_new(Ecore_Window parent, int w, int h);
#endif
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index fa7d259d4..7f413f285 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -6,8 +6,8 @@
#define DEF_MENUCLICK 0.25
#endif
-EAPI E_Config *e_config = NULL;
-EAPI E_Config_Bindings *e_bindings = NULL;
+E_API E_Config *e_config = NULL;
+E_API E_Config_Bindings *e_bindings = NULL;
static int _e_config_revisions = 9;
@@ -51,9 +51,9 @@ static E_Config_DD *_e_config_env_var_edd = NULL;
static E_Config_DD *_e_config_xkb_layout_edd = NULL;
static E_Config_DD *_e_config_xkb_option_edd = NULL;
-EAPI int E_EVENT_CONFIG_ICON_THEME = 0;
-EAPI int E_EVENT_CONFIG_MODE_CHANGED = 0;
-EAPI int E_EVENT_CONFIG_LOADED = 0;
+E_API int E_EVENT_CONFIG_ICON_THEME = 0;
+E_API int E_EVENT_CONFIG_MODE_CHANGED = 0;
+E_API int E_EVENT_CONFIG_LOADED = 0;
static E_Dialog *_e_config_error_dialog = NULL;
@@ -952,7 +952,7 @@ e_config_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_config_load(void)
{
int reload = 0;
@@ -1523,7 +1523,7 @@ e_config_load(void)
ecore_event_add(E_EVENT_CONFIG_LOADED, NULL, NULL, NULL);
}
-EAPI int
+E_API int
e_config_save(void)
{
E_FREE_FUNC(_e_config_save_defer, e_powersave_deferred_action_del);
@@ -1531,7 +1531,7 @@ e_config_save(void)
return e_config_domain_save("e", _e_config_edd, e_config);
}
-EAPI void
+E_API void
e_config_save_flush(void)
{
if (_e_config_save_defer)
@@ -1542,7 +1542,7 @@ e_config_save_flush(void)
}
}
-EAPI void
+E_API void
e_config_save_queue(void)
{
if (_e_config_save_defer)
@@ -1551,20 +1551,20 @@ e_config_save_queue(void)
NULL);
}
-EAPI const char *
+E_API const char *
e_config_profile_get(void)
{
return _e_config_profile;
}
-EAPI void
+E_API void
e_config_profile_set(const char *prof)
{
eina_stringshare_replace(&_e_config_profile, prof);
e_util_env_set("E_CONF_PROFILE", _e_config_profile);
}
-EAPI char *
+E_API char *
e_config_profile_dir_get(const char *prof)
{
char buf[PATH_MAX];
@@ -1582,7 +1582,7 @@ _cb_sort_files(char *f1, char *f2)
return strcmp(f1, f2);
}
-EAPI Eina_List *
+E_API Eina_List *
e_config_profile_list(void)
{
Eina_List *files;
@@ -1658,7 +1658,7 @@ e_config_profile_list(void)
return flist;
}
-EAPI void
+E_API void
e_config_profile_add(const char *prof)
{
char buf[4096];
@@ -1667,7 +1667,7 @@ e_config_profile_add(const char *prof)
ecore_file_mkdir(buf);
}
-EAPI void
+E_API void
e_config_profile_del(const char *prof)
{
char buf[4096];
@@ -1676,13 +1676,13 @@ e_config_profile_del(const char *prof)
ecore_file_recursive_rm(buf);
}
-EAPI void
+E_API void
e_config_save_block_set(int block)
{
_e_config_save_block = block;
}
-EAPI int
+E_API int
e_config_save_block_get(void)
{
return _e_config_save_block;
@@ -1697,7 +1697,7 @@ e_config_save_block_get(void)
* @param edd to struct definition
* @return returns allocated struct on success, if unable to find config returns null
*/
-EAPI void *
+E_API void *
e_config_domain_load(const char *domain, E_Config_DD *edd)
{
Eet_File *ef;
@@ -1730,7 +1730,7 @@ e_config_domain_load(const char *domain, E_Config_DD *edd)
return e_config_domain_system_load(domain, edd);
}
-EAPI void *
+E_API void *
e_config_domain_system_load(const char *domain, E_Config_DD *edd)
{
Eet_File *ef;
@@ -1783,7 +1783,7 @@ _e_config_mv_error(const char *from, const char *to)
_e_config_error_dialog = dia;
}
-EAPI int
+E_API int
e_config_profile_save(void)
{
Eet_File *ef;
@@ -1850,7 +1850,7 @@ e_config_profile_save(void)
* @param data struct to save as configuration file
* @return 1 if save success, 0 on failure
*/
-EAPI int
+E_API int
e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
{
Eet_File *ef;
@@ -1914,7 +1914,7 @@ e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
return ok;
}
-EAPI E_Config_Binding_Mouse *
+E_API E_Config_Binding_Mouse *
e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in)
{
Eina_List *l;
@@ -1935,7 +1935,7 @@ e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in)
return NULL;
}
-EAPI E_Config_Binding_Key *
+E_API E_Config_Binding_Key *
e_config_binding_key_match(E_Config_Binding_Key *eb_in)
{
Eina_List *l;
@@ -1957,7 +1957,7 @@ e_config_binding_key_match(E_Config_Binding_Key *eb_in)
return NULL;
}
-EAPI E_Config_Binding_Edge *
+E_API E_Config_Binding_Edge *
e_config_binding_edge_match(E_Config_Binding_Edge *eb_in)
{
Eina_List *l;
@@ -1980,7 +1980,7 @@ e_config_binding_edge_match(E_Config_Binding_Edge *eb_in)
return NULL;
}
-EAPI E_Config_Binding_Signal *
+E_API E_Config_Binding_Signal *
e_config_binding_signal_match(E_Config_Binding_Signal *eb_in)
{
Eina_List *l;
@@ -2004,7 +2004,7 @@ e_config_binding_signal_match(E_Config_Binding_Signal *eb_in)
return NULL;
}
-EAPI E_Config_Binding_Wheel *
+E_API E_Config_Binding_Wheel *
e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in)
{
Eina_List *l;
@@ -2026,7 +2026,7 @@ e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in)
return NULL;
}
-EAPI E_Config_Binding_Acpi *
+E_API E_Config_Binding_Acpi *
e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in)
{
Eina_List *l;
@@ -2048,13 +2048,13 @@ e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in)
return NULL;
}
-EAPI void
+E_API void
e_config_mode_changed(void)
{
ecore_event_add(E_EVENT_CONFIG_MODE_CHANGED, NULL, NULL, NULL);
}
-EAPI void
+E_API void
e_config_binding_acpi_free(E_Config_Binding_Acpi *eba)
{
if (!eba) return;
@@ -2063,7 +2063,7 @@ e_config_binding_acpi_free(E_Config_Binding_Acpi *eba)
free(eba);
}
-EAPI void
+E_API void
e_config_binding_key_free(E_Config_Binding_Key *ebk)
{
if (!ebk) return;
@@ -2073,7 +2073,7 @@ e_config_binding_key_free(E_Config_Binding_Key *ebk)
free(ebk);
}
-EAPI void
+E_API void
e_config_binding_edge_free(E_Config_Binding_Edge *ebe)
{
if (!ebe) return;
@@ -2082,7 +2082,7 @@ e_config_binding_edge_free(E_Config_Binding_Edge *ebe)
free(ebe);
}
-EAPI void
+E_API void
e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm)
{
if (!ebm) return;
@@ -2091,7 +2091,7 @@ e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm)
free(ebm);
}
-EAPI void
+E_API void
e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw)
{
if (!ebw) return;
@@ -2100,7 +2100,7 @@ e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw)
free(ebw);
}
-EAPI void
+E_API void
e_config_binding_signal_free(E_Config_Binding_Signal *ebs)
{
if (!ebs) return;
@@ -2111,7 +2111,7 @@ e_config_binding_signal_free(E_Config_Binding_Signal *ebs)
free(ebs);
}
-EAPI void
+E_API void
e_config_bindings_free(E_Config_Bindings *ecb)
{
if (!ecb) return;
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index b54f354aa..c3362f218 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -644,50 +644,50 @@ struct _E_Config_XKB_Option
EINTERN int e_config_init(void);
EINTERN int e_config_shutdown(void);
-EAPI void e_config_load(void);
-
-EAPI int e_config_save(void);
-EAPI void e_config_save_flush(void);
-EAPI void e_config_save_queue(void);
-
-EAPI const char *e_config_profile_get(void);
-EAPI char *e_config_profile_dir_get(const char *prof);
-EAPI void e_config_profile_set(const char *prof);
-EAPI Eina_List *e_config_profile_list(void);
-EAPI void e_config_profile_add(const char *prof);
-EAPI void e_config_profile_del(const char *prof);
-
-EAPI void e_config_save_block_set(int block);
-EAPI int e_config_save_block_get(void);
-
-EAPI void *e_config_domain_load(const char *domain, E_Config_DD *edd);
-EAPI void *e_config_domain_system_load(const char *domain, E_Config_DD *edd);
-EAPI int e_config_profile_save(void);
-EAPI int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data);
-
-EAPI E_Config_Binding_Mouse *e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in);
-EAPI E_Config_Binding_Key *e_config_binding_key_match(E_Config_Binding_Key *eb_in);
-EAPI E_Config_Binding_Edge *e_config_binding_edge_match(E_Config_Binding_Edge *eb_in);
-EAPI E_Config_Binding_Signal *e_config_binding_signal_match(E_Config_Binding_Signal *eb_in);
-EAPI E_Config_Binding_Wheel *e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in);
-EAPI E_Config_Binding_Acpi *e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in);
-EAPI void e_config_mode_changed(void);
-
-
-EAPI void e_config_bindings_free(E_Config_Bindings *ecb);
-EAPI void e_config_binding_signal_free(E_Config_Binding_Signal *ebs);
-EAPI void e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw);
-EAPI void e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm);
-EAPI void e_config_binding_edge_free(E_Config_Binding_Edge *ebe);
-EAPI void e_config_binding_key_free(E_Config_Binding_Key *ebk);
-EAPI void e_config_binding_acpi_free(E_Config_Binding_Acpi *eba);
-
-extern EAPI E_Config *e_config;
-extern EAPI E_Config_Bindings *e_bindings;
-
-extern EAPI int E_EVENT_CONFIG_ICON_THEME;
-extern EAPI int E_EVENT_CONFIG_MODE_CHANGED;
-extern EAPI int E_EVENT_CONFIG_LOADED;
+E_API void e_config_load(void);
+
+E_API int e_config_save(void);
+E_API void e_config_save_flush(void);
+E_API void e_config_save_queue(void);
+
+E_API const char *e_config_profile_get(void);
+E_API char *e_config_profile_dir_get(const char *prof);
+E_API void e_config_profile_set(const char *prof);
+E_API Eina_List *e_config_profile_list(void);
+E_API void e_config_profile_add(const char *prof);
+E_API void e_config_profile_del(const char *prof);
+
+E_API void e_config_save_block_set(int block);
+E_API int e_config_save_block_get(void);
+
+E_API void *e_config_domain_load(const char *domain, E_Config_DD *edd);
+E_API void *e_config_domain_system_load(const char *domain, E_Config_DD *edd);
+E_API int e_config_profile_save(void);
+E_API int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data);
+
+E_API E_Config_Binding_Mouse *e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in);
+E_API E_Config_Binding_Key *e_config_binding_key_match(E_Config_Binding_Key *eb_in);
+E_API E_Config_Binding_Edge *e_config_binding_edge_match(E_Config_Binding_Edge *eb_in);
+E_API E_Config_Binding_Signal *e_config_binding_signal_match(E_Config_Binding_Signal *eb_in);
+E_API E_Config_Binding_Wheel *e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in);
+E_API E_Config_Binding_Acpi *e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in);
+E_API void e_config_mode_changed(void);
+
+
+E_API void e_config_bindings_free(E_Config_Bindings *ecb);
+E_API void e_config_binding_signal_free(E_Config_Binding_Signal *ebs);
+E_API void e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw);
+E_API void e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm);
+E_API void e_config_binding_edge_free(E_Config_Binding_Edge *ebe);
+E_API void e_config_binding_key_free(E_Config_Binding_Key *ebk);
+E_API void e_config_binding_acpi_free(E_Config_Binding_Acpi *eba);
+
+extern E_API E_Config *e_config;
+extern E_API E_Config_Bindings *e_bindings;
+
+extern E_API int E_EVENT_CONFIG_ICON_THEME;
+extern E_API int E_EVENT_CONFIG_MODE_CHANGED;
+extern E_API int E_EVENT_CONFIG_LOADED;
#endif
#endif
diff --git a/src/bin/e_config_data.c b/src/bin/e_config_data.c
index 66783fc0e..8dd90339f 100644
--- a/src/bin/e_config_data.c
+++ b/src/bin/e_config_data.c
@@ -2,14 +2,14 @@
static Eina_Hash *config_hash = NULL;
-EAPI void
+E_API void
e_config_descriptor_free(E_Config_DD *edd)
{
eina_hash_del_by_key(config_hash, eet_data_descriptor_name_get((Eet_Data_Descriptor*)edd));
eet_data_descriptor_free((Eet_Data_Descriptor*)edd);
}
-EAPI E_Config_DD *
+E_API E_Config_DD *
e_config_descriptor_new(const char *name, int size)
{
Eet_Data_Descriptor_Class eddc;
@@ -29,7 +29,7 @@ e_config_descriptor_new(const char *name, int size)
return edd;
}
-EAPI E_Config_DD *
+E_API E_Config_DD *
e_config_descriptor_find(const char *name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);
diff --git a/src/bin/e_config_data.h b/src/bin/e_config_data.h
index 35bf7a159..b52ea3225 100644
--- a/src/bin/e_config_data.h
+++ b/src/bin/e_config_data.h
@@ -55,9 +55,9 @@ typedef Eet_Data_Descriptor E_Config_DD;
#ifndef E_CONFIG_DATA_H
#define E_CONFIG_DATA_H
-EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size);
-EAPI void e_config_descriptor_free(E_Config_DD *edd);
-EAPI E_Config_DD *e_config_descriptor_find(const char *name);
+E_API E_Config_DD *e_config_descriptor_new(const char *name, int size);
+E_API void e_config_descriptor_free(E_Config_DD *edd);
+E_API E_Config_DD *e_config_descriptor_find(const char *name);
#endif
#endif
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 04aa2c7a6..67f99514f 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -31,7 +31,7 @@ static Eina_List *_e_config_dialog_list = NULL;
* @param data additional data to attach to the dialog, will be passed to the callbacks
* @return returns the created dialog. Null on failure
*/
-EAPI E_Config_Dialog *
+E_API E_Config_Dialog *
e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data)
{
E_Config_Dialog *cfd;
@@ -92,7 +92,7 @@ e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, co
return cfd;
}
-EAPI int
+E_API int
e_config_dialog_find(const char *name, const char *class)
{
Eina_List *l;
@@ -122,7 +122,7 @@ e_config_dialog_find(const char *name, const char *class)
return 0;
}
-EAPI E_Config_Dialog *
+E_API E_Config_Dialog *
e_config_dialog_get(const char *name, const char *class)
{
Eina_List *l;
@@ -483,14 +483,14 @@ _e_config_dialog_cb_close(void *data EINA_UNUSED, E_Dialog *dia)
if (ok) e_util_defer_object_del(E_OBJECT(cfd));
}
-EAPI void
+E_API void
e_config_dialog_changed_auto_set(E_Config_Dialog *cfd, unsigned char value)
{
if (!cfd) return;
cfd->cfg_changed_auto = !!value;
}
-EAPI void
+E_API void
e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value)
{
if (!cfd) return;
diff --git a/src/bin/e_config_dialog.h b/src/bin/e_config_dialog.h
index 78404ae32..ac97779e9 100644
--- a/src/bin/e_config_dialog.h
+++ b/src/bin/e_config_dialog.h
@@ -55,12 +55,12 @@ struct _E_Config_Dialog
unsigned char cfg_changed_auto : 1;
};
-EAPI E_Config_Dialog *e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data);
-EAPI int e_config_dialog_find(const char *name, const char *class);
-EAPI E_Config_Dialog *e_config_dialog_get(const char *name, const char *class);
+E_API E_Config_Dialog *e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data);
+E_API int e_config_dialog_find(const char *name, const char *class);
+E_API E_Config_Dialog *e_config_dialog_get(const char *name, const char *class);
-EAPI void e_config_dialog_changed_auto_set(E_Config_Dialog *cfd, unsigned char value);
-EAPI void e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value);
+E_API void e_config_dialog_changed_auto_set(E_Config_Dialog *cfd, unsigned char value);
+E_API void e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value);
#endif
#endif
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index ec7a85b13..ac51ca4df 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -11,7 +11,7 @@ static void _e_configure_registry_item_free(E_Configure_It *eci);
static void _configure_job(void *data);
static Eina_Bool _configure_init_timer(void *data);
-EAPI Eina_List *e_configure_registry = NULL;
+E_API Eina_List *e_configure_registry = NULL;
static Eina_List *handlers = NULL;
static E_Int_Menu_Augmentation *maug = NULL;
@@ -46,7 +46,7 @@ e_configure_init(void)
ecore_timer_add(0.0, _configure_init_timer, NULL);
}
-EAPI void
+E_API void
e_configure_registry_call(const char *path, Evas_Object *parent, const char *params)
{
E_Configure_Cat *ecat;
@@ -88,19 +88,19 @@ e_configure_registry_call(const char *path, Evas_Object *parent, const char *par
free(cat);
}
-EAPI void
+E_API void
e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(Evas_Object *parent, const char *params))
{
_e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL, NULL, NULL);
}
-EAPI void
+E_API void
e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func)(Evas_Object *parent, const char *params))
{
_e_configure_registry_item_full_add(path, pri, label, icon_file, icon, NULL, generic_func, NULL, NULL);
}
-EAPI void
+E_API void
e_configure_registry_item_params_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(Evas_Object *parent, const char *params), const char *params)
{
_e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL, NULL, params);
@@ -111,7 +111,7 @@ e_configure_registry_item_params_add(const char *path, int pri, const char *labe
*
*@param path location the item to delete
*/
-EAPI void
+E_API void
e_configure_registry_item_del(const char *path)
{
E_Configure_Cat *ecat;
@@ -161,7 +161,7 @@ _E_configure_category_pri_cb(E_Configure_Cat *ecat, E_Configure_Cat *ecat2)
return ecat->pri - ecat2->pri;
}
-EAPI void
+E_API void
e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon)
{
E_Configure_Cat *ecat2;
@@ -190,7 +190,7 @@ e_configure_registry_category_add(const char *path, int pri, const char *label,
*
*@param path location the category to delete
*/
-EAPI void
+E_API void
e_configure_registry_category_del(const char *path)
{
E_Configure_Cat *ecat;
@@ -226,14 +226,14 @@ e_configure_registry_category_del(const char *path)
*@param func the callback to use when the configuration item is clicked
*/
-EAPI void
+E_API void
e_configure_registry_custom_desktop_exec_callback_set(void (*func)(const void *data, const char *params, Efreet_Desktop *desktop), const void *data)
{
custom_desktop_exec.func = func;
custom_desktop_exec.data = data;
}
-EAPI int
+E_API int
e_configure_registry_exists(const char *path)
{
E_Configure_Cat *ecat;
diff --git a/src/bin/e_configure.h b/src/bin/e_configure.h
index 16900ebbf..e4ec9cf6a 100644
--- a/src/bin/e_configure.h
+++ b/src/bin/e_configure.h
@@ -30,18 +30,18 @@ struct _E_Configure_It
Efreet_Desktop *desktop;
};
-EAPI void e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (Evas_Object *parent, const char *params));
-EAPI void e_configure_registry_item_params_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (Evas_Object *parent, const char *params), const char *params);
-EAPI void e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func) (Evas_Object *parent, const char *params));
-EAPI void e_configure_registry_item_del(const char *path);
-EAPI void e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon);
-EAPI void e_configure_registry_category_del(const char *path);
-EAPI void e_configure_registry_call(const char *path, Evas_Object *parent, 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, const char *params, Efreet_Desktop *desktop), const void *data);
+E_API void e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (Evas_Object *parent, const char *params));
+E_API void e_configure_registry_item_params_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (Evas_Object *parent, const char *params), const char *params);
+E_API void e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func) (Evas_Object *parent, const char *params));
+E_API void e_configure_registry_item_del(const char *path);
+E_API void e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon);
+E_API void e_configure_registry_category_del(const char *path);
+E_API void e_configure_registry_call(const char *path, Evas_Object *parent, const char *params);
+E_API int e_configure_registry_exists(const char *path);
+E_API void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, const char *params, Efreet_Desktop *desktop), const void *data);
EINTERN void e_configure_init(void);
-extern EAPI Eina_List *e_configure_registry;
+extern E_API Eina_List *e_configure_registry;
#endif
#endif
diff --git a/src/bin/e_confirm_dialog.c b/src/bin/e_confirm_dialog.c
index 6d1ac39be..21f5f675c 100644
--- a/src/bin/e_confirm_dialog.c
+++ b/src/bin/e_confirm_dialog.c
@@ -15,7 +15,7 @@ _dia_del(void *data)
}
/********** externally accesible functions ****************/
-EAPI E_Confirm_Dialog *
+E_API E_Confirm_Dialog *
e_confirm_dialog_show(const char *title, const char *icon, const char *text,
const char *button_text, const char *button2_text,
void (*func)(void *data), void (*func2)(void *data),
diff --git a/src/bin/e_confirm_dialog.h b/src/bin/e_confirm_dialog.h
index 0c2db07c1..6740af3b0 100644
--- a/src/bin/e_confirm_dialog.h
+++ b/src/bin/e_confirm_dialog.h
@@ -45,7 +45,7 @@ struct _E_Confirm_Dialog
* del_func - the function to call before dialog is deleted
* del_data - the pointer passer to del_func
*/
-EAPI E_Confirm_Dialog *e_confirm_dialog_show(const char *title, const char *icon, const char *text, const char *button_text, const char *button2_text, void (*func)(void *data), void (*func2)(void *data), void *data, void *data2, void (*del_func)(void *data), void *del_data);
+E_API E_Confirm_Dialog *e_confirm_dialog_show(const char *title, const char *icon, const char *text, const char *button_text, const char *button2_text, void (*func)(void *data), void (*func2)(void *data), void *data, void *data2, void (*del_func)(void *data), void *del_data);
#endif
#endif
diff --git a/src/bin/e_datastore.c b/src/bin/e_datastore.c
index c0bb87c08..eb28ee183 100644
--- a/src/bin/e_datastore.c
+++ b/src/bin/e_datastore.c
@@ -6,7 +6,7 @@
static Eina_Hash *store = NULL;
/* externally accessible functions */
-EAPI void
+E_API void
e_datastore_set(char *key, void *data)
{
if (!store) store = eina_hash_string_superfast_new(NULL);
@@ -14,13 +14,13 @@ e_datastore_set(char *key, void *data)
eina_hash_add(store, key, data);
}
-EAPI void *
+E_API void *
e_datastore_get(char *key)
{
return eina_hash_find(store, key);
}
-EAPI void
+E_API void
e_datastore_del(char *key)
{
eina_hash_del(store, key, NULL);
diff --git a/src/bin/e_datastore.h b/src/bin/e_datastore.h
index f22e2b90b..dfbb1b1a1 100644
--- a/src/bin/e_datastore.h
+++ b/src/bin/e_datastore.h
@@ -4,9 +4,9 @@
#ifndef E_DATASTORE_H
#define E_DATASTORE_H
-EAPI void e_datastore_set(char *key, void *data);
-EAPI void *e_datastore_get(char *key);
-EAPI void e_datastore_del(char *key);
+E_API void e_datastore_set(char *key, void *data);
+E_API void *e_datastore_get(char *key);
+E_API void e_datastore_del(char *key);
#endif
#endif
diff --git a/src/bin/e_dbusmenu.c b/src/bin/e_dbusmenu.c
index 030724240..76cce5771 100644
--- a/src/bin/e_dbusmenu.c
+++ b/src/bin/e_dbusmenu.c
@@ -337,7 +337,7 @@ layout_updated_cb(void *data, const Eldbus_Message *msg EINA_UNUSED)
layout_update(ctx);
}
-EAPI E_DBusMenu_Ctx *
+E_API E_DBusMenu_Ctx *
e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, const void *data)
{
Eldbus_Object *obj;
@@ -371,7 +371,7 @@ e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, cons
return ctx;
}
-EAPI void
+E_API void
e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event)
{
Eldbus_Message *msg;
@@ -397,7 +397,7 @@ e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event)
eldbus_proxy_send(m->ctx->proxy, msg, NULL, NULL, -1);
}
-EAPI void
+E_API void
e_dbusmenu_unload(E_DBusMenu_Ctx *ctx)
{
Eldbus_Connection *conn;
@@ -414,13 +414,13 @@ e_dbusmenu_unload(E_DBusMenu_Ctx *ctx)
free(ctx);
}
-EAPI void
+E_API void
e_dbusmenu_pop_request_cb_set(E_DBusMenu_Ctx *ctx, E_DBusMenu_Pop_Request_Cb cb)
{
ctx->pop_request_cb = cb;
}
-EAPI void
+E_API void
e_dbusmenu_update_cb_set(E_DBusMenu_Ctx *ctx, E_DBusMenu_Update_Cb cb)
{
ctx->update_cb = cb;
diff --git a/src/bin/e_dbusmenu.h b/src/bin/e_dbusmenu.h
index 84005ffef..cbc9df45f 100644
--- a/src/bin/e_dbusmenu.h
+++ b/src/bin/e_dbusmenu.h
@@ -61,11 +61,11 @@ struct _E_DBusMenu_Item
typedef void (*E_DBusMenu_Pop_Request_Cb)(void *data, const E_DBusMenu_Item *item);
typedef void (*E_DBusMenu_Update_Cb)(void *data, E_DBusMenu_Item *new_root_item);
-EAPI E_DBusMenu_Ctx * e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, const void *data);
-EAPI void e_dbusmenu_unload(E_DBusMenu_Ctx *ctx);
-EAPI void e_dbusmenu_update_cb_set(E_DBusMenu_Ctx *menu_data, E_DBusMenu_Update_Cb cb);
-EAPI void e_dbusmenu_pop_request_cb_set(E_DBusMenu_Ctx *menu_data, E_DBusMenu_Pop_Request_Cb cb);
+E_API E_DBusMenu_Ctx * e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, const void *data);
+E_API void e_dbusmenu_unload(E_DBusMenu_Ctx *ctx);
+E_API void e_dbusmenu_update_cb_set(E_DBusMenu_Ctx *menu_data, E_DBusMenu_Update_Cb cb);
+E_API void e_dbusmenu_pop_request_cb_set(E_DBusMenu_Ctx *menu_data, E_DBusMenu_Pop_Request_Cb cb);
-EAPI void e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event);
+E_API void e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event);
#endif
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 257f10c1c..e2a1d5408 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -19,12 +19,12 @@ static void _e_desk_window_profile_change_protocol_set(void);
static E_Desk_Flip_Cb _e_desk_flip_cb = NULL;
static void *_e_desk_flip_data = NULL;
-EAPI int E_EVENT_DESK_SHOW = 0;
-EAPI int E_EVENT_DESK_BEFORE_SHOW = 0;
-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 E_EVENT_DESK_WINDOW_PROFILE_CHANGE = 0;
+E_API int E_EVENT_DESK_SHOW = 0;
+E_API int E_EVENT_DESK_BEFORE_SHOW = 0;
+E_API int E_EVENT_DESK_AFTER_SHOW = 0;
+E_API int E_EVENT_DESK_DESKSHOW = 0;
+E_API int E_EVENT_DESK_NAME_CHANGE = 0;
+E_API int E_EVENT_DESK_WINDOW_PROFILE_CHANGE = 0;
EINTERN int
e_desk_init(void)
@@ -44,7 +44,7 @@ e_desk_shutdown(void)
return 1;
}
-EAPI E_Desk *
+E_API E_Desk *
e_desk_new(E_Zone *zone, int x, int y)
{
E_Desk *desk;
@@ -99,7 +99,7 @@ e_desk_new(E_Zone *zone, int x, int y)
return desk;
}
-EAPI E_Client *
+E_API E_Client *
e_desk_client_top_visible_get(const E_Desk *desk)
{
E_Client *ec;
@@ -112,7 +112,7 @@ e_desk_client_top_visible_get(const E_Desk *desk)
return NULL;
}
-EAPI void
+E_API void
e_desk_name_set(E_Desk *desk, const char *name)
{
E_Event_Desk_Name_Change *ev;
@@ -129,7 +129,7 @@ e_desk_name_set(E_Desk *desk, const char *name)
_e_desk_event_desk_name_change_free, NULL);
}
-EAPI void
+E_API void
e_desk_name_add(int zone, int desk_x, int desk_y, const char *name)
{
E_Config_Desktop_Name *cfname;
@@ -145,7 +145,7 @@ e_desk_name_add(int zone, int desk_x, int desk_y, const char *name)
e_config->desktop_names = eina_list_append(e_config->desktop_names, cfname);
}
-EAPI void
+E_API void
e_desk_name_del(int zone, int desk_x, int desk_y)
{
Eina_List *l = NULL;
@@ -165,7 +165,7 @@ e_desk_name_del(int zone, int desk_x, int desk_y)
}
}
-EAPI void
+E_API void
e_desk_name_update(void)
{
const Eina_List *z, *l;
@@ -207,7 +207,7 @@ e_desk_name_update(void)
}
}
-EAPI void
+E_API void
e_desk_show(E_Desk *desk)
{
E_Event_Desk_Show *ev;
@@ -319,7 +319,7 @@ e_desk_show(E_Desk *desk)
e_zone_edge_flip_eval(desk->zone);
}
-EAPI void
+E_API void
e_desk_deskshow(E_Zone *zone)
{
E_Client *ec;
@@ -370,7 +370,7 @@ e_desk_deskshow(E_Zone *zone)
_e_desk_event_desk_deskshow_free, NULL);
}
-EAPI E_Client *
+E_API E_Client *
e_desk_last_focused_focus(E_Desk *desk)
{
Eina_List *l = NULL;
@@ -414,31 +414,31 @@ e_desk_last_focused_focus(E_Desk *desk)
return NULL;
}
-EAPI void
+E_API void
e_desk_row_add(E_Zone *zone)
{
e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count + 1);
}
-EAPI void
+E_API void
e_desk_row_remove(E_Zone *zone)
{
e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count - 1);
}
-EAPI void
+E_API void
e_desk_col_add(E_Zone *zone)
{
e_zone_desk_count_set(zone, zone->desk_x_count + 1, zone->desk_y_count);
}
-EAPI void
+E_API void
e_desk_col_remove(E_Zone *zone)
{
e_zone_desk_count_set(zone, zone->desk_x_count - 1, zone->desk_y_count);
}
-EAPI E_Desk *
+E_API E_Desk *
e_desk_current_get(E_Zone *zone)
{
E_OBJECT_CHECK_RETURN(zone, NULL);
@@ -447,7 +447,7 @@ e_desk_current_get(E_Zone *zone)
return e_desk_at_xy_get(zone, zone->desk_x_current, zone->desk_y_current);
}
-EAPI E_Desk *
+E_API E_Desk *
e_desk_at_xy_get(E_Zone *zone, int x, int y)
{
E_OBJECT_CHECK_RETURN(zone, NULL);
@@ -462,7 +462,7 @@ e_desk_at_xy_get(E_Zone *zone, int x, int y)
return zone->desks[x + (y * zone->desk_x_count)];
}
-EAPI E_Desk *
+E_API E_Desk *
e_desk_at_pos_get(E_Zone *zone, int pos)
{
int x, y;
@@ -479,7 +479,7 @@ e_desk_at_pos_get(E_Zone *zone, int pos)
return zone->desks[x + (y * zone->desk_x_count)];
}
-EAPI void
+E_API void
e_desk_xy_get(E_Desk *desk, int *x, int *y)
{
E_OBJECT_CHECK(desk);
@@ -489,7 +489,7 @@ e_desk_xy_get(E_Desk *desk, int *x, int *y)
if (y) *y = desk->y;
}
-EAPI void
+E_API void
e_desk_next(E_Zone *zone)
{
int x, y;
@@ -514,7 +514,7 @@ e_desk_next(E_Zone *zone)
e_desk_show(e_desk_at_xy_get(zone, x, y));
}
-EAPI void
+E_API void
e_desk_prev(E_Zone *zone)
{
int x, y;
@@ -538,7 +538,7 @@ e_desk_prev(E_Zone *zone)
e_desk_show(e_desk_at_xy_get(zone, x, y));
}
-EAPI void
+E_API void
e_desk_window_profile_set(E_Desk *desk,
const char *profile)
{
@@ -556,7 +556,7 @@ e_desk_window_profile_set(E_Desk *desk,
_e_desk_event_desk_window_profile_change_free, NULL);
}
-EAPI void
+E_API void
e_desk_window_profile_add(int zone,
int desk_x,
int desk_y,
@@ -574,7 +574,7 @@ e_desk_window_profile_add(int zone,
e_config->desktop_window_profiles = eina_list_append(e_config->desktop_window_profiles, cfprof);
}
-EAPI void
+E_API void
e_desk_window_profile_del(int zone,
int desk_x,
int desk_y)
@@ -597,7 +597,7 @@ e_desk_window_profile_del(int zone,
}
}
-EAPI void
+E_API void
e_desk_window_profile_update(void)
{
const Eina_List *z, *l;
@@ -641,14 +641,14 @@ e_desk_window_profile_update(void)
}
}
-EAPI void
+E_API void
e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data)
{
_e_desk_flip_cb = cb;
_e_desk_flip_data = (void*)data;
}
-EAPI void
+E_API void
e_desk_flip_end(E_Desk *desk)
{
E_Event_Desk_After_Show *ev;
@@ -694,7 +694,7 @@ e_desk_flip_end(E_Desk *desk)
}
}
-EAPI unsigned int
+E_API unsigned int
e_desks_count(void)
{
Eina_List *l;
diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 3879f9471..b68309732 100644
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -66,41 +66,41 @@ struct _E_Event_Desk_Window_Profile_Change
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 zone, int desk_x, int desk_y, const char *name);
-EAPI void e_desk_name_del(int zone, int desk_x, int desk_y);
-EAPI void e_desk_name_update(void);
-EAPI void e_desk_show(E_Desk *desk);
-EAPI void e_desk_deskshow(E_Zone *zone);
-EAPI E_Client *e_desk_last_focused_focus(E_Desk *desk);
-EAPI E_Client *e_desk_client_top_visible_get(const E_Desk *desk);
-EAPI E_Desk *e_desk_current_get(E_Zone *zone);
-EAPI E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y);
-EAPI E_Desk *e_desk_at_pos_get(E_Zone *zone, int pos);
-EAPI void e_desk_xy_get(E_Desk *desk, int *x, int *y);
-EAPI void e_desk_next(E_Zone *zone);
-EAPI void e_desk_prev(E_Zone *zone);
-EAPI void e_desk_row_add(E_Zone *zone);
-EAPI void e_desk_row_remove(E_Zone *zone);
-EAPI void e_desk_col_add(E_Zone *zone);
-EAPI void e_desk_col_remove(E_Zone *zone);
-EAPI void e_desk_window_profile_set(E_Desk *desk, const char *profile);
-EAPI void e_desk_window_profile_add(int zone, int desk_x, int desk_y, const char *profile);
-EAPI void e_desk_window_profile_del(int zone, int desk_x, int desk_y);
-EAPI void e_desk_window_profile_update(void);
-
-EAPI void e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data);
-EAPI void e_desk_flip_end(E_Desk *desk);
-
-EAPI unsigned int e_desks_count(void);
-
-extern EAPI int E_EVENT_DESK_SHOW;
-extern EAPI int E_EVENT_DESK_BEFORE_SHOW;
-extern EAPI int E_EVENT_DESK_AFTER_SHOW;
-extern EAPI int E_EVENT_DESK_DESKSHOW;
-extern EAPI int E_EVENT_DESK_NAME_CHANGE;
-extern EAPI int E_EVENT_DESK_WINDOW_PROFILE_CHANGE;
+E_API E_Desk *e_desk_new(E_Zone *zone, int x, int y);
+E_API void e_desk_name_set(E_Desk *desk, const char *name);
+E_API void e_desk_name_add(int zone, int desk_x, int desk_y, const char *name);
+E_API void e_desk_name_del(int zone, int desk_x, int desk_y);
+E_API void e_desk_name_update(void);
+E_API void e_desk_show(E_Desk *desk);
+E_API void e_desk_deskshow(E_Zone *zone);
+E_API E_Client *e_desk_last_focused_focus(E_Desk *desk);
+E_API E_Client *e_desk_client_top_visible_get(const E_Desk *desk);
+E_API E_Desk *e_desk_current_get(E_Zone *zone);
+E_API E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y);
+E_API E_Desk *e_desk_at_pos_get(E_Zone *zone, int pos);
+E_API void e_desk_xy_get(E_Desk *desk, int *x, int *y);
+E_API void e_desk_next(E_Zone *zone);
+E_API void e_desk_prev(E_Zone *zone);
+E_API void e_desk_row_add(E_Zone *zone);
+E_API void e_desk_row_remove(E_Zone *zone);
+E_API void e_desk_col_add(E_Zone *zone);
+E_API void e_desk_col_remove(E_Zone *zone);
+E_API void e_desk_window_profile_set(E_Desk *desk, const char *profile);
+E_API void e_desk_window_profile_add(int zone, int desk_x, int desk_y, const char *profile);
+E_API void e_desk_window_profile_del(int zone, int desk_x, int desk_y);
+E_API void e_desk_window_profile_update(void);
+
+E_API void e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data);
+E_API void e_desk_flip_end(E_Desk *desk);
+
+E_API unsigned int e_desks_count(void);
+
+extern E_API int E_EVENT_DESK_SHOW;
+extern E_API int E_EVENT_DESK_BEFORE_SHOW;
+extern E_API int E_EVENT_DESK_AFTER_SHOW;
+extern E_API int E_EVENT_DESK_DESKSHOW;
+extern E_API int E_EVENT_DESK_NAME_CHANGE;
+extern E_API int E_EVENT_DESK_WINDOW_PROFILE_CHANGE;
#endif
#endif
diff --git a/src/bin/e_deskenv.c b/src/bin/e_deskenv.c
index bcf8767f4..c8844714f 100644
--- a/src/bin/e_deskenv.c
+++ b/src/bin/e_deskenv.c
@@ -48,7 +48,7 @@ e_deskenv_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_deskenv_xmodmap_run(void)
{
#ifndef HAVE_WAYLAND_ONLY
diff --git a/src/bin/e_deskenv.h b/src/bin/e_deskenv.h
index bbab0f492..0bfc81e76 100644
--- a/src/bin/e_deskenv.h
+++ b/src/bin/e_deskenv.h
@@ -5,6 +5,6 @@
EINTERN int e_deskenv_init(void);
EINTERN int e_deskenv_shutdown(void);
-EAPI void e_deskenv_xmodmap_run(void);
+E_API void e_deskenv_xmodmap_run(void);
#endif
#endif
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 73b72207f..6132b0b3a 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -41,7 +41,7 @@ static Eina_Bool _e_desklock_state = EINA_FALSE;
static void _e_desklock_ask_presentation_mode(void);
-EAPI int E_EVENT_DESKLOCK = 0;
+E_API int E_EVENT_DESKLOCK = 0;
EINTERN int
e_desklock_init(void)
@@ -95,7 +95,7 @@ e_desklock_shutdown(void)
return 1;
}
-EAPI Eina_Stringshare *
+E_API Eina_Stringshare *
e_desklock_user_wallpaper_get(E_Zone *zone)
{
const E_Config_Desktop_Background *cdbg;
@@ -117,7 +117,7 @@ e_desklock_user_wallpaper_get(E_Zone *zone)
return e_theme_edje_file_get("base/theme/desklock", "e/desklock/background");
}
-EAPI void
+E_API void
e_desklock_interface_append(E_Desklock_Interface *iface)
{
EINA_SAFETY_ON_NULL_RETURN(iface);
@@ -139,7 +139,7 @@ e_desklock_interface_append(E_Desklock_Interface *iface)
}
}
-EAPI void
+E_API void
e_desklock_interface_remove(E_Desklock_Interface *iface)
{
E_Desklock_Interface *diface;
@@ -168,35 +168,35 @@ e_desklock_interface_remove(E_Desklock_Interface *iface)
*/
}
-EAPI void
+E_API void
e_desklock_show_hook_add(E_Desklock_Show_Cb cb)
{
EINA_SAFETY_ON_NULL_RETURN(cb);
show_hooks = eina_list_append(show_hooks, cb);
}
-EAPI void
+E_API void
e_desklock_show_hook_del(E_Desklock_Show_Cb cb)
{
EINA_SAFETY_ON_NULL_RETURN(cb);
show_hooks = eina_list_remove(show_hooks, cb);
}
-EAPI void
+E_API void
e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb)
{
EINA_SAFETY_ON_NULL_RETURN(cb);
hide_hooks = eina_list_append(hide_hooks, cb);
}
-EAPI void
+E_API void
e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb)
{
EINA_SAFETY_ON_NULL_RETURN(cb);
hide_hooks = eina_list_remove(hide_hooks, cb);
}
-EAPI int
+E_API int
e_desklock_show_autolocked(void)
{
if (_e_desklock_autolock_time < 1.0)
@@ -204,7 +204,7 @@ e_desklock_show_autolocked(void)
return e_desklock_show(EINA_FALSE);
}
-EAPI int
+E_API int
e_desklock_show(Eina_Bool suspend)
{
const Eina_List *l;
@@ -323,7 +323,7 @@ fail:
return 0;
}
-EAPI void
+E_API void
e_desklock_hide(void)
{
Eina_List *l;
@@ -389,7 +389,7 @@ e_desklock_hide(void)
e_util_env_set("E_DESKLOCK_UNLOCKED", "happened");
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_desklock_state_get(void)
{
return _e_desklock_state;
diff --git a/src/bin/e_desklock.h b/src/bin/e_desklock.h
index 55257aa33..5dfeaefc3 100644
--- a/src/bin/e_desklock.h
+++ b/src/bin/e_desklock.h
@@ -42,20 +42,20 @@ struct _E_Event_Desklock
EINTERN int e_desklock_init(void);
EINTERN int e_desklock_shutdown(void);
-EAPI int e_desklock_show(Eina_Bool suspend);
-EAPI int e_desklock_show_autolocked(void);
-EAPI void e_desklock_hide(void);
-EAPI Eina_Bool e_desklock_state_get(void);
+E_API int e_desklock_show(Eina_Bool suspend);
+E_API int e_desklock_show_autolocked(void);
+E_API void e_desklock_hide(void);
+E_API Eina_Bool e_desklock_state_get(void);
-EAPI void e_desklock_interface_append(E_Desklock_Interface *iface);
-EAPI void e_desklock_interface_remove(E_Desklock_Interface *iface);
-EAPI Eina_Stringshare *e_desklock_user_wallpaper_get(E_Zone *zone);
-EAPI void e_desklock_show_hook_add(E_Desklock_Show_Cb cb);
-EAPI void e_desklock_show_hook_del(E_Desklock_Show_Cb cb);
-EAPI void e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb);
-EAPI void e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb);
+E_API void e_desklock_interface_append(E_Desklock_Interface *iface);
+E_API void e_desklock_interface_remove(E_Desklock_Interface *iface);
+E_API Eina_Stringshare *e_desklock_user_wallpaper_get(E_Zone *zone);
+E_API void e_desklock_show_hook_add(E_Desklock_Show_Cb cb);
+E_API void e_desklock_show_hook_del(E_Desklock_Show_Cb cb);
+E_API void e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb);
+E_API void e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb);
-extern EAPI int E_EVENT_DESKLOCK;
+extern E_API int E_EVENT_DESKLOCK;
static inline Eina_Bool
e_desklock_is_external(void)
diff --git a/src/bin/e_deskmirror.c b/src/bin/e_deskmirror.c
index 72a2e20a2..617f71916 100644
--- a/src/bin/e_deskmirror.c
+++ b/src/bin/e_deskmirror.c
@@ -678,7 +678,7 @@ _client_property(E_Smart_Data *sd, int type EINA_UNUSED, E_Event_Client_Property
}
/* externally accessible functions */
-EAPI Evas_Object *
+E_API Evas_Object *
e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar)
{
E_Smart_Data *sd;
@@ -726,7 +726,7 @@ e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar)
return o;
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object)
{
Mirror *m;
@@ -738,7 +738,7 @@ e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object)
return m ? m->mirror : NULL;
}
-EAPI Eina_List *
+E_API Eina_List *
e_deskmirror_mirror_list(Evas_Object *deskmirror)
{
Eina_List *l = NULL;
@@ -762,7 +762,7 @@ _mirror_copy_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_
evas_object_smart_callback_del_full(data, "shadow_change", _mirror_client_shadow_change, obj);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_deskmirror_mirror_copy(Evas_Object *obj)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
@@ -798,7 +798,7 @@ e_deskmirror_mirror_copy(Evas_Object *obj)
return NULL;
}
-EAPI void
+E_API void
e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy)
{
API_ENTRY(obj);
@@ -806,7 +806,7 @@ e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord
e_layout_coord_canvas_to_virtual(sd->layout, cx, cy, vx, vy);
}
-EAPI void
+E_API void
e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy)
{
API_ENTRY(obj);
@@ -814,14 +814,14 @@ e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord
e_layout_coord_virtual_to_canvas(sd->layout, vx, vy, cx, cy);
}
-EAPI E_Desk *
+E_API E_Desk *
e_deskmirror_desk_get(Evas_Object *obj)
{
API_ENTRY(obj) NULL;
return sd->desk;
}
-EAPI void
+E_API void
e_deskmirror_util_wins_print(Evas_Object *obj)
{
E_Smart_Data *sd;
diff --git a/src/bin/e_deskmirror.h b/src/bin/e_deskmirror.h
index a3db64d89..a9a137b45 100644
--- a/src/bin/e_deskmirror.h
+++ b/src/bin/e_deskmirror.h
@@ -1,14 +1,14 @@
#ifndef E_WIDGET_DESKMIRROR_H
#define E_WIDGET_DESKMIRROR_H
-EAPI Evas_Object *e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar);
-EAPI Evas_Object *e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object);
-EAPI Eina_List *e_deskmirror_mirror_list(Evas_Object *deskmirror);
-EAPI Evas_Object *e_deskmirror_mirror_copy(Evas_Object *obj);
-EAPI void e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy);
-EAPI void e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy);
-EAPI E_Desk *e_deskmirror_desk_get(Evas_Object *obj);
-EAPI void e_deskmirror_util_wins_print(Evas_Object *obj);
+E_API Evas_Object *e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar);
+E_API Evas_Object *e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object);
+E_API Eina_List *e_deskmirror_mirror_list(Evas_Object *deskmirror);
+E_API Evas_Object *e_deskmirror_mirror_copy(Evas_Object *obj);
+E_API void e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy);
+E_API void e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy);
+E_API E_Desk *e_deskmirror_desk_get(Evas_Object *obj);
+E_API void e_deskmirror_util_wins_print(Evas_Object *obj);
//#define DESKMIRROR_TEST
#endif
diff --git a/src/bin/e_desktop_editor.c b/src/bin/e_desktop_editor.c
index 8a01647b4..a759f1826 100644
--- a/src/bin/e_desktop_editor.c
+++ b/src/bin/e_desktop_editor.c
@@ -95,7 +95,7 @@ _e_util_icon_save(Ecore_X_Icon *icon, const char *filename)
}
/* externally accessible functions */
-EAPI Efreet_Desktop *
+E_API Efreet_Desktop *
e_desktop_client_create(E_Client *ec)
{
Efreet_Desktop *desktop = NULL;
@@ -183,7 +183,7 @@ e_desktop_client_create(E_Client *ec)
return desktop;
}
-EAPI E_Desktop_Edit *
+E_API E_Desktop_Edit *
e_desktop_client_edit(E_Client *ec)
{
E_Desktop_Edit *editor;
@@ -228,7 +228,7 @@ e_desktop_client_edit(E_Client *ec)
return editor;
}
-EAPI E_Desktop_Edit *
+E_API E_Desktop_Edit *
e_desktop_edit(Efreet_Desktop *desktop)
{
E_Desktop_Edit *editor;
diff --git a/src/bin/e_desktop_editor.h b/src/bin/e_desktop_editor.h
index b887a1161..87edfccea 100644
--- a/src/bin/e_desktop_editor.h
+++ b/src/bin/e_desktop_editor.h
@@ -32,9 +32,9 @@ struct _E_Desktop_Edit
E_Config_Dialog *cfd;
};
-EAPI Efreet_Desktop *e_desktop_client_create(E_Client *ec);
-EAPI E_Desktop_Edit *e_desktop_client_edit(E_Client *ec);
-EAPI E_Desktop_Edit *e_desktop_edit(Efreet_Desktop *desktop);
+E_API Efreet_Desktop *e_desktop_client_create(E_Client *ec);
+E_API E_Desktop_Edit *e_desktop_client_edit(E_Client *ec);
+E_API E_Desktop_Edit *e_desktop_edit(Efreet_Desktop *desktop);
#endif
#endif
diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c
index c9295c7c3..2b0435b92 100644
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@@ -77,19 +77,19 @@ _e_dialog_internal_new(Evas_Object *parent, const char *name, const char *class,
return dia;
}
-EAPI E_Dialog *
+E_API E_Dialog *
e_dialog_new(Evas_Object *parent, const char *name, const char *class)
{
return _e_dialog_internal_new(parent, name, class, 1);
}
-EAPI E_Dialog *
+E_API E_Dialog *
e_dialog_normal_win_new(Evas_Object *parent, const char *name, const char *class)
{
return _e_dialog_internal_new(parent, name, class, 0);
}
-EAPI void
+E_API void
e_dialog_button_add(E_Dialog *dia, const char *label, const char *icon, E_Dialog_Cb func, void *data)
{
Evas_Object *o;
@@ -100,7 +100,7 @@ e_dialog_button_add(E_Dialog *dia, const char *label, const char *icon, E_Dialog
dia->buttons = eina_list_append(dia->buttons, o);
}
-EAPI int
+E_API int
e_dialog_button_focus_num(E_Dialog *dia, int button)
{
Evas_Object *o;
@@ -110,7 +110,7 @@ e_dialog_button_focus_num(E_Dialog *dia, int button)
return 1;
}
-EAPI int
+E_API int
e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled)
{
Evas_Object *o;
@@ -120,7 +120,7 @@ e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled)
return 1;
}
-EAPI int
+E_API int
e_dialog_button_disable_num_get(E_Dialog *dia, int button)
{
Evas_Object *o;
@@ -131,13 +131,13 @@ e_dialog_button_disable_num_get(E_Dialog *dia, int button)
return ret;
}
-EAPI void
+E_API void
e_dialog_title_set(E_Dialog *dia, const char *title)
{
elm_win_title_set(dia->win, title);
}
-EAPI void
+E_API void
e_dialog_text_set(E_Dialog *dia, const char *text)
{
if (!dia->text_object)
@@ -154,7 +154,7 @@ e_dialog_text_set(E_Dialog *dia, const char *text)
elm_object_part_text_set(dia->text_object, "e.textblock.message", text);
}
-EAPI void
+E_API void
e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
{
if (!icon)
@@ -188,7 +188,7 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
edje_object_message_signal_process(elm_layout_edje_get(dia->bg_object));
}
-EAPI void
+E_API void
e_dialog_border_icon_set(E_Dialog *dia, const char *icon)
{
E_Client *ec;
@@ -198,7 +198,7 @@ e_dialog_border_icon_set(E_Dialog *dia, const char *icon)
eina_stringshare_replace(&ec->internal_icon, icon);
}
-EAPI void
+E_API void
e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
{
int mw, mh;
@@ -215,7 +215,7 @@ e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coor
evas_object_show(obj);
}
-EAPI void
+E_API void
e_dialog_resizable_set(E_Dialog *dia, int resizable)
{
dia->resizable = resizable;
@@ -238,7 +238,7 @@ e_dialog_resizable_set(E_Dialog *dia, int resizable)
}
}
-EAPI void
+E_API void
e_dialog_show(E_Dialog *dia)
{
Evas_Coord mw, mh;
diff --git a/src/bin/e_dialog.h b/src/bin/e_dialog.h
index acfddd0f5..426abb07f 100644
--- a/src/bin/e_dialog.h
+++ b/src/bin/e_dialog.h
@@ -28,19 +28,19 @@ struct _E_Dialog
typedef void (*E_Dialog_Cb)(void *data, E_Dialog *dia);
-EAPI E_Dialog *e_dialog_new (Evas_Object *parent, const char *name, const char *class);
-EAPI E_Dialog *e_dialog_normal_win_new (Evas_Object *parent, const char *name, const char *class);
-EAPI void e_dialog_button_add (E_Dialog *dia, const char *label, const char *icon, E_Dialog_Cb func, void *data);
-EAPI int e_dialog_button_focus_num (E_Dialog *dia, int button);
-EAPI int e_dialog_button_disable_num_set (E_Dialog *dia, int button, int disabled);
-EAPI int e_dialog_button_disable_num_get (E_Dialog *dia, int button);
-EAPI void e_dialog_title_set (E_Dialog *dia, const char *title);
-EAPI void e_dialog_text_set (E_Dialog *dia, const char *text);
-EAPI void e_dialog_icon_set (E_Dialog *dia, const char *icon, Evas_Coord size);
-EAPI void e_dialog_border_icon_set (E_Dialog *dia, const char *icon);
-EAPI void e_dialog_content_set (E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
-EAPI void e_dialog_resizable_set (E_Dialog *dia, int resizable);
-EAPI void e_dialog_show (E_Dialog *dia);
+E_API E_Dialog *e_dialog_new (Evas_Object *parent, const char *name, const char *class);
+E_API E_Dialog *e_dialog_normal_win_new (Evas_Object *parent, const char *name, const char *class);
+E_API void e_dialog_button_add (E_Dialog *dia, const char *label, const char *icon, E_Dialog_Cb func, void *data);
+E_API int e_dialog_button_focus_num (E_Dialog *dia, int button);
+E_API int e_dialog_button_disable_num_set (E_Dialog *dia, int button, int disabled);
+E_API int e_dialog_button_disable_num_get (E_Dialog *dia, int button);
+E_API void e_dialog_title_set (E_Dialog *dia, const char *title);
+E_API void e_dialog_text_set (E_Dialog *dia, const char *text);
+E_API void e_dialog_icon_set (E_Dialog *dia, const char *icon, Evas_Coord size);
+E_API void e_dialog_border_icon_set (E_Dialog *dia, const char *icon);
+E_API void e_dialog_content_set (E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
+E_API void e_dialog_resizable_set (E_Dialog *dia, int resizable);
+E_API void e_dialog_show (E_Dialog *dia);
#endif
#endif
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 1e9455243..eb1dcac4e 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -164,13 +164,13 @@ e_dnd_shutdown(void)
return 1;
}
-EAPI E_Drag *
+E_API E_Drag *
e_drag_current_get(void)
{
return _drag_current;
}
-EAPI E_Drag *
+E_API E_Drag *
e_drag_new(int x, int y,
const char **types, unsigned int num_types,
void *data, int size,
@@ -218,13 +218,13 @@ e_drag_new(int x, int y,
return drag;
}
-EAPI Evas *
+E_API Evas *
e_drag_evas_get(const E_Drag *drag)
{
return drag->evas;
}
-EAPI void
+E_API void
e_drag_object_set(E_Drag *drag, Evas_Object *object)
{
EINA_SAFETY_ON_NULL_RETURN(object);
@@ -240,7 +240,7 @@ e_drag_object_set(E_Drag *drag, Evas_Object *object)
evas_object_pass_events_set(drag->comp_object, 1);
}
-EAPI void
+E_API void
e_drag_move(E_Drag *drag, int x, int y)
{
if ((drag->x == x) && (drag->y == y)) return;
@@ -250,7 +250,7 @@ e_drag_move(E_Drag *drag, int x, int y)
evas_object_move(drag->comp_object, x, y);
}
-EAPI void
+E_API void
e_drag_resize(E_Drag *drag, int w, int h)
{
if ((drag->w == w) && (drag->h == h)) return;
@@ -260,13 +260,13 @@ e_drag_resize(E_Drag *drag, int w, int h)
evas_object_resize(drag->comp_object, w, h);
}
-EAPI int
+E_API int
e_dnd_active(void)
{
return _drag_win != 0;
}
-EAPI int
+E_API int
e_drag_start(E_Drag *drag, int x, int y)
{
const Eina_List *l;
@@ -324,7 +324,7 @@ e_drag_start(E_Drag *drag, int x, int y)
return 1;
}
-EAPI int
+E_API int
e_drag_xdnd_start(E_Drag *drag, int x, int y)
{
#ifndef HAVE_WAYLAND_ONLY
@@ -394,14 +394,14 @@ e_drag_xdnd_start(E_Drag *drag, int x, int y)
return 1;
}
-EAPI void
+E_API void
e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type))
{
handler->cb.xds = cb;
}
/* should only be used for windows */
-EAPI void
+E_API void
e_drop_xds_update(Eina_Bool enable, const char *value)
{
#ifndef HAVE_WAYLAND_ONLY
@@ -438,7 +438,7 @@ e_drop_xds_update(Eina_Bool enable, const char *value)
#endif
}
-EAPI E_Drop_Handler *
+E_API E_Drop_Handler *
e_drop_handler_add(E_Object *obj, Evas_Object *win,
void *data,
void (*enter_cb)(void *data, const char *type, void *event),
@@ -475,7 +475,7 @@ e_drop_handler_add(E_Object *obj, Evas_Object *win,
return handler;
}
-EAPI void
+E_API void
e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h)
{
handler->x = x;
@@ -484,7 +484,7 @@ e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h)
handler->h = h;
}
-EAPI int
+E_API int
e_drop_inside(const E_Drop_Handler *handler, int x, int y)
{
int dx, dy;
@@ -495,7 +495,7 @@ e_drop_inside(const E_Drop_Handler *handler, int x, int y)
return E_INSIDE(x, y, handler->x, handler->y, handler->w, handler->h);
}
-EAPI void
+E_API void
e_drop_handler_del(E_Drop_Handler *handler)
{
unsigned int i;
@@ -521,7 +521,7 @@ e_drop_handler_del(E_Drop_Handler *handler)
free(handler);
}
-EAPI int
+E_API int
e_drop_xdnd_register_set(Ecore_Window win, int reg)
{
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return 0;
@@ -545,7 +545,7 @@ e_drop_xdnd_register_set(Ecore_Window win, int reg)
return 1;
}
-EAPI void
+E_API void
e_drop_handler_responsive_set(E_Drop_Handler *handler)
{
Ecore_X_Window hwin = _e_drag_win_get(handler, 1);
@@ -555,7 +555,7 @@ e_drop_handler_responsive_set(E_Drop_Handler *handler)
eina_hash_set(_drop_handlers_responsives, &hwin, eina_list_append(l, handler));
}
-EAPI int
+E_API int
e_drop_handler_responsive_get(const E_Drop_Handler *handler)
{
Ecore_X_Window hwin = _e_drag_win_get(handler, 1);
@@ -565,32 +565,32 @@ e_drop_handler_responsive_get(const E_Drop_Handler *handler)
return l && eina_list_data_find(l, handler);
}
-EAPI void
+E_API void
e_drop_handler_action_set(unsigned int action)
{
_action = action;
}
-EAPI unsigned int
+E_API unsigned int
e_drop_handler_action_get(void)
{
return _action;
}
-EAPI void
+E_API void
e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e))
{
drag->cb.key_down = func;
}
-EAPI void
+E_API void
e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e))
{
drag->cb.key_up = func;
}
/* from ecore_x_selection.c */
-EAPI Eina_List *
+E_API Eina_List *
e_dnd_util_text_uri_list_convert(char *data, int size)
{
char *tmp;
diff --git a/src/bin/e_dnd.h b/src/bin/e_dnd.h
index d03791de3..3baa9b041 100644
--- a/src/bin/e_dnd.h
+++ b/src/bin/e_dnd.h
@@ -111,29 +111,29 @@ struct E_Dnd_X_Moz_Url
EINTERN int e_dnd_init(void);
EINTERN int e_dnd_shutdown(void);
-EAPI int e_dnd_active(void);
+E_API int e_dnd_active(void);
-EAPI E_Drag *e_drag_current_get(void);
+E_API E_Drag *e_drag_current_get(void);
/* x and y are the top left coords of the object that is to be dragged */
-EAPI E_Drag *e_drag_new(int x, int y,
+E_API E_Drag *e_drag_new(int x, int y,
const char **types, unsigned int num_types,
void *data, int size,
void *(*convert_cb)(E_Drag * drag, const char *type),
void (*finished_cb)(E_Drag *drag, int dropped));
-EAPI Evas *e_drag_evas_get(const E_Drag *drag);
-EAPI void e_drag_object_set(E_Drag *drag, Evas_Object *object);
-EAPI void e_drag_move(E_Drag *drag, int x, int y);
-EAPI void e_drag_resize(E_Drag *drag, int w, int h);
-EAPI void e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e));
-EAPI void e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e));
+E_API Evas *e_drag_evas_get(const E_Drag *drag);
+E_API void e_drag_object_set(E_Drag *drag, Evas_Object *object);
+E_API void e_drag_move(E_Drag *drag, int x, int y);
+E_API void e_drag_resize(E_Drag *drag, int w, int h);
+E_API void e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e));
+E_API void e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e));
/* x and y are the coords where the mouse is when dragging starts */
-EAPI int e_drag_start(E_Drag *drag, int x, int y);
-EAPI int e_drag_xdnd_start(E_Drag *drag, int x, int y);
+E_API int e_drag_start(E_Drag *drag, int x, int y);
+E_API int e_drag_xdnd_start(E_Drag *drag, int x, int y);
-EAPI void e_drop_xds_update(Eina_Bool enable, const char *value);
-EAPI void e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type));
-EAPI E_Drop_Handler *e_drop_handler_add(E_Object *obj, Evas_Object *win,
+E_API void e_drop_xds_update(Eina_Bool enable, const char *value);
+E_API void e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type));
+E_API E_Drop_Handler *e_drop_handler_add(E_Object *obj, Evas_Object *win,
void *data,
void (*enter_cb)(void *data, const char *type, void *event),
void (*move_cb)(void *data, const char *type, void *event),
@@ -141,15 +141,15 @@ EAPI E_Drop_Handler *e_drop_handler_add(E_Object *obj, Evas_Object *win,
void (*drop_cb)(void *data, const char *type, void *event),
const char **types, unsigned int num_types,
int x, int y, int w, int h);
-EAPI void e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h);
-EAPI int e_drop_inside(const E_Drop_Handler *handler, int x, int y);
-EAPI void e_drop_handler_del(E_Drop_Handler *handler);
-EAPI int e_drop_xdnd_register_set(Ecore_Window win, int reg);
-EAPI void e_drop_handler_responsive_set(E_Drop_Handler *handler);
-EAPI int e_drop_handler_responsive_get(const E_Drop_Handler *handler);
-EAPI void e_drop_handler_action_set(unsigned int action);
-EAPI unsigned int e_drop_handler_action_get(void);
-EAPI Eina_List *e_dnd_util_text_uri_list_convert(char *data, int size);
+E_API void e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h);
+E_API int e_drop_inside(const E_Drop_Handler *handler, int x, int y);
+E_API void e_drop_handler_del(E_Drop_Handler *handler);
+E_API int e_drop_xdnd_register_set(Ecore_Window win, int reg);
+E_API void e_drop_handler_responsive_set(E_Drop_Handler *handler);
+E_API int e_drop_handler_responsive_get(const E_Drop_Handler *handler);
+E_API void e_drop_handler_action_set(unsigned int action);
+E_API unsigned int e_drop_handler_action_get(void);
+E_API Eina_List *e_dnd_util_text_uri_list_convert(char *data, int size);
static inline void
diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c
index fde8e4f2b..5678e74ef 100644
--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@@ -14,7 +14,7 @@ static unsigned int _e_dpms_timeout_suspend = 0;
static unsigned int _e_dpms_timeout_off = 0;
static int _e_dpms_enabled = EINA_FALSE;
-EAPI void
+E_API void
e_dpms_update(void)
{
unsigned int standby = 0, suspend = 0, off = 0;
@@ -65,7 +65,7 @@ e_dpms_update(void)
#endif
}
-EAPI void
+E_API void
e_dpms_force_update(void)
{
unsigned int standby = 0, suspend = 0, off = 0;
diff --git a/src/bin/e_dpms.h b/src/bin/e_dpms.h
index 80414dbc2..37ec666ba 100644
--- a/src/bin/e_dpms.h
+++ b/src/bin/e_dpms.h
@@ -6,8 +6,8 @@
EINTERN int e_dpms_init(void);
EINTERN int e_dpms_shutdown(void);
-EAPI void e_dpms_update(void);
-EAPI void e_dpms_force_update(void);
+E_API void e_dpms_update(void);
+E_API void e_dpms_force_update(void);
#endif
#endif
diff --git a/src/bin/e_entry_dialog.c b/src/bin/e_entry_dialog.c
index 4f8051fe1..259d9c096 100644
--- a/src/bin/e_entry_dialog.c
+++ b/src/bin/e_entry_dialog.c
@@ -9,7 +9,7 @@ static void _e_entry_dialog_delete(E_Dialog *dia, Evas *e EINA_UNUSED, Evas_Obje
static void _e_entry_cb_key_down(void *data, Evas_Object *obj, void *event_info);
/* Externally accesible functions */
-EAPI E_Entry_Dialog *
+E_API E_Entry_Dialog *
e_entry_dialog_show(const char *title, const char *icon, const char *text,
const char *initial_text,
const char *button_text, const char *button2_text,
diff --git a/src/bin/e_entry_dialog.h b/src/bin/e_entry_dialog.h
index 382f3f30a..9ea39fa37 100644
--- a/src/bin/e_entry_dialog.h
+++ b/src/bin/e_entry_dialog.h
@@ -25,7 +25,7 @@ struct _E_Entry_Dialog
} cancel;
};
-EAPI E_Entry_Dialog *e_entry_dialog_show(const char *title,
+E_API E_Entry_Dialog *e_entry_dialog_show(const char *title,
const char *icon,
const char *text,
const char *initial_text,
diff --git a/src/bin/e_env.c b/src/bin/e_env.c
index 719a276b7..96e5e45ad 100644
--- a/src/bin/e_env.c
+++ b/src/bin/e_env.c
@@ -32,13 +32,13 @@ e_env_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_env_set(const char *var, const char *val)
{
e_util_env_set(var, val);
}
-EAPI void
+E_API void
e_env_unset(const char *var)
{
e_util_env_set(var, NULL);
diff --git a/src/bin/e_env.h b/src/bin/e_env.h
index 0e520f50d..83bc77377 100644
--- a/src/bin/e_env.h
+++ b/src/bin/e_env.h
@@ -8,8 +8,8 @@
EINTERN int e_env_init(void);
EINTERN int e_env_shutdown(void);
-EAPI void e_env_set(const char *var, const char *val);
-EAPI void e_env_unset(const char *var);
+E_API void e_env_set(const char *var, const char *val);
+E_API void e_env_unset(const char *var);
#endif
#endif
diff --git a/src/bin/e_error.c b/src/bin/e_error.c
index cd7e5ccfd..397109bd9 100644
--- a/src/bin/e_error.c
+++ b/src/bin/e_error.c
@@ -5,7 +5,7 @@
/* local subsystem globals */
/* externally accessible functions */
-EAPI void
+E_API void
e_error_message_show_internal(char *txt)
{
/* FIXME: maybe log these to a file and display them at some point */
diff --git a/src/bin/e_error.h b/src/bin/e_error.h
index 205b7d40f..cf6d6836d 100644
--- a/src/bin/e_error.h
+++ b/src/bin/e_error.h
@@ -12,7 +12,7 @@
#ifndef E_ERROR_H
#define E_ERROR_H
-EAPI void e_error_message_show_internal(char *txt);
+E_API void e_error_message_show_internal(char *txt);
#endif
#endif
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index daababe6d..d538a0feb 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -77,9 +77,9 @@ static Ecore_Event_Handler *_e_exec_border_add_handler = NULL;
static E_Exec_Instance *(*_e_exec_executor_func)(void *data, E_Zone * zone, Efreet_Desktop * desktop, const char *exec, Eina_List *files, const char *launch_method) = NULL;
static void *_e_exec_executor_data = NULL;
-EAPI int E_EVENT_EXEC_NEW = -1;
-EAPI int E_EVENT_EXEC_NEW_CLIENT = -1;
-EAPI int E_EVENT_EXEC_DEL = -1;
+E_API int E_EVENT_EXEC_NEW = -1;
+E_API int E_EVENT_EXEC_NEW_CLIENT = -1;
+E_API int E_EVENT_EXEC_DEL = -1;
/* externally accessible functions */
EINTERN int
@@ -112,14 +112,14 @@ e_exec_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_exec_executor_set(E_Exec_Instance *(*func)(void *data, E_Zone * zone, Efreet_Desktop * desktop, const char *exec, Eina_List *files, const char *launch_method), const void *data)
{
_e_exec_executor_func = func;
_e_exec_executor_data = (void *)data;
}
-EAPI E_Exec_Instance *
+E_API E_Exec_Instance *
e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
Eina_List *files, const char *launch_method)
{
@@ -212,7 +212,7 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
return inst;
}
-EAPI void
+E_API void
e_exec_phony_del(E_Exec_Instance *inst)
{
if (!inst) return;
@@ -222,7 +222,7 @@ e_exec_phony_del(E_Exec_Instance *inst)
_e_exec_instance_free(inst);
}
-EAPI E_Exec_Instance *
+E_API E_Exec_Instance *
e_exec_phony(E_Client *ec)
{
E_Exec_Instance *inst;
@@ -288,7 +288,7 @@ e_exec_phony(E_Client *ec)
return inst;
}
-EAPI E_Exec_Instance *
+E_API E_Exec_Instance *
e_exec_startup_id_pid_instance_find(int id, pid_t pid)
{
E_Exec_Search search;
@@ -301,7 +301,7 @@ e_exec_startup_id_pid_instance_find(int id, pid_t pid)
return search.inst;
}
-EAPI Efreet_Desktop *
+E_API Efreet_Desktop *
e_exec_startup_id_pid_find(int id, pid_t pid)
{
E_Exec_Instance *inst;
@@ -311,7 +311,7 @@ e_exec_startup_id_pid_find(int id, pid_t pid)
return inst->desktop;
}
-EAPI E_Exec_Instance *
+E_API E_Exec_Instance *
e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop)
{
E_Exec_Search search;
@@ -349,14 +349,14 @@ _e_exe_instance_watchers_call(E_Exec_Instance *inst, E_Exec_Watch_Type type)
}
}
-EAPI void
+E_API void
e_exec_instance_found(E_Exec_Instance *inst)
{
E_FREE_FUNC(inst->expire_timer, ecore_timer_del);
_e_exe_instance_watchers_call(inst, E_EXEC_WATCH_STARTED);
}
-EAPI void
+E_API void
e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec)
{
e_object_ref(E_OBJECT(ec));
@@ -366,7 +366,7 @@ e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec)
ecore_event_add(E_EVENT_EXEC_NEW_CLIENT, inst, _e_exec_cb_exec_new_client_free, ec);
}
-EAPI void
+E_API void
e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func)(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data)
{
E_Exec_Watch *iw;
@@ -378,7 +378,7 @@ e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func)(void *data, E_Ex
inst->watchers = eina_list_append(inst->watchers, iw);
}
-EAPI void
+E_API void
e_exec_instance_watcher_del(E_Exec_Instance *inst, void (*func)(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data)
{
E_Exec_Watch *iw;
@@ -1233,14 +1233,14 @@ _dialog_save_cb(void *data EINA_UNUSED, void *data2)
fclose(f);
}
-EAPI const Eina_List *
+E_API const Eina_List *
e_exec_desktop_instances_find(const Efreet_Desktop *desktop)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(desktop, NULL);
return eina_hash_find(e_exec_instances, desktop->orig_path ?: desktop->name);
}
-EAPI const Eina_Hash *
+E_API const Eina_Hash *
e_exec_instances_get(void)
{
return e_exec_instances;
diff --git a/src/bin/e_exec.h b/src/bin/e_exec.h
index c76c8fff8..df59b1d0c 100644
--- a/src/bin/e_exec.h
+++ b/src/bin/e_exec.h
@@ -33,25 +33,25 @@ typedef enum
EINTERN int e_exec_init(void);
EINTERN int e_exec_shutdown(void);
-EAPI void e_exec_executor_set(E_Exec_Instance *(*func) (void *data, E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method), const void *data);
-EAPI E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method);
-EAPI E_Exec_Instance *e_exec_phony(E_Client *ec);
-EAPI void e_exec_phony_del(E_Exec_Instance *inst);
-EAPI E_Exec_Instance *e_exec_startup_id_pid_instance_find(int id, pid_t pid);
-EAPI Efreet_Desktop *e_exec_startup_id_pid_find(int startup_id, pid_t pid);
-EAPI E_Exec_Instance *e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop);
-EAPI void e_exec_instance_found(E_Exec_Instance *inst);
-EAPI void e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func) (void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data);
-EAPI void e_exec_instance_watcher_del(E_Exec_Instance *inst, void (*func) (void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data);
-EAPI const Eina_List *e_exec_desktop_instances_find(const Efreet_Desktop *desktop);
-
-EAPI const Eina_Hash *e_exec_instances_get(void);
-EAPI void e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec);
+E_API void e_exec_executor_set(E_Exec_Instance *(*func) (void *data, E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method), const void *data);
+E_API E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method);
+E_API E_Exec_Instance *e_exec_phony(E_Client *ec);
+E_API void e_exec_phony_del(E_Exec_Instance *inst);
+E_API E_Exec_Instance *e_exec_startup_id_pid_instance_find(int id, pid_t pid);
+E_API Efreet_Desktop *e_exec_startup_id_pid_find(int startup_id, pid_t pid);
+E_API E_Exec_Instance *e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop);
+E_API void e_exec_instance_found(E_Exec_Instance *inst);
+E_API void e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func) (void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data);
+E_API void e_exec_instance_watcher_del(E_Exec_Instance *inst, void (*func) (void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data);
+E_API const Eina_List *e_exec_desktop_instances_find(const Efreet_Desktop *desktop);
+
+E_API const Eina_Hash *e_exec_instances_get(void);
+E_API void e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec);
/* sends E_Exec_Instance */
-EAPI extern int E_EVENT_EXEC_NEW;
-EAPI extern int E_EVENT_EXEC_NEW_CLIENT;
-EAPI extern int E_EVENT_EXEC_DEL;
+E_API extern int E_EVENT_EXEC_NEW;
+E_API extern int E_EVENT_EXEC_NEW_CLIENT;
+E_API extern int E_EVENT_EXEC_DEL;
#endif
#endif
diff --git a/src/bin/e_exehist.c b/src/bin/e_exehist.c
index 488fd6256..ec7ef7197 100644
--- a/src/bin/e_exehist.c
+++ b/src/bin/e_exehist.c
@@ -1,7 +1,7 @@
#include "e.h"
#include <libgen.h>
-EAPI int E_EVENT_EXEHIST_UPDATE = 0;
+E_API int E_EVENT_EXEHIST_UPDATE = 0;
/* local subsystem functions */
typedef struct _E_Exehist E_Exehist;
@@ -82,7 +82,7 @@ e_exehist_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_exehist_startup_id_set(int id)
{
_e_exehist_load();
@@ -92,7 +92,7 @@ e_exehist_startup_id_set(int id)
_e_exehist_unload_queue();
}
-EAPI int
+E_API int
e_exehist_startup_id_get(void)
{
int id;
@@ -103,7 +103,7 @@ e_exehist_startup_id_get(void)
return id;
}
-EAPI void
+E_API void
e_exehist_add(const char *launch_method, const char *exe)
{
E_Exehist_Item *ei;
@@ -127,7 +127,7 @@ e_exehist_add(const char *launch_method, const char *exe)
_e_exehist_unload_queue();
}
-EAPI void
+E_API void
e_exehist_del(const char *exe)
{
E_Exehist_Item *ei;
@@ -155,7 +155,7 @@ e_exehist_del(const char *exe)
ecore_event_add(E_EVENT_EXEHIST_UPDATE, NULL, NULL, NULL);
}
-EAPI void
+E_API void
e_exehist_clear(void)
{
_e_exehist_load();
@@ -166,7 +166,7 @@ e_exehist_clear(void)
_e_exehist_unload_queue();
}
-EAPI int
+E_API int
e_exehist_popularity_get(const char *exe)
{
Eina_List *l;
@@ -188,7 +188,7 @@ e_exehist_popularity_get(const char *exe)
return count;
}
-EAPI double
+E_API double
e_exehist_newest_run_get(const char *exe)
{
Eina_List *l;
@@ -213,13 +213,13 @@ e_exehist_newest_run_get(const char *exe)
return 0.0;
}
-EAPI Eina_List *
+E_API Eina_List *
e_exehist_list_get(void)
{
return e_exehist_sorted_list_get(E_EXEHIST_SORT_BY_DATE, 0);
}
-EAPI Eina_List *
+E_API Eina_List *
e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max)
{
Eina_List *list = NULL, *pop = NULL, *l = NULL, *m;
@@ -296,7 +296,7 @@ e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max)
return list;
}
-EAPI void
+E_API void
e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
{
const char *f;
@@ -363,7 +363,7 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
_e_exehist_unload_queue();
}
-EAPI Efreet_Desktop *
+E_API Efreet_Desktop *
e_exehist_mime_desktop_get(const char *mime)
{
Efreet_Desktop *desktop;
diff --git a/src/bin/e_exehist.h b/src/bin/e_exehist.h
index 2ca9f97d6..f745f594e 100644
--- a/src/bin/e_exehist.h
+++ b/src/bin/e_exehist.h
@@ -14,19 +14,19 @@ typedef enum _E_Exehist_Sort
EINTERN int e_exehist_init(void);
EINTERN int e_exehist_shutdown(void);
-EAPI void e_exehist_startup_id_set(int id);
-EAPI int e_exehist_startup_id_get(void);
-EAPI void e_exehist_add(const char *launch_method, const char *exe);
-EAPI void e_exehist_del(const char *exe);
-EAPI void e_exehist_clear(void);
-EAPI int e_exehist_popularity_get(const char *exe);
-EAPI double e_exehist_newest_run_get(const char *exe);
-EAPI Eina_List *e_exehist_list_get(void);
-EAPI Eina_List *e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max);
-EAPI void e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop);
-EAPI Efreet_Desktop *e_exehist_mime_desktop_get(const char *mime);
+E_API void e_exehist_startup_id_set(int id);
+E_API int e_exehist_startup_id_get(void);
+E_API void e_exehist_add(const char *launch_method, const char *exe);
+E_API void e_exehist_del(const char *exe);
+E_API void e_exehist_clear(void);
+E_API int e_exehist_popularity_get(const char *exe);
+E_API double e_exehist_newest_run_get(const char *exe);
+E_API Eina_List *e_exehist_list_get(void);
+E_API Eina_List *e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max);
+E_API void e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop);
+E_API Efreet_Desktop *e_exehist_mime_desktop_get(const char *mime);
-extern EAPI int E_EVENT_EXEHIST_UPDATE;
+extern E_API int E_EVENT_EXEHIST_UPDATE;
#endif
#endif
diff --git a/src/bin/e_filereg.c b/src/bin/e_filereg.c
index 944340730..9fa43f604 100644
--- a/src/bin/e_filereg.c
+++ b/src/bin/e_filereg.c
@@ -36,7 +36,7 @@ e_filereg_shutdown(void)
return 1;
}
-EAPI int
+E_API int
e_filereg_register(const char *path)
{
Filereg_Item *fi = NULL;
@@ -55,7 +55,7 @@ e_filereg_register(const char *path)
return 1;
}
-EAPI void
+E_API void
e_filereg_deregister(const char *path)
{
Filereg_Item *fi = NULL;
@@ -73,7 +73,7 @@ e_filereg_deregister(const char *path)
}
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_filereg_file_protected(const char *path)
{
if (eina_hash_find(_e_filereg, path)) return EINA_TRUE;
diff --git a/src/bin/e_filereg.h b/src/bin/e_filereg.h
index 32ba41ca0..057e4549e 100644
--- a/src/bin/e_filereg.h
+++ b/src/bin/e_filereg.h
@@ -7,9 +7,9 @@
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);
-EAPI Eina_Bool e_filereg_file_protected(const char * path);
+E_API int e_filereg_register(const char * path);
+E_API void e_filereg_deregister(const char * path);
+E_API Eina_Bool e_filereg_file_protected(const char * path);
#endif
#endif
diff --git a/src/bin/e_flowlayout.c b/src/bin/e_flowlayout.c
index 0b576dd10..146316494 100644
--- a/src/bin/e_flowlayout.c
+++ b/src/bin/e_flowlayout.c
@@ -68,14 +68,14 @@ static void _e_flowlayout_smart_clip_unset(Evas_Object *obj);
static Evas_Smart *_e_smart = NULL;
/* externally accessible functions */
-EAPI Evas_Object *
+E_API Evas_Object *
e_flowlayout_add(Evas *evas)
{
_e_flowlayout_smart_init();
return evas_object_smart_add(evas, _e_smart);
}
-EAPI int
+E_API int
e_flowlayout_freeze(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -87,7 +87,7 @@ e_flowlayout_freeze(Evas_Object *obj)
return sd->frozen;
}
-EAPI int
+E_API int
e_flowlayout_thaw(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -100,7 +100,7 @@ e_flowlayout_thaw(Evas_Object *obj)
return sd->frozen;
}
-EAPI void
+E_API void
e_flowlayout_orientation_set(Evas_Object *obj, int horizontal)
{
E_Smart_Data *sd;
@@ -115,7 +115,7 @@ e_flowlayout_orientation_set(Evas_Object *obj, int horizontal)
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
}
-EAPI int
+E_API int
e_flowlayout_orientation_get(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -126,7 +126,7 @@ e_flowlayout_orientation_get(Evas_Object *obj)
return sd->horizontal;
}
-EAPI void
+E_API void
e_flowlayout_flowdirection_set(Evas_Object *obj, int right, int bottom)
{
E_Smart_Data *sd;
@@ -144,7 +144,7 @@ e_flowlayout_flowdirection_set(Evas_Object *obj, int right, int bottom)
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
}
-EAPI void
+E_API void
e_flowlayout_flowdirection_get(Evas_Object *obj, int *right, int *bottom)
{
E_Smart_Data *sd;
@@ -156,7 +156,7 @@ e_flowlayout_flowdirection_get(Evas_Object *obj, int *right, int *bottom)
if (bottom) *bottom = sd->flowright;
}
-EAPI void
+E_API void
e_flowlayout_homogenous_set(Evas_Object *obj, int homogenous)
{
E_Smart_Data *sd;
@@ -170,7 +170,7 @@ e_flowlayout_homogenous_set(Evas_Object *obj, int homogenous)
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
}
-EAPI int
+E_API int
e_flowlayout_homogenous_get(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -181,7 +181,7 @@ e_flowlayout_homogenous_get(Evas_Object *obj)
return sd->homogenous;
}
-EAPI void
+E_API void
e_flowlayout_fill_set(Evas_Object *obj, int fill)
{
E_Smart_Data *sd;
@@ -195,7 +195,7 @@ e_flowlayout_fill_set(Evas_Object *obj, int fill)
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
}
-EAPI int
+E_API int
e_flowlayout_fill_get(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -206,7 +206,7 @@ e_flowlayout_fill_get(Evas_Object *obj)
return sd->fill;
}
-EAPI int
+E_API int
e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child)
{
E_Smart_Data *sd;
@@ -221,7 +221,7 @@ e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child)
return 0;
}
-EAPI int
+E_API int
e_flowlayout_pack_end(Evas_Object *obj, Evas_Object *child)
{
E_Smart_Data *sd;
@@ -236,7 +236,7 @@ e_flowlayout_pack_end(Evas_Object *obj, Evas_Object *child)
return eina_list_count(sd->items) - 1;
}
-EAPI int
+E_API int
e_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before)
{
E_Smart_Data *sd;
@@ -259,7 +259,7 @@ e_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *befo
return i;
}
-EAPI int
+E_API int
e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after)
{
E_Smart_Data *sd;
@@ -282,7 +282,7 @@ e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after
return i;
}
-EAPI int
+E_API int
e_flowlayout_pack_count_get(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -293,7 +293,7 @@ e_flowlayout_pack_count_get(Evas_Object *obj)
return eina_list_count(sd->items);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_flowlayout_pack_object_nth(Evas_Object *obj, int n)
{
E_Smart_Data *sd;
@@ -304,7 +304,7 @@ e_flowlayout_pack_object_nth(Evas_Object *obj, int n)
return eina_list_nth(sd->items, n);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_flowlayout_pack_object_first(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -315,7 +315,7 @@ e_flowlayout_pack_object_first(Evas_Object *obj)
return eina_list_data_get(sd->items);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_flowlayout_pack_object_last(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -326,7 +326,7 @@ e_flowlayout_pack_object_last(Evas_Object *obj)
return eina_list_last_data_get(sd->items);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child)
{
E_Smart_Data *sd;
@@ -341,7 +341,7 @@ e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child)
return NULL;
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child)
{
E_Smart_Data *sd;
@@ -356,7 +356,7 @@ e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child)
return NULL;
}
-EAPI void
+E_API void
e_flowlayout_pack_options_set(Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h)
{
E_Flowlayout_Item *bi;
@@ -377,7 +377,7 @@ e_flowlayout_pack_options_set(Evas_Object *obj, int fill_w, int fill_h, int expa
if (bi->sd->frozen <= 0) _e_flowlayout_smart_reconfigure(bi->sd);
}
-EAPI void
+E_API void
e_flowlayout_unpack(Evas_Object *obj)
{
E_Flowlayout_Item *bi;
@@ -393,7 +393,7 @@ e_flowlayout_unpack(Evas_Object *obj)
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
}
-EAPI void
+E_API void
e_flowlayout_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{
E_Smart_Data *sd;
@@ -406,7 +406,7 @@ e_flowlayout_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
if (minh) *minh = sd->min.h;
}
-EAPI void
+E_API void
e_flowlayout_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{
E_Smart_Data *sd;
@@ -419,7 +419,7 @@ e_flowlayout_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
if (maxh) *maxh = sd->max.h;
}
-EAPI int
+E_API int
e_flowlayout_max_children(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -431,7 +431,7 @@ e_flowlayout_max_children(Evas_Object *obj)
return sd->rows * sd->cols;
}
-EAPI void
+E_API void
e_flowlayout_align_get(Evas_Object *obj, double *ax, double *ay)
{
E_Smart_Data *sd;
@@ -443,7 +443,7 @@ e_flowlayout_align_get(Evas_Object *obj, double *ax, double *ay)
if (ay) *ay = sd->align.y;
}
-EAPI void
+E_API void
e_flowlayout_align_set(Evas_Object *obj, double ax, double ay)
{
E_Smart_Data *sd;
diff --git a/src/bin/e_flowlayout.h b/src/bin/e_flowlayout.h
index a49e35b87..da898b3fa 100644
--- a/src/bin/e_flowlayout.h
+++ b/src/bin/e_flowlayout.h
@@ -3,34 +3,34 @@
#ifndef E_FLOWLAYOUT_H
#define E_FLOWLAYOUT_H
-EAPI Evas_Object *e_flowlayout_add (Evas *evas);
-EAPI int e_flowlayout_freeze (Evas_Object *obj);
-EAPI int e_flowlayout_thaw (Evas_Object *obj);
-EAPI void e_flowlayout_orientation_set (Evas_Object *obj, int horizontal);
-EAPI int e_flowlayout_orientation_get (Evas_Object *obj);
-EAPI void e_flowlayout_flowdirection_set (Evas_Object *obj, int right, int bottom);
-EAPI void e_flowlayout_flowdirection_get (Evas_Object *obj, int *right, int *bottom);
-EAPI void e_flowlayout_homogenous_set (Evas_Object *obj, int homogenous);
-EAPI int e_flowlayout_fill_get (Evas_Object *obj);
-EAPI void e_flowlayout_fill_set (Evas_Object *obj, int fill);
-EAPI int e_flowlayout_pack_start (Evas_Object *obj, Evas_Object *child);
-EAPI int e_flowlayout_pack_end (Evas_Object *obj, Evas_Object *child);
-EAPI int e_flowlayout_pack_before (Evas_Object *obj, Evas_Object *child, Evas_Object *before);
-EAPI int e_flowlayout_pack_after (Evas_Object *obj, Evas_Object *child, Evas_Object *after);
-EAPI int e_flowlayout_pack_count_get (Evas_Object *obj);
-EAPI Evas_Object *e_flowlayout_pack_object_nth (Evas_Object *obj, int n);
-EAPI Evas_Object *e_flowlayout_pack_object_first (Evas_Object *obj);
-EAPI Evas_Object *e_flowlayout_pack_object_last (Evas_Object *obj);
-EAPI Evas_Object *e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child);
-EAPI Evas_Object *e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child);
-EAPI void e_flowlayout_pack_options_set (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
-EAPI void e_flowlayout_unpack (Evas_Object *obj);
-EAPI void e_flowlayout_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-EAPI void e_flowlayout_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
-EAPI void e_flowlayout_align_get (Evas_Object *obj, double *ax, double *ay);
-EAPI void e_flowlayout_align_set (Evas_Object *obj, double ax, double ay);
+E_API Evas_Object *e_flowlayout_add (Evas *evas);
+E_API int e_flowlayout_freeze (Evas_Object *obj);
+E_API int e_flowlayout_thaw (Evas_Object *obj);
+E_API void e_flowlayout_orientation_set (Evas_Object *obj, int horizontal);
+E_API int e_flowlayout_orientation_get (Evas_Object *obj);
+E_API void e_flowlayout_flowdirection_set (Evas_Object *obj, int right, int bottom);
+E_API void e_flowlayout_flowdirection_get (Evas_Object *obj, int *right, int *bottom);
+E_API void e_flowlayout_homogenous_set (Evas_Object *obj, int homogenous);
+E_API int e_flowlayout_fill_get (Evas_Object *obj);
+E_API void e_flowlayout_fill_set (Evas_Object *obj, int fill);
+E_API int e_flowlayout_pack_start (Evas_Object *obj, Evas_Object *child);
+E_API int e_flowlayout_pack_end (Evas_Object *obj, Evas_Object *child);
+E_API int e_flowlayout_pack_before (Evas_Object *obj, Evas_Object *child, Evas_Object *before);
+E_API int e_flowlayout_pack_after (Evas_Object *obj, Evas_Object *child, Evas_Object *after);
+E_API int e_flowlayout_pack_count_get (Evas_Object *obj);
+E_API Evas_Object *e_flowlayout_pack_object_nth (Evas_Object *obj, int n);
+E_API Evas_Object *e_flowlayout_pack_object_first (Evas_Object *obj);
+E_API Evas_Object *e_flowlayout_pack_object_last (Evas_Object *obj);
+E_API Evas_Object *e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child);
+E_API Evas_Object *e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child);
+E_API void e_flowlayout_pack_options_set (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
+E_API void e_flowlayout_unpack (Evas_Object *obj);
+E_API void e_flowlayout_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+E_API void e_flowlayout_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
+E_API void e_flowlayout_align_get (Evas_Object *obj, double *ax, double *ay);
+E_API void e_flowlayout_align_set (Evas_Object *obj, double ax, double ay);
/* This function only works if homogenous is set */
-EAPI int e_flowlayout_max_children (Evas_Object *obj);
+E_API int e_flowlayout_max_children (Evas_Object *obj);
#endif
#endif
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 72dacc341..2049f1382 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -887,7 +887,7 @@ e_fm2_shutdown(void)
return 1;
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_fm2_add(Evas *evas)
{
return evas_object_smart_add(evas, _e_fm2_smart);
@@ -1021,7 +1021,7 @@ _e_fm2_thread_cleanup_cb(void *d EINA_UNUSED, Ecore_Thread *et EINA_UNUSED)
_e_fm2_favorites_thread = NULL;
}
-EAPI void
+E_API void
e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
{
const char *real_path;
@@ -1163,49 +1163,49 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
sd->tmp.iter = EINA_FALSE;
}
-EAPI void
+E_API void
e_fm2_underlay_show(Evas_Object *obj)
{
EFM_SMART_CHECK();
evas_object_show(sd->underlay);
}
-EAPI void
+E_API void
e_fm2_underlay_hide(Evas_Object *obj)
{
EFM_SMART_CHECK();
evas_object_hide(sd->underlay);
}
-EAPI void
+E_API void
e_fm2_all_unsel(Evas_Object *obj)
{
EFM_SMART_CHECK();
_e_fm2_icon_desel_any(obj);
}
-EAPI void
+E_API void
e_fm2_all_sel(Evas_Object *obj)
{
EFM_SMART_CHECK();
_e_fm2_icon_sel_any(obj);
}
-EAPI void
+E_API void
e_fm2_first_sel(Evas_Object *obj)
{
EFM_SMART_CHECK();
_e_fm2_icon_sel_first(obj, EINA_FALSE);
}
-EAPI void
+E_API void
e_fm2_last_sel(Evas_Object *obj)
{
EFM_SMART_CHECK();
_e_fm2_icon_sel_last(obj, EINA_FALSE);
}
-EAPI void
+E_API void
e_fm2_custom_theme_set(Evas_Object *obj, const char *path)
{
EFM_SMART_CHECK();
@@ -1220,7 +1220,7 @@ e_fm2_custom_theme_set(Evas_Object *obj, const char *path)
"rubberband");
}
-EAPI void
+E_API void
e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content)
{
EFM_SMART_CHECK();
@@ -1233,7 +1233,7 @@ e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content)
"overlay");
}
-EAPI void
+E_API void
e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path)
{
if (dev) *dev = NULL;
@@ -1400,7 +1400,7 @@ _e_fm2_dir_save_props(E_Fm2_Smart_Data *sd)
e_fm2_custom_file_flush();
}
-EAPI void
+E_API void
e_fm2_refresh(Evas_Object *obj)
{
EFM_SMART_CHECK();
@@ -1426,7 +1426,7 @@ e_fm2_refresh(Evas_Object *obj)
sd->tmp.iter = EINA_FALSE;
}
-EAPI int
+E_API int
e_fm2_has_parent_get(Evas_Object *obj)
{
EFM_SMART_CHECK(0);
@@ -1437,14 +1437,14 @@ e_fm2_has_parent_get(Evas_Object *obj)
return 1;
}
-EAPI const char *
+E_API const char *
e_fm2_real_path_get(Evas_Object *obj)
{
EFM_SMART_CHECK(NULL);
return sd->realpath;
}
-EAPI void
+E_API void
e_fm2_parent_go(Evas_Object *obj)
{
char *p, *path;
@@ -1462,7 +1462,7 @@ e_fm2_parent_go(Evas_Object *obj)
}
}
-EAPI void
+E_API void
e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg)
{
EFM_SMART_CHECK();
@@ -1479,14 +1479,14 @@ e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg)
sd->config->theme.icons = eina_stringshare_add(cfg->theme.icons);
}
-EAPI E_Fm2_Config *
+E_API E_Fm2_Config *
e_fm2_config_get(Evas_Object *obj)
{
EFM_SMART_CHECK(NULL);
return sd->config;
}
-EAPI Eina_List *
+E_API Eina_List *
e_fm2_selected_list_get(Evas_Object *obj)
{
Eina_List *list = NULL, *l;
@@ -1498,7 +1498,7 @@ e_fm2_selected_list_get(Evas_Object *obj)
return list;
}
-EAPI Eina_List *
+E_API Eina_List *
e_fm2_all_list_get(Evas_Object *obj)
{
Eina_List *list = NULL, *l;
@@ -1512,14 +1512,14 @@ e_fm2_all_list_get(Evas_Object *obj)
return list;
}
-EAPI void
+E_API void
e_fm2_deselect_all(Evas_Object *obj)
{
EFM_SMART_CHECK();
_e_fm2_icon_desel_any(obj);
}
-EAPI void
+E_API void
e_fm2_select_set(Evas_Object *obj, const char *file, int select_)
{
Eina_List *l;
@@ -1542,7 +1542,7 @@ e_fm2_select_set(Evas_Object *obj, const char *file, int select_)
}
}
-EAPI void
+E_API void
e_fm2_file_show(Evas_Object *obj, const char *file)
{
Eina_List *l;
@@ -1559,7 +1559,7 @@ e_fm2_file_show(Evas_Object *obj, const char *file)
}
}
-EAPI void
+E_API void
e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data)
{
EFM_SMART_CHECK();
@@ -1567,7 +1567,7 @@ e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data)
sd->icon_menu.replace.data = data;
}
-EAPI void
+E_API void
e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data)
{
EFM_SMART_CHECK();
@@ -1575,7 +1575,7 @@ e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *
sd->icon_menu.start.data = data;
}
-EAPI void
+E_API void
e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data)
{
EFM_SMART_CHECK();
@@ -1583,42 +1583,42 @@ e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *da
sd->icon_menu.end.data = data;
}
-EAPI void
+E_API void
e_fm2_icon_menu_flags_set(Evas_Object *obj, E_Fm2_Menu_Flags flags)
{
EFM_SMART_CHECK();
sd->icon_menu.flags = flags;
}
-EAPI E_Fm2_Menu_Flags
+E_API E_Fm2_Menu_Flags
e_fm2_icon_menu_flags_get(Evas_Object *obj)
{
EFM_SMART_CHECK(0);
return sd->icon_menu.flags;
}
-EAPI void
+E_API void
e_fm2_view_flags_set(Evas_Object *obj, E_Fm2_View_Flags flags)
{
EFM_SMART_CHECK();
sd->view_flags = flags;
}
-EAPI E_Fm2_View_Flags
+E_API E_Fm2_View_Flags
e_fm2_view_flags_get(Evas_Object *obj)
{
EFM_SMART_CHECK(0);
return sd->view_flags;
}
-EAPI E_Object *
+E_API E_Object *
e_fm2_window_object_get(Evas_Object *obj)
{
EFM_SMART_CHECK(NULL);
return sd->eobj;
}
-EAPI void
+E_API void
e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj)
{
const char *drop[] = {"text/uri-list", "text/x-moz-url", "XdndDirectSave0"};
@@ -1639,7 +1639,7 @@ e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj)
e_drop_handler_xds_set(sd->drop_handler, _e_fm2_cb_dnd_drop);
}
-EAPI void
+E_API void
e_fm2_window_set(Evas_Object *obj, Evas_Object *win)
{
const char *drop[] = {"text/uri-list", "text/x-moz-url", "XdndDirectSave0"};
@@ -1721,14 +1721,14 @@ _e_fm2_icons_update_helper(E_Fm2_Smart_Data *sd, Eina_Bool icon_only)
e_fm2_custom_file_flush();
}
-EAPI void
+E_API void
e_fm2_icons_update(Evas_Object *obj)
{
EFM_SMART_CHECK();
_e_fm2_icons_update_helper(sd, EINA_FALSE);
}
-EAPI void
+E_API void
e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
EFM_SMART_CHECK();
@@ -1743,7 +1743,7 @@ e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
sd->scroll_job = ecore_job_add(_e_fm2_cb_scroll_job, obj);
}
-EAPI void
+E_API void
e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
{
EFM_SMART_CHECK();
@@ -1751,7 +1751,7 @@ e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
if (y) *y = sd->pos.y;
}
-EAPI void
+E_API void
e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
{
Evas_Coord mx, my;
@@ -1764,7 +1764,7 @@ e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
if (y) *y = my;
}
-EAPI void
+E_API void
e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{
EFM_SMART_CHECK();
@@ -1772,7 +1772,7 @@ e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
if (h) *h = sd->max.h;
}
-EAPI void
+E_API void
e_fm2_all_icons_update(void)
{
Evas_Object *o;
@@ -2252,7 +2252,7 @@ _e_fm2_icon_discover_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_fun
* @param force_gen force thumbnail generation.
* @param type_ret string that identifies type of icon.
*/
-EAPI Evas_Object *
+E_API Evas_Object *
e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
Evas_Smart_Cb gen_func,
void *data, int force_gen, const char **type_ret)
@@ -2338,14 +2338,14 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
return _e_fm2_icon_explicit_theme_get(evas, ic, "text/plain", type_ret);
}
-EAPI E_Fm2_Icon_Info *
+E_API E_Fm2_Icon_Info *
e_fm2_icon_file_info_get(E_Fm2_Icon *ic)
{
if (!ic) return NULL;
return &(ic->info);
}
-EAPI void
+E_API void
e_fm2_icon_geometry_get(E_Fm2_Icon *ic, int *x, int *y, int *w, int *h)
{
int xx, yy, ww, hh;
@@ -2566,7 +2566,7 @@ _e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, i
#endif
-EAPI int
+E_API int
e_fm2_client_file_move(Evas_Object *e_fm, const char *args)
{
int id;
@@ -2577,7 +2577,7 @@ e_fm2_client_file_move(Evas_Object *e_fm, const char *args)
return id;
}
-EAPI int
+E_API int
e_fm2_client_file_copy(Evas_Object *e_fm, const char *args)
{
int id = _e_fm_client_send_new(E_FM_OP_COPY, (void *)args, strlen(args) + 1);
@@ -2585,7 +2585,7 @@ e_fm2_client_file_copy(Evas_Object *e_fm, const char *args)
return id;
}
-EAPI int
+E_API int
e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args)
{
int id = _e_fm_client_send_new(E_FM_OP_SYMLINK, (void *)args, strlen(args) + 1);
@@ -2593,7 +2593,7 @@ e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args)
return id;
}
-EAPI int
+E_API int
_e_fm2_client_mount(const char *udi, const char *mountpoint)
{
char *d;
@@ -2618,7 +2618,7 @@ _e_fm2_client_mount(const char *udi, const char *mountpoint)
return _e_fm_client_send_new(E_FM_OP_MOUNT, (void *)d, l);
}
-EAPI int
+E_API int
_e_fm2_client_unmount(const char *udi)
{
char *d;
@@ -2637,7 +2637,7 @@ _e_fm2_client_unmount(const char *udi)
return _e_fm_client_send_new(E_FM_OP_UNMOUNT, (void *)d, l);
}
-EAPI int
+E_API int
_e_fm2_client_eject(const char *udi)
{
char *data;
@@ -2691,7 +2691,7 @@ _e_fm2_client_monitor_list_end(Evas_Object *obj)
_e_fm2_live_process_begin(obj);
}
-EAPI void
+E_API void
_e_fm2_file_force_update(const char *path)
{
Evas_Object *o;
@@ -2731,7 +2731,7 @@ _e_fm2_file_force_update(const char *path)
free(dir);
}
-EAPI void
+E_API void
e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
{
Evas_Object *obj;
@@ -3237,7 +3237,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
}
}
-EAPI void
+E_API void
e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e)
{
Eina_List *l;
@@ -5154,7 +5154,7 @@ _e_fm2_icon_desktop_url_eval(const char *val)
return s;
}
-EAPI const char *
+E_API const char *
e_fm2_desktop_url_eval(const char *val)
{
return _e_fm2_icon_desktop_url_eval(val);
@@ -7789,6 +7789,7 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info EINA_UNU
_e_fm2_icon_icon_set(ic);
}
+#if 0
static void
_e_fm2_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
@@ -7797,6 +7798,7 @@ _e_fm2_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED
if (sd->iop_icon && sd->iop_icon->entry_widget)
e_widget_focus_set(sd->iop_icon->entry_widget, 1);
}
+#endif
static void
_e_fm2_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
@@ -11536,7 +11538,7 @@ _e_fm2_operation_abort_internal(E_Fm2_Op_Registry_Entry *ere)
_e_fm_client_send(E_FM_OP_ABORT, ere->id, NULL, 0);
}
-EAPI void
+E_API void
e_fm2_operation_abort(int id)
{
E_Fm2_Op_Registry_Entry *ere;
@@ -11549,7 +11551,7 @@ e_fm2_operation_abort(int id)
e_fm2_op_registry_entry_unref(ere);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w, int *h)
{
int x, y, step_w, step_h;
@@ -11587,28 +11589,28 @@ e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w,
return EINA_TRUE;
}
-EAPI E_Fm2_View_Mode
+E_API E_Fm2_View_Mode
e_fm2_view_mode_get(Evas_Object *obj)
{
EFM_SMART_CHECK(0);
return _e_fm2_view_mode_get(sd);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_fm2_typebuf_visible_get(Evas_Object *obj)
{
EFM_SMART_CHECK(EINA_FALSE);
return sd->typebuf_visible;
}
-EAPI void
+E_API void
e_fm2_typebuf_clear(Evas_Object *obj)
{
EFM_SMART_CHECK();
_e_fm2_typebuf_hide(obj);
}
-EAPI void
+E_API void
e_fm2_overlay_clip_to(Evas_Object *obj, Evas_Object *clip)
{
int x, y, w, h;
@@ -11636,13 +11638,13 @@ e_fm2_overlay_clip_to(Evas_Object *obj, Evas_Object *clip)
}
}
-EAPI const char *
+E_API const char *
e_fm2_real_path_map(const char *dev, const char *path)
{
return _e_fm2_dev_path_map(NULL, dev, path);
}
-EAPI void
+E_API void
e_fm2_favorites_init(void)
{
Eina_List *files;
@@ -11665,21 +11667,21 @@ e_fm2_favorites_init(void)
}
}
-EAPI unsigned int
+E_API unsigned int
e_fm2_selected_count(Evas_Object *obj)
{
EFM_SMART_CHECK(0);
return eina_list_count(sd->selected_icons);
}
-EAPI E_Fm2_Icon_Info *
+E_API E_Fm2_Icon_Info *
e_fm2_drop_icon_get(Evas_Object *obj)
{
EFM_SMART_CHECK(NULL);
return sd->drop_icon ? &sd->drop_icon->info : NULL;
}
-EAPI Eina_List *
+E_API Eina_List *
e_fm2_uri_path_list_get(const Eina_List *uri_list)
{
E_Fm2_Uri *uri;
@@ -11711,7 +11713,7 @@ e_fm2_uri_path_list_get(const Eina_List *uri_list)
return path_list;
}
-EAPI Efreet_Desktop *
+E_API Efreet_Desktop *
e_fm2_desktop_get(Evas_Object *obj)
{
EFM_SMART_CHECK(NULL);
@@ -11719,7 +11721,7 @@ e_fm2_desktop_get(Evas_Object *obj)
return sd->desktop;
}
-EAPI void
+E_API void
e_fm2_drop_menu(Evas_Object *obj, char *args)
{
E_Menu *menu;
@@ -11778,7 +11780,7 @@ error:
sd->menu = NULL;
}
-EAPI E_Fm2_Icon *
+E_API E_Fm2_Icon *
e_fm2_icon_editing_get(Evas_Object *obj)
{
EFM_SMART_CHECK(NULL);
diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h
index 4677eb18f..30411d23a 100644
--- a/src/bin/e_fm.h
+++ b/src/bin/e_fm.h
@@ -150,78 +150,78 @@ typedef void (*E_Fm_Cb)(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info
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);
-EAPI void e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content);
-EAPI void e_fm2_underlay_show(Evas_Object *obj);
-EAPI void e_fm2_underlay_hide(Evas_Object *obj);
-EAPI void e_fm2_all_unsel(Evas_Object *obj);
-EAPI void e_fm2_all_sel(Evas_Object *obj);
-EAPI void e_fm2_first_sel(Evas_Object *obj);
-EAPI void e_fm2_last_sel(Evas_Object *obj);
-EAPI void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path);
-EAPI void e_fm2_refresh(Evas_Object *obj);
-EAPI const char *e_fm2_real_path_get(Evas_Object *obj);
-EAPI int e_fm2_has_parent_get(Evas_Object *obj);
-EAPI void e_fm2_parent_go(Evas_Object *obj);
-EAPI void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg);
-EAPI E_Fm2_Config *e_fm2_config_get(Evas_Object *obj);
-EAPI Eina_List *e_fm2_selected_list_get(Evas_Object *obj);
-EAPI Eina_List *e_fm2_all_list_get(Evas_Object *obj);
-EAPI void e_fm2_select_set(Evas_Object *obj, const char *file, int select);
-EAPI void e_fm2_deselect_all(Evas_Object *obj);
-EAPI void e_fm2_file_show(Evas_Object *obj, const char *file);
-EAPI void e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data);
-EAPI void e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data);
-EAPI void e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data);
-EAPI void e_fm2_icon_menu_flags_set(Evas_Object *obj, E_Fm2_Menu_Flags flags);
-EAPI E_Fm2_Menu_Flags e_fm2_icon_menu_flags_get(Evas_Object *obj);
-EAPI void e_fm2_view_flags_set(Evas_Object *obj, E_Fm2_View_Flags flags);
-EAPI E_Fm2_View_Flags e_fm2_view_flags_get(Evas_Object *obj);
-EAPI E_Object *e_fm2_window_object_get(Evas_Object *obj);
-EAPI void e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj);
-EAPI void e_fm2_window_set(Evas_Object *obj, Evas_Object *win);
-EAPI void e_fm2_icons_update(Evas_Object *obj);
-
-EAPI void e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-EAPI void e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-EAPI void e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-EAPI void e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-
-EAPI void e_fm2_all_icons_update(void);
-
-EAPI void e_fm2_operation_abort(int id);
-
-EAPI Evas_Object *e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, Evas_Smart_Cb gen_func,
+E_API Evas_Object *e_fm2_add(Evas *evas);
+E_API void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path);
+E_API void e_fm2_custom_theme_set(Evas_Object *obj, const char *path);
+E_API void e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content);
+E_API void e_fm2_underlay_show(Evas_Object *obj);
+E_API void e_fm2_underlay_hide(Evas_Object *obj);
+E_API void e_fm2_all_unsel(Evas_Object *obj);
+E_API void e_fm2_all_sel(Evas_Object *obj);
+E_API void e_fm2_first_sel(Evas_Object *obj);
+E_API void e_fm2_last_sel(Evas_Object *obj);
+E_API void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path);
+E_API void e_fm2_refresh(Evas_Object *obj);
+E_API const char *e_fm2_real_path_get(Evas_Object *obj);
+E_API int e_fm2_has_parent_get(Evas_Object *obj);
+E_API void e_fm2_parent_go(Evas_Object *obj);
+E_API void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg);
+E_API E_Fm2_Config *e_fm2_config_get(Evas_Object *obj);
+E_API Eina_List *e_fm2_selected_list_get(Evas_Object *obj);
+E_API Eina_List *e_fm2_all_list_get(Evas_Object *obj);
+E_API void e_fm2_select_set(Evas_Object *obj, const char *file, int select);
+E_API void e_fm2_deselect_all(Evas_Object *obj);
+E_API void e_fm2_file_show(Evas_Object *obj, const char *file);
+E_API void e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data);
+E_API void e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data);
+E_API void e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data);
+E_API void e_fm2_icon_menu_flags_set(Evas_Object *obj, E_Fm2_Menu_Flags flags);
+E_API E_Fm2_Menu_Flags e_fm2_icon_menu_flags_get(Evas_Object *obj);
+E_API void e_fm2_view_flags_set(Evas_Object *obj, E_Fm2_View_Flags flags);
+E_API E_Fm2_View_Flags e_fm2_view_flags_get(Evas_Object *obj);
+E_API E_Object *e_fm2_window_object_get(Evas_Object *obj);
+E_API void e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj);
+E_API void e_fm2_window_set(Evas_Object *obj, Evas_Object *win);
+E_API void e_fm2_icons_update(Evas_Object *obj);
+
+E_API void e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+E_API void e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+E_API void e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+E_API void e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+
+E_API void e_fm2_all_icons_update(void);
+
+E_API void e_fm2_operation_abort(int id);
+
+E_API Evas_Object *e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, Evas_Smart_Cb gen_func,
void *data, int force_gen, const char **type_ret);
-EAPI E_Fm2_Icon_Info *e_fm2_icon_file_info_get(E_Fm2_Icon *ic);
-EAPI void e_fm2_icon_geometry_get(E_Fm2_Icon *ic, int *x, int *y, int *w, int *h);
-EAPI Eina_Bool e_fm2_typebuf_visible_get(Evas_Object *obj);
-EAPI void e_fm2_typebuf_clear(Evas_Object *obj);
-EAPI void e_fm2_overlay_clip_to(Evas_Object *fm, Evas_Object *clip);
-
-EAPI void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e);
-EAPI void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e);
-EAPI E_Fm2_View_Mode e_fm2_view_mode_get(Evas_Object *obj);
-EAPI Eina_Bool e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w, int *h);
-EAPI const char *e_fm2_real_path_map(const char *dev, const char *path);
-EAPI void e_fm2_favorites_init(void);
-EAPI unsigned int e_fm2_selected_count(Evas_Object *obj);
-EAPI const char *e_fm2_desktop_url_eval(const char *val);
-EAPI E_Fm2_Icon_Info *e_fm2_drop_icon_get(Evas_Object *obj);
-EAPI void e_fm2_drop_menu(Evas_Object *e_fm, char *args);
-EAPI Eina_List *e_fm2_uri_path_list_get(const Eina_List *uri_list);
-EAPI Efreet_Desktop *e_fm2_desktop_get(Evas_Object *obj);
-
-EAPI int e_fm2_client_file_move(Evas_Object *e_fm, const char *args);
-EAPI int e_fm2_client_file_copy(Evas_Object *e_fm, const char *args);
-EAPI int e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args);
-
-EAPI int _e_fm2_client_mount(const char *udi, const char *mountpoint);
-EAPI int _e_fm2_client_unmount(const char *udi);
-EAPI void _e_fm2_file_force_update(const char *path);
-
-EAPI E_Fm2_Icon *e_fm2_icon_editing_get(Evas_Object *obj);
+E_API E_Fm2_Icon_Info *e_fm2_icon_file_info_get(E_Fm2_Icon *ic);
+E_API void e_fm2_icon_geometry_get(E_Fm2_Icon *ic, int *x, int *y, int *w, int *h);
+E_API Eina_Bool e_fm2_typebuf_visible_get(Evas_Object *obj);
+E_API void e_fm2_typebuf_clear(Evas_Object *obj);
+E_API void e_fm2_overlay_clip_to(Evas_Object *fm, Evas_Object *clip);
+
+E_API void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e);
+E_API void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e);
+E_API E_Fm2_View_Mode e_fm2_view_mode_get(Evas_Object *obj);
+E_API Eina_Bool e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w, int *h);
+E_API const char *e_fm2_real_path_map(const char *dev, const char *path);
+E_API void e_fm2_favorites_init(void);
+E_API unsigned int e_fm2_selected_count(Evas_Object *obj);
+E_API const char *e_fm2_desktop_url_eval(const char *val);
+E_API E_Fm2_Icon_Info *e_fm2_drop_icon_get(Evas_Object *obj);
+E_API void e_fm2_drop_menu(Evas_Object *e_fm, char *args);
+E_API Eina_List *e_fm2_uri_path_list_get(const Eina_List *uri_list);
+E_API Efreet_Desktop *e_fm2_desktop_get(Evas_Object *obj);
+
+E_API int e_fm2_client_file_move(Evas_Object *e_fm, const char *args);
+E_API int e_fm2_client_file_copy(Evas_Object *e_fm, const char *args);
+E_API int e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args);
+
+E_API int _e_fm2_client_mount(const char *udi, const char *mountpoint);
+E_API int _e_fm2_client_unmount(const char *udi);
+E_API void _e_fm2_file_force_update(const char *path);
+
+E_API E_Fm2_Icon *e_fm2_icon_editing_get(Evas_Object *obj);
#endif
#endif
diff --git a/src/bin/e_fm/e_fm_ipc.h b/src/bin/e_fm/e_fm_ipc.h
index 5389d261b..0476c0fd8 100644
--- a/src/bin/e_fm/e_fm_ipc.h
+++ b/src/bin/e_fm/e_fm_ipc.h
@@ -1,6 +1,7 @@
#ifndef E_FM_IPC_H
#define E_FM_IPC_H
+#include "e_fm_main.h"
#include "e_fm_shared_types.h"
int _e_fm_ipc_init(void);
@@ -9,16 +10,16 @@ Eina_Bool _e_fm_ipc_slave_error_cb(void *data, int type, void *event);
Eina_Bool _e_fm_ipc_slave_del_cb(void *data, int type, void *event);
void e_fm_ipc_volume_add(E_Volume *v);
-EAPI E_Storage *e_storage_add(const char *udi);
-EAPI void e_storage_del(const char *udi);
-EAPI E_Storage *e_storage_find(const char *udi);
+E_API E_Storage *e_storage_add(const char *udi);
+E_API void e_storage_del(const char *udi);
+E_API E_Storage *e_storage_find(const char *udi);
-EAPI E_Volume *e_volume_add(const char *udi, char first_time);
-EAPI void e_volume_del(const char *udi);
-EAPI E_Volume *e_volume_find(const char *udi);
+E_API E_Volume *e_volume_add(const char *udi, char first_time);
+E_API void e_volume_del(const char *udi);
+E_API E_Volume *e_volume_find(const char *udi);
-EAPI void e_volume_mount(E_Volume *v);
-EAPI void e_volume_unmount(E_Volume *v);
-EAPI void e_volume_eject(E_Volume *v);
+E_API void e_volume_mount(E_Volume *v);
+E_API void e_volume_unmount(E_Volume *v);
+E_API void e_volume_eject(E_Volume *v);
#endif
diff --git a/src/bin/e_fm/e_fm_main.c b/src/bin/e_fm/e_fm_main.c
index e24cc46ca..a1317d680 100644
--- a/src/bin/e_fm/e_fm_main.c
+++ b/src/bin/e_fm/e_fm_main.c
@@ -46,6 +46,8 @@ void *alloca (size_t);
#include <Ecore_File.h>
#include <Eet.h>
+#include "e_fm_main.h"
+
#define E_TYPEDEFS
#include "e_config_data.h"
#include "e_fm_op.h"
@@ -77,8 +79,8 @@ static Efm_Mode mode = EFM_MODE_USING_RASTER_MOUNT;
*
*/
-#ifndef EAPI
-#define EAPI
+#ifndef E_API
+#define E_API
#endif
#include "e_fm_main.h"
@@ -217,7 +219,7 @@ _e_volume_free(E_Volume *v)
/* API functions */
-EAPI void
+E_API void
e_volume_mount(E_Volume *v)
{
switch (mode)
@@ -242,7 +244,7 @@ e_volume_mount(E_Volume *v)
}
-EAPI void
+E_API void
e_volume_unmount(E_Volume *v)
{
switch (mode)
@@ -266,7 +268,7 @@ e_volume_unmount(E_Volume *v)
}
}
-EAPI void
+E_API void
e_volume_eject(E_Volume *v)
{
switch (mode)
@@ -290,7 +292,7 @@ e_volume_eject(E_Volume *v)
}
}
-EAPI E_Volume *
+E_API E_Volume *
e_volume_find(const char *udi)
{
switch (mode)
@@ -312,7 +314,7 @@ e_volume_find(const char *udi)
return NULL;
}
-EAPI void
+E_API void
e_storage_del(const char *udi)
{
switch (mode)
@@ -336,7 +338,7 @@ e_storage_del(const char *udi)
}
}
-EAPI E_Storage *
+E_API E_Storage *
e_storage_find(const char *udi)
{
switch (mode)
diff --git a/src/bin/e_fm/e_fm_main.h b/src/bin/e_fm/e_fm_main.h
index 849adf9e0..1ff95eff3 100644
--- a/src/bin/e_fm/e_fm_main.h
+++ b/src/bin/e_fm/e_fm_main.h
@@ -13,6 +13,31 @@
#define ERR(...) EINA_LOG_DOM_ERR(efm_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(efm_log_dom, __VA_ARGS__)
+# ifdef E_API
+# undef E_API
+# endif
+# ifdef WIN32
+# ifdef BUILDING_DLL
+# define E_API __declspec(dllexport)
+# else
+# define E_API __declspec(dllimport)
+# endif
+# else
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+/* BROKEN in gcc 4 on amd64 */
+# if 0
+# pragma GCC visibility push(hidden)
+# endif
+# define E_API __attribute__ ((visibility("default")))
+# else
+# define E_API
+# endif
+# else
+# define E_API
+# endif
+# endif
+
extern Ecore_Ipc_Server *_e_fm_ipc_server;
extern int efm_log_dom;
diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c
index 5431bc3d7..5441fe968 100644
--- a/src/bin/e_fm/e_fm_main_udisks2.c
+++ b/src/bin/e_fm/e_fm_main_udisks2.c
@@ -919,7 +919,9 @@ _volume_eject_umount_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p
E_Volume *v = data;
if (eldbus_message_error_get(msg, &name, &txt))
- ERR("%s: %s", name, txt);
+ {
+ ERR("%s: %s", name, txt);
+ }
else if (v->optype == E_VOLUME_OP_TYPE_EJECT)
{
vols_ejecting = eina_list_remove(vols_ejecting, v);
diff --git a/src/bin/e_fm_cmdline.c b/src/bin/e_fm_cmdline.c
index 0d51faa2c..944443c44 100644
--- a/src/bin/e_fm_cmdline.c
+++ b/src/bin/e_fm_cmdline.c
@@ -12,6 +12,31 @@
#include <Efreet.h>
#include <Eldbus.h>
+# ifdef E_API
+# undef E_API
+# endif
+# ifdef WIN32
+# ifdef BUILDING_DLL
+# define E_API __declspec(dllexport)
+# else
+# define E_API __declspec(dllimport)
+# endif
+# else
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+/* BROKEN in gcc 4 on amd64 */
+# if 0
+# pragma GCC visibility push(hidden)
+# endif
+# define E_API __attribute__ ((visibility("default")))
+# else
+# define E_API
+# endif
+# else
+# define E_API
+# endif
+# endif
+
static Eldbus_Connection *conn = NULL;
static int retval = EXIT_SUCCESS;
static int pending = 0;
@@ -136,7 +161,7 @@ static const Ecore_Getopt options = {
}
};
-EAPI int
+E_API int
main(int argc, char *argv[])
{
Eina_Bool quit_option = EINA_FALSE;
diff --git a/src/bin/e_fm_custom.c b/src/bin/e_fm_custom.c
index f4b027012..7f13e28f0 100644
--- a/src/bin/e_fm_custom.c
+++ b/src/bin/e_fm_custom.c
@@ -103,7 +103,7 @@ e_fm2_custom_file_shutdown(void)
_e_fm2_custom_dir_edd = NULL;
}
-EAPI E_Fm2_Custom_File *
+E_API E_Fm2_Custom_File *
e_fm2_custom_file_get(const char *path)
{
E_Fm2_Custom_File *cf;
@@ -146,7 +146,7 @@ _e_fm2_custom_dir_dup(const E_Fm2_Custom_Dir *dir)
return copy;
}
-EAPI E_Fm2_Custom_File *
+E_API E_Fm2_Custom_File *
e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf)
{
E_Fm2_Custom_File *copy;
@@ -163,7 +163,7 @@ e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf)
return copy;
}
-EAPI void
+E_API void
e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf)
{
E_Fm2_Custom_File *cf1;
@@ -189,7 +189,7 @@ e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf)
_e_fm2_custom_writes = 1;
}
-EAPI void
+E_API void
e_fm2_custom_file_del(const char *path)
{
Eina_List *list, *l;
@@ -217,7 +217,7 @@ e_fm2_custom_file_del(const char *path)
_e_fm2_custom_writes = 1;
}
-EAPI void
+E_API void
e_fm2_custom_file_rename(const char *path, const char *new_path)
{
E_Fm2_Custom_File *cf, *cf2;
@@ -260,7 +260,7 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
_e_fm2_custom_writes = 1;
}
-EAPI void
+E_API void
e_fm2_custom_file_flush(void)
{
if (!_e_fm2_custom_file) return;
diff --git a/src/bin/e_fm_custom.h b/src/bin/e_fm_custom.h
index 091affd1a..1392cb0a0 100644
--- a/src/bin/e_fm_custom.h
+++ b/src/bin/e_fm_custom.h
@@ -53,13 +53,13 @@ struct _E_Fm2_Custom_File
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);
-EAPI void e_fm2_custom_file_rename(const char *path, const char *new_path);
-EAPI void e_fm2_custom_file_flush(void);
+E_API E_Fm2_Custom_File *e_fm2_custom_file_get(const char *path);
+E_API void e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf);
+E_API void e_fm2_custom_file_del(const char *path);
+E_API void e_fm2_custom_file_rename(const char *path, const char *new_path);
+E_API void e_fm2_custom_file_flush(void);
-EAPI E_Fm2_Custom_File *e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf);
+E_API E_Fm2_Custom_File *e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf);
#endif
#endif
diff --git a/src/bin/e_fm_device.c b/src/bin/e_fm_device.c
index 92b1f5319..a7a252e0a 100644
--- a/src/bin/e_fm_device.c
+++ b/src/bin/e_fm_device.c
@@ -119,7 +119,7 @@ _e_fm2_device_volume_setup(E_Volume *v)
E_FREE(size);
}
-EAPI void
+E_API void
e_fm2_device_storage_add(E_Storage *s)
{
Eina_List *l;
@@ -185,7 +185,7 @@ e_fm2_device_storage_add(E_Storage *s)
}
}
-EAPI void
+E_API void
e_fm2_device_storage_del(E_Storage *s)
{
// printf("STO- %s\n", s->udi);
@@ -193,7 +193,7 @@ e_fm2_device_storage_del(E_Storage *s)
_e_fm_shared_device_storage_free(s);
}
-EAPI E_Storage *
+E_API E_Storage *
e_fm2_device_storage_find(const char *udi)
{
Eina_List *l;
@@ -207,7 +207,7 @@ e_fm2_device_storage_find(const char *udi)
return NULL;
}
-EAPI void
+E_API void
e_fm2_device_volume_add(E_Volume *v)
{
E_Storage *s;
@@ -280,7 +280,7 @@ e_fm2_device_volume_add(E_Volume *v)
if (v->storage) _e_fm2_device_volume_setup(v);
}
-EAPI void
+E_API void
e_fm2_device_volume_del(E_Volume *v)
{
E_Fm2_Mount *m;
@@ -376,7 +376,7 @@ _e_fm2_volume_erase(E_Volume *v)
_e_fm2_file_force_update(buf);
}
-EAPI E_Volume *
+E_API E_Volume *
e_fm2_device_volume_find(const char *udi)
{
Eina_List *l;
@@ -393,7 +393,7 @@ e_fm2_device_volume_find(const char *udi)
return NULL;
}
-EAPI E_Volume *
+E_API E_Volume *
e_fm2_device_volume_find_fast(const char *udi)
{
Eina_List *l;
@@ -407,7 +407,7 @@ e_fm2_device_volume_find_fast(const char *udi)
return NULL;
}
-EAPI const char *
+E_API const char *
e_fm2_device_volume_mountpoint_get(E_Volume *v)
{
char buf[PATH_MAX] = {0};
@@ -436,7 +436,7 @@ e_fm2_device_volume_mountpoint_get(E_Volume *v)
return eina_stringshare_add(buf);
}
-EAPI E_Fm2_Device_Mount_Op *
+E_API E_Fm2_Device_Mount_Op *
e_fm2_device_mount_op_add(E_Fm2_Mount *m, char *args, size_t size, size_t length)
{
E_Fm2_Device_Mount_Op *mop;
@@ -446,7 +446,7 @@ e_fm2_device_mount_op_add(E_Fm2_Mount *m, char *args, size_t size, size_t length
return mop;
}
-EAPI void
+E_API void
e_fm2_device_mount_add(E_Volume *v,
const char *mountpoint)
{
@@ -458,7 +458,7 @@ e_fm2_device_mount_add(E_Volume *v,
// printf("MOUNT %s %s\n", v->udi, v->mount_point);
}
-EAPI void
+E_API void
e_fm2_device_mount_del(E_Volume *v)
{
E_Fm2_Mount *m;
@@ -477,7 +477,7 @@ e_fm2_device_mount_del(E_Volume *v)
}
}
-EAPI void
+E_API void
e_fm2_device_mount_free(E_Fm2_Mount *m)
{
if (!m) return;
@@ -488,7 +488,7 @@ e_fm2_device_mount_free(E_Fm2_Mount *m)
free(m);
}
-EAPI E_Fm2_Mount *
+E_API E_Fm2_Mount *
e_fm2_device_mount_find(const char *path)
{
Eina_List *l;
@@ -507,7 +507,7 @@ e_fm2_device_mount_find(const char *path)
return NULL;
}
-EAPI E_Fm2_Mount *
+E_API E_Fm2_Mount *
e_fm2_device_mount(E_Volume *v,
Ecore_Cb mount_ok,
Ecore_Cb mount_fail,
@@ -547,7 +547,7 @@ e_fm2_device_mount(E_Volume *v,
return m;
}
-EAPI void
+E_API void
e_fm2_device_mount_fail(E_Volume *v)
{
E_Fm2_Mount *m;
@@ -566,7 +566,7 @@ e_fm2_device_mount_fail(E_Volume *v)
}
}
-EAPI void
+E_API void
e_fm2_device_unmount(E_Fm2_Mount *m)
{
E_Volume *v;
@@ -587,7 +587,7 @@ e_fm2_device_unmount(E_Fm2_Mount *m)
}
}
-EAPI void
+E_API void
e_fm2_device_unmount_fail(E_Volume *v)
{
Eina_List *l;
@@ -688,7 +688,7 @@ _e_fm2_device_check_desktop_icons_cb(void *data, Ecore_Thread *eth EINA_UNUSED)
E_FREE_LIST(data, free);
}
-EAPI void
+E_API void
e_fm2_device_show_desktop_icons(void)
{
Eina_List *l;
@@ -726,7 +726,7 @@ e_fm2_device_show_desktop_icons(void)
}
}
-EAPI void
+E_API void
e_fm2_device_hide_desktop_icons(void)
{
Eina_List *l;
@@ -759,7 +759,7 @@ e_fm2_device_hide_desktop_icons(void)
}
}
-EAPI void
+E_API void
e_fm2_device_check_desktop_icons(void)
{
Eina_List *l, *thd = NULL;
@@ -782,7 +782,7 @@ e_fm2_device_check_desktop_icons(void)
_check_vols = ecore_thread_run(_e_fm2_device_check_desktop_icons_cb, _e_fm2_device_check_desktop_icons_cb_end, _e_fm2_device_check_desktop_icons_cb_end, thd);
}
-EAPI Eina_List *
+E_API Eina_List *
e_fm2_device_volume_list_get(void)
{
return _e_vols;
diff --git a/src/bin/e_fm_device.h b/src/bin/e_fm_device.h
index 56aa29b93..73538bcef 100644
--- a/src/bin/e_fm_device.h
+++ b/src/bin/e_fm_device.h
@@ -4,32 +4,32 @@
#include "e.h"
#include "e_fm.h"
-EAPI void e_fm2_device_storage_add(E_Storage *s);
-EAPI void e_fm2_device_storage_del(E_Storage *s);
-EAPI E_Storage *e_fm2_device_storage_find(const char *udi);
+E_API void e_fm2_device_storage_add(E_Storage *s);
+E_API void e_fm2_device_storage_del(E_Storage *s);
+E_API E_Storage *e_fm2_device_storage_find(const char *udi);
-EAPI void e_fm2_device_volume_add(E_Volume *s);
-EAPI void e_fm2_device_volume_del(E_Volume *s);
-EAPI E_Volume *e_fm2_device_volume_find(const char *udi);
-EAPI E_Volume *e_fm2_device_volume_find_fast(const char *udi);
-EAPI const char *e_fm2_device_volume_mountpoint_get(E_Volume *v);
+E_API void e_fm2_device_volume_add(E_Volume *s);
+E_API void e_fm2_device_volume_del(E_Volume *s);
+E_API E_Volume *e_fm2_device_volume_find(const char *udi);
+E_API E_Volume *e_fm2_device_volume_find_fast(const char *udi);
+E_API const char *e_fm2_device_volume_mountpoint_get(E_Volume *v);
-EAPI void e_fm2_device_mount_add(E_Volume *v, const char *mountpoint);
-EAPI E_Fm2_Device_Mount_Op *e_fm2_device_mount_op_add(E_Fm2_Mount *m, char *args, size_t size, size_t length);
-EAPI void e_fm2_device_mount_free(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
-EAPI void e_fm2_device_mount_del(E_Volume *v);
-EAPI E_Fm2_Mount *e_fm2_device_mount_find(const char *path);
-EAPI E_Fm2_Mount *e_fm2_device_mount(E_Volume *v,
+E_API void e_fm2_device_mount_add(E_Volume *v, const char *mountpoint);
+E_API E_Fm2_Device_Mount_Op *e_fm2_device_mount_op_add(E_Fm2_Mount *m, char *args, size_t size, size_t length);
+E_API void e_fm2_device_mount_free(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
+E_API void e_fm2_device_mount_del(E_Volume *v);
+E_API E_Fm2_Mount *e_fm2_device_mount_find(const char *path);
+E_API E_Fm2_Mount *e_fm2_device_mount(E_Volume *v,
Ecore_Cb mount_ok, Ecore_Cb mount_fail,
Ecore_Cb unmount_ok, Ecore_Cb unmount_fail,
void *data);
-EAPI void e_fm2_device_mount_fail(E_Volume *v);
-EAPI void e_fm2_device_unmount(E_Fm2_Mount *m);
-EAPI void e_fm2_device_unmount_fail(E_Volume *v);
+E_API void e_fm2_device_mount_fail(E_Volume *v);
+E_API void e_fm2_device_unmount(E_Fm2_Mount *m);
+E_API void e_fm2_device_unmount_fail(E_Volume *v);
-EAPI void e_fm2_device_show_desktop_icons(void);
-EAPI void e_fm2_device_hide_desktop_icons(void);
-EAPI void e_fm2_device_check_desktop_icons(void);
-EAPI Eina_List *e_fm2_device_volume_list_get(void);
+E_API void e_fm2_device_show_desktop_icons(void);
+E_API void e_fm2_device_hide_desktop_icons(void);
+E_API void e_fm2_device_check_desktop_icons(void);
+E_API Eina_List *e_fm2_device_volume_list_get(void);
#endif
diff --git a/src/bin/e_fm_mime.c b/src/bin/e_fm_mime.c
index 501819e54..20c6e0638 100644
--- a/src/bin/e_fm_mime.c
+++ b/src/bin/e_fm_mime.c
@@ -17,7 +17,7 @@ static Eina_Hash *_mime_handlers = NULL;
static Eina_Hash *_glob_handlers = NULL;
/* externally accessible functions */
-EAPI const char *
+E_API const char *
e_fm_mime_filename_get(const char *fname)
{
return efreet_mime_globs_type_get(fname);
@@ -30,7 +30,7 @@ e_fm_mime_filename_get(const char *fname)
* "/path/to/file....edj" = explicit icon edje file
* "/path/to/file..." = explicit image file to use
*/
-EAPI const char *
+E_API const char *
e_fm_mime_icon_get(const char *mime)
{
char buf[4096], buf2[4096], *val;
@@ -125,7 +125,7 @@ ok:
return val;
}
-EAPI void
+E_API void
e_fm_mime_icon_cache_flush(void)
{
Eina_List *freelist = NULL;
@@ -137,7 +137,7 @@ e_fm_mime_icon_cache_flush(void)
}
/* create (allocate), set properties, and return a new mime handler */
-EAPI E_Fm2_Mime_Handler *
+E_API E_Fm2_Mime_Handler *
e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_func)(void *data, Evas_Object *obj, const char *path), void *action_data, int(test_func) (void *data, Evas_Object * obj, const char *path), void *test_data)
{
E_Fm2_Mime_Handler *handler;
@@ -157,7 +157,7 @@ e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_
return handler;
}
-EAPI void
+E_API void
e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler)
{
if (!handler) return;
@@ -168,7 +168,7 @@ e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler)
}
/* associate a certain mime type with a handler */
-EAPI Eina_Bool
+E_API Eina_Bool
e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime)
{
Eina_List *handlers = NULL;
@@ -193,7 +193,7 @@ e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime)
}
/* associate a certain glob with a handler */
-EAPI Eina_Bool
+E_API Eina_Bool
e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob_)
{
Eina_List *handlers = NULL;
@@ -218,7 +218,7 @@ e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob_)
}
/* delete a certain handler for a certain mime */
-EAPI void
+E_API void
e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime)
{
Eina_List *handlers = NULL;
@@ -244,7 +244,7 @@ e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime)
}
/* delete a certain handler for a certain glob */
-EAPI void
+E_API void
e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob_)
{
Eina_List *handlers = NULL;
@@ -269,7 +269,7 @@ e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob_)
}
}
-EAPI const Eina_List *
+E_API const Eina_List *
e_fm2_mime_handler_mime_handlers_get(const char *mime)
{
if ((!mime) || (!_mime_handlers)) return NULL;
@@ -278,7 +278,7 @@ e_fm2_mime_handler_mime_handlers_get(const char *mime)
/* get the list of glob handlers for a glob.
NOTE: the list should be free()'ed */
-EAPI Eina_List *
+E_API Eina_List *
e_fm2_mime_handler_glob_handlers_get(const char *glob_)
{
E_Fm2_Mime_Handler_Tuple *tuple = NULL;
@@ -296,7 +296,7 @@ e_fm2_mime_handler_glob_handlers_get(const char *glob_)
}
/* call a certain handler */
-EAPI Eina_Bool
+E_API Eina_Bool
e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path)
{
if ((!handler) || (!obj) || (!path) || (!handler->action_func))
@@ -318,7 +318,7 @@ e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha
}
/* call all handlers related to a certain mime */
-EAPI void
+E_API void
e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime)
{
const Eina_List *l, *handlers;
@@ -338,7 +338,7 @@ e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, co
}
/* call all handlers related to a certain glob */
-EAPI void
+E_API void
e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob_)
{
Eina_List *handlers = NULL;
@@ -359,7 +359,7 @@ e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, co
}
/* run a handlers test function */
-EAPI Eina_Bool
+E_API Eina_Bool
e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path)
{
if ((!handler) || (!obj) || (!path)) return 0;
diff --git a/src/bin/e_fm_mime.h b/src/bin/e_fm_mime.h
index 69d25f2de..7c4d6f938 100644
--- a/src/bin/e_fm_mime.h
+++ b/src/bin/e_fm_mime.h
@@ -15,22 +15,22 @@ struct _E_Fm2_Mime_Handler
void *test_data;
};
-EAPI const char *e_fm_mime_filename_get(const char *fname);
-EAPI const char *e_fm_mime_icon_get(const char *mime);
-EAPI void e_fm_mime_icon_cache_flush(void);
+E_API const char *e_fm_mime_filename_get(const char *fname);
+E_API const char *e_fm_mime_icon_get(const char *mime);
+E_API void e_fm_mime_icon_cache_flush(void);
-EAPI E_Fm2_Mime_Handler *e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_func) (void *data, Evas_Object *obj, const char *path), void *action_data, int (test_func) (void *data, Evas_Object *obj, const char *path), void *test_data);
-EAPI void e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler);
-EAPI Eina_Bool e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime);
-EAPI Eina_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob);
-EAPI Eina_Bool e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path);
-EAPI Eina_Bool e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path);
-EAPI void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime);
-EAPI void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob);
-EAPI void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime);
-EAPI void e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob);
-EAPI const Eina_List *e_fm2_mime_handler_mime_handlers_get(const char *mime);
-EAPI Eina_List *e_fm2_mime_handler_glob_handlers_get(const char *glob);
+E_API E_Fm2_Mime_Handler *e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_func) (void *data, Evas_Object *obj, const char *path), void *action_data, int (test_func) (void *data, Evas_Object *obj, const char *path), void *test_data);
+E_API void e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler);
+E_API Eina_Bool e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime);
+E_API Eina_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob);
+E_API Eina_Bool e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path);
+E_API Eina_Bool e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path);
+E_API void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime);
+E_API void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob);
+E_API void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime);
+E_API void e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob);
+E_API const Eina_List *e_fm2_mime_handler_mime_handlers_get(const char *mime);
+E_API Eina_List *e_fm2_mime_handler_glob_handlers_get(const char *glob);
#endif
#endif
diff --git a/src/bin/e_fm_op_registry.c b/src/bin/e_fm_op_registry.c
index 8b5832ad8..14791853f 100644
--- a/src/bin/e_fm_op_registry.c
+++ b/src/bin/e_fm_op_registry.c
@@ -1,8 +1,8 @@
#include "e.h"
-EAPI int E_EVENT_FM_OP_REGISTRY_ADD = 0;
-EAPI int E_EVENT_FM_OP_REGISTRY_DEL = 0;
-EAPI int E_EVENT_FM_OP_REGISTRY_CHANGED = 0;
+E_API int E_EVENT_FM_OP_REGISTRY_ADD = 0;
+E_API int E_EVENT_FM_OP_REGISTRY_DEL = 0;
+E_API int E_EVENT_FM_OP_REGISTRY_CHANGED = 0;
static Eina_Hash *_e_fm2_op_registry = NULL;
static unsigned int _e_fm2_init_count = 0;
@@ -236,7 +236,7 @@ e_fm2_op_registry_entry_files_set(E_Fm2_Op_Registry_Entry *entry, const char *sr
*
* @return: new number of references after operation or -1 on error.
*/
-EAPI int
+E_API int
e_fm2_op_registry_entry_ref(E_Fm2_Op_Registry_Entry *entry)
{
E_Fm2_Op_Registry_Entry_Internal *e;
@@ -253,7 +253,7 @@ e_fm2_op_registry_entry_ref(E_Fm2_Op_Registry_Entry *entry)
* @return: new number of references after operation or -1 on error,
* if 0 the entry was freed and pointer is then invalid.
*/
-EAPI int
+E_API int
e_fm2_op_registry_entry_unref(E_Fm2_Op_Registry_Entry *entry)
{
E_Fm2_Op_Registry_Entry_Internal *e;
@@ -272,7 +272,7 @@ e_fm2_op_registry_entry_unref(E_Fm2_Op_Registry_Entry *entry)
*
* @return: 0 if no window, window identifier otherwise.
*/
-EAPI Ecore_X_Window
+E_API Ecore_X_Window
e_fm2_op_registry_entry_xwin_get(const E_Fm2_Op_Registry_Entry *entry)
{
Evas *e;
@@ -295,7 +295,7 @@ e_fm2_op_registry_entry_xwin_get(const E_Fm2_Op_Registry_Entry *entry)
*
* @note: does not increment reference.
*/
-EAPI E_Fm2_Op_Registry_Entry *
+E_API E_Fm2_Op_Registry_Entry *
e_fm2_op_registry_entry_get(int id)
{
return eina_hash_find(_e_fm2_op_registry, &id);
@@ -316,7 +316,7 @@ e_fm2_op_registry_entry_get(int id)
* @note: does not increment reference.
* @note: on errors, @p free_data will be called.
*/
-EAPI void
+E_API void
e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data, void (*free_data)(void *data))
{
E_Fm2_Op_Registry_Entry_Internal *e;
@@ -361,7 +361,7 @@ e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)(
* @note: does not decrement reference.
* @see: e_fm2_op_registry_entry_listener_add()
*/
-EAPI void
+E_API void
e_fm2_op_registry_entry_listener_del(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data)
{
E_Fm2_Op_Registry_Entry_Internal *e;
@@ -393,7 +393,7 @@ e_fm2_op_registry_entry_listener_del(E_Fm2_Op_Registry_Entry *entry, void (*cb)(
*
* @see e_fm2_op_registry_get_all()
*/
-EAPI Eina_Iterator *
+E_API Eina_Iterator *
e_fm2_op_registry_iterator_new(void)
{
return eina_hash_iterator_data_new(_e_fm2_op_registry);
@@ -410,7 +410,7 @@ e_fm2_op_registry_iterator_new(void)
* @note: if you need a simple, immediate walk, use
* e_fm2_op_registry_iterator_new()
*/
-EAPI Eina_List *
+E_API Eina_List *
e_fm2_op_registry_get_all(void)
{
Eina_List *list;
@@ -429,7 +429,7 @@ e_fm2_op_registry_get_all(void)
return list;
}
-EAPI void
+E_API void
e_fm2_op_registry_get_all_free(Eina_List *list)
{
E_Fm2_Op_Registry_Entry *entry;
@@ -437,13 +437,13 @@ e_fm2_op_registry_get_all_free(Eina_List *list)
e_fm2_op_registry_entry_unref(entry);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_fm2_op_registry_is_empty(void)
{
return eina_hash_population(_e_fm2_op_registry) == 0;
}
-EAPI int
+E_API int
e_fm2_op_registry_count(void)
{
return eina_hash_population(_e_fm2_op_registry);
@@ -485,7 +485,7 @@ e_fm2_op_registry_shutdown(void)
return 0;
}
-EAPI void
+E_API void
e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry)
{
if (!entry) return;
diff --git a/src/bin/e_fm_op_registry.h b/src/bin/e_fm_op_registry.h
index e04a2fb10..2a385ec14 100644
--- a/src/bin/e_fm_op_registry.h
+++ b/src/bin/e_fm_op_registry.h
@@ -41,27 +41,27 @@ struct _E_Fm2_Op_Registry_Entry
} func;
};
-extern EAPI int E_EVENT_FM_OP_REGISTRY_ADD;
-extern EAPI int E_EVENT_FM_OP_REGISTRY_DEL;
-extern EAPI int E_EVENT_FM_OP_REGISTRY_CHANGED;
+extern E_API int E_EVENT_FM_OP_REGISTRY_ADD;
+extern E_API int E_EVENT_FM_OP_REGISTRY_DEL;
+extern E_API int E_EVENT_FM_OP_REGISTRY_CHANGED;
-EAPI int e_fm2_op_registry_entry_ref(E_Fm2_Op_Registry_Entry *entry);
-EAPI int e_fm2_op_registry_entry_unref(E_Fm2_Op_Registry_Entry *entry);
+E_API int e_fm2_op_registry_entry_ref(E_Fm2_Op_Registry_Entry *entry);
+E_API int e_fm2_op_registry_entry_unref(E_Fm2_Op_Registry_Entry *entry);
-EAPI Ecore_X_Window e_fm2_op_registry_entry_xwin_get(const E_Fm2_Op_Registry_Entry *entry);
+E_API Ecore_X_Window e_fm2_op_registry_entry_xwin_get(const E_Fm2_Op_Registry_Entry *entry);
-EAPI E_Fm2_Op_Registry_Entry *e_fm2_op_registry_entry_get(int id);
+E_API E_Fm2_Op_Registry_Entry *e_fm2_op_registry_entry_get(int id);
-EAPI void e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data, void (*free_data)(void *data));
-EAPI void e_fm2_op_registry_entry_listener_del(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data);
+E_API void e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data, void (*free_data)(void *data));
+E_API void e_fm2_op_registry_entry_listener_del(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data);
-EAPI Eina_Iterator *e_fm2_op_registry_iterator_new(void);
-EAPI Eina_List *e_fm2_op_registry_get_all(void);
-EAPI void e_fm2_op_registry_get_all_free(Eina_List *list);
-EAPI Eina_Bool e_fm2_op_registry_is_empty(void);
-EAPI int e_fm2_op_registry_count(void);
+E_API Eina_Iterator *e_fm2_op_registry_iterator_new(void);
+E_API Eina_List *e_fm2_op_registry_get_all(void);
+E_API void e_fm2_op_registry_get_all_free(Eina_List *list);
+E_API Eina_Bool e_fm2_op_registry_is_empty(void);
+E_API int e_fm2_op_registry_count(void);
-EAPI void e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry);
+E_API void e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry);
EINTERN unsigned int e_fm2_op_registry_init(void);
EINTERN unsigned int e_fm2_op_registry_shutdown(void);
diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c
index 0c74d6eff..6d9a222ee 100644
--- a/src/bin/e_fm_prop.c
+++ b/src/bin/e_fm_prop.c
@@ -93,7 +93,7 @@ struct _E_Config_Dialog_Data
};
/* a nice easy setup function that does the dirty work */
-EAPI E_Config_Dialog *
+E_API E_Config_Dialog *
e_fm_prop_file(E_Fm2_Icon *ic)
{
E_Config_Dialog *cfd;
diff --git a/src/bin/e_fm_prop.h b/src/bin/e_fm_prop.h
index 36a023d35..a71dc8e7d 100644
--- a/src/bin/e_fm_prop.h
+++ b/src/bin/e_fm_prop.h
@@ -3,7 +3,7 @@
#ifndef E_FM_PROP_H
#define E_FM_PROP_H
-EAPI E_Config_Dialog *e_fm_prop_file(E_Fm2_Icon *ic);
+E_API E_Config_Dialog *e_fm_prop_file(E_Fm2_Icon *ic);
#endif
#endif
diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index 984de51b8..c1e5e6d64 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -6,7 +6,7 @@ static Eina_Bool _e_focus_raise_timer(void *data);
/* local subsystem globals */
/* externally accessible functions */
-EAPI void
+E_API void
e_focus_event_mouse_in(E_Client *ec)
{
@@ -28,7 +28,7 @@ e_focus_event_mouse_in(E_Client *ec)
}
}
-EAPI void
+E_API void
e_focus_event_mouse_out(E_Client *ec)
{
if (e_config->focus_policy == E_FOCUS_MOUSE)
@@ -42,7 +42,7 @@ e_focus_event_mouse_out(E_Client *ec)
E_FREE_FUNC(ec->raise_timer, ecore_timer_del);
}
-EAPI void
+E_API void
e_focus_event_mouse_down(E_Client *ec)
{
if (e_client_focus_policy_click(ec) ||
@@ -55,12 +55,12 @@ e_focus_event_mouse_down(E_Client *ec)
}
}
-EAPI void
+E_API void
e_focus_event_mouse_up(E_Client *ec EINA_UNUSED)
{
}
-EAPI void
+E_API void
e_focus_event_focus_in(E_Client *ec)
{
if ((e_client_focus_policy_click(ec)) &&
@@ -81,7 +81,7 @@ e_focus_event_focus_in(E_Client *ec)
}
}
-EAPI void
+E_API void
e_focus_event_focus_out(E_Client *ec)
{
if ((e_client_focus_policy_click(ec)) &&
diff --git a/src/bin/e_focus.h b/src/bin/e_focus.h
index 9b20560cd..14364ff02 100644
--- a/src/bin/e_focus.h
+++ b/src/bin/e_focus.h
@@ -3,14 +3,14 @@
#ifndef E_FOCUS_H
#define E_FOCUS_H
-EAPI void e_focus_event_mouse_in(E_Client* ec);
-EAPI void e_focus_event_mouse_out(E_Client* ec);
-EAPI void e_focus_event_mouse_down(E_Client* ec);
-EAPI void e_focus_event_mouse_up(E_Client* ec);
-EAPI void e_focus_event_focus_in(E_Client *ec);
-EAPI void e_focus_event_focus_out(E_Client *ec);
-EAPI void e_focus_setup(E_Client *ec);
-EAPI void e_focus_setdown(E_Client *ec);
+E_API void e_focus_event_mouse_in(E_Client* ec);
+E_API void e_focus_event_mouse_out(E_Client* ec);
+E_API void e_focus_event_mouse_down(E_Client* ec);
+E_API void e_focus_event_mouse_up(E_Client* ec);
+E_API void e_focus_event_focus_in(E_Client *ec);
+E_API void e_focus_event_focus_out(E_Client *ec);
+E_API void e_focus_setup(E_Client *ec);
+E_API void e_focus_setdown(E_Client *ec);
#endif
#endif
diff --git a/src/bin/e_font.c b/src/bin/e_font.c
index d1952d0aa..e1f4e743a 100644
--- a/src/bin/e_font.c
+++ b/src/bin/e_font.c
@@ -21,7 +21,7 @@ e_font_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_font_apply(void)
{
char buf[1024];
@@ -77,7 +77,7 @@ e_font_apply(void)
e_client_frame_recalc(ec);
}
-EAPI Eina_List *
+E_API Eina_List *
e_font_available_list(void)
{
Eina_List *evas_fonts;
@@ -102,7 +102,7 @@ e_font_available_list(void)
return e_fonts;
}
-EAPI void
+E_API void
e_font_available_list_free(Eina_List *available)
{
E_Font_Available *efa;
@@ -114,7 +114,7 @@ e_font_available_list_free(Eina_List *available)
}
}
-EAPI void
+E_API void
e_font_properties_free(E_Font_Properties *efp)
{
const char *str;
@@ -137,14 +137,14 @@ _font_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSE
return 1;
}
-EAPI void
+E_API void
e_font_available_hash_free(Eina_Hash *hash)
{
eina_hash_foreach(hash, _font_hash_free_cb, NULL);
eina_hash_free(hash);
}
-EAPI E_Font_Properties *
+E_API E_Font_Properties *
e_font_fontconfig_name_parse(const char *font)
{
if (!font) return NULL;
@@ -232,7 +232,7 @@ _e_font_available_hash_add(Eina_Hash *font_hash, const char *full_name)
return font_hash;
}
-EAPI Eina_Hash *
+E_API Eina_Hash *
e_font_available_list_parse(Eina_List *list)
{
Eina_Hash *font_hash;
@@ -263,7 +263,7 @@ e_font_available_list_parse(Eina_List *list)
return font_hash;
}
-EAPI const char *
+E_API const char *
e_font_fontconfig_name_get(const char *name, const char *style)
{
char buf[256];
@@ -274,7 +274,7 @@ e_font_fontconfig_name_get(const char *name, const char *style)
return eina_stringshare_add(buf);
}
-EAPI void
+E_API void
e_font_fallback_clear(void)
{
E_Font_Fallback *eff;
@@ -286,7 +286,7 @@ e_font_fallback_clear(void)
}
}
-EAPI void
+E_API void
e_font_fallback_append(const char *font)
{
E_Font_Fallback *eff;
@@ -298,7 +298,7 @@ e_font_fallback_append(const char *font)
e_config->font_fallbacks = eina_list_append(e_config->font_fallbacks, eff);
}
-EAPI void
+E_API void
e_font_fallback_prepend(const char *font)
{
E_Font_Fallback *eff;
@@ -310,7 +310,7 @@ e_font_fallback_prepend(const char *font)
e_config->font_fallbacks = eina_list_prepend(e_config->font_fallbacks, eff);
}
-EAPI void
+E_API void
e_font_fallback_remove(const char *font)
{
Eina_List *next;
@@ -329,13 +329,13 @@ e_font_fallback_remove(const char *font)
}
}
-EAPI Eina_List *
+E_API Eina_List *
e_font_fallback_list(void)
{
return e_config->font_fallbacks;
}
-EAPI void
+E_API void
e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size)
{
E_Font_Default *efd;
@@ -370,7 +370,7 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
/*
* returns a pointer to the data, return null if nothing if found.
*/
-EAPI E_Font_Default *
+E_API E_Font_Default *
e_font_default_get(const char *text_class)
{
E_Font_Default *efd = NULL, *defd = NULL;
@@ -394,7 +394,7 @@ e_font_default_get(const char *text_class)
return defd;
}
-EAPI void
+E_API void
e_font_default_remove(const char *text_class)
{
E_Font_Default *efd;
@@ -416,7 +416,7 @@ e_font_default_remove(const char *text_class)
}
}
-EAPI Eina_List *
+E_API Eina_List *
e_font_default_list(void)
{
return e_config->font_defaults;
@@ -426,7 +426,7 @@ e_font_default_list(void)
* in size_ret. This function is needed when all hell breaks loose and
* we need a font name and size.
*/
-EAPI const char *
+E_API const char *
e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret)
{
E_Font_Default *efd;
diff --git a/src/bin/e_font.h b/src/bin/e_font.h
index 128cc0d0d..0b4e14de9 100644
--- a/src/bin/e_font.h
+++ b/src/bin/e_font.h
@@ -34,28 +34,28 @@ struct _E_Font_Properties
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);
-EAPI Eina_Hash *e_font_available_list_parse(Eina_List *list);
-EAPI void e_font_available_hash_free(Eina_Hash *hash);
-EAPI E_Font_Properties *e_font_fontconfig_name_parse(const char *font);
-EAPI const char *e_font_fontconfig_name_get(const char *name, const char *style);
-EAPI void e_font_properties_free(E_Font_Properties *efp);
+E_API void e_font_apply(void);
+E_API Eina_List *e_font_available_list(void);
+E_API void e_font_available_list_free(Eina_List *available);
+E_API Eina_Hash *e_font_available_list_parse(Eina_List *list);
+E_API void e_font_available_hash_free(Eina_Hash *hash);
+E_API E_Font_Properties *e_font_fontconfig_name_parse(const char *font);
+E_API const char *e_font_fontconfig_name_get(const char *name, const char *style);
+E_API void e_font_properties_free(E_Font_Properties *efp);
/* global font fallbacks */
-EAPI void e_font_fallback_clear(void);
-EAPI void e_font_fallback_append(const char *font);
-EAPI void e_font_fallback_prepend(const char *font);
-EAPI void e_font_fallback_remove(const char *font);
-EAPI Eina_List *e_font_fallback_list(void);
+E_API void e_font_fallback_clear(void);
+E_API void e_font_fallback_append(const char *font);
+E_API void e_font_fallback_prepend(const char *font);
+E_API void e_font_fallback_remove(const char *font);
+E_API Eina_List *e_font_fallback_list(void);
/* setup edje text classes */
-EAPI void e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size);
-EAPI E_Font_Default *e_font_default_get(const char *text_class);
-EAPI void e_font_default_remove(const char *text_class);
-EAPI Eina_List *e_font_default_list(void);
-EAPI const char *e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret);
+E_API void e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size);
+E_API E_Font_Default *e_font_default_get(const char *text_class);
+E_API void e_font_default_remove(const char *text_class);
+E_API Eina_List *e_font_default_list(void);
+E_API const char *e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret);
#endif
#endif
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index f57cab0ac..83ab356d7 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -180,11 +180,11 @@ struct _E_Layout_Item_Container
}
/********************/
-EAPI int E_EVENT_GADCON_CLIENT_CLASS_ADD = -1;
-EAPI int E_EVENT_GADCON_CLIENT_CLASS_DEL = -1;
-EAPI int E_EVENT_GADCON_CLIENT_ADD = -1;
-EAPI int E_EVENT_GADCON_CLIENT_DEL = -1;
-EAPI int E_EVENT_GADCON_POPULATE = -1;
+E_API int E_EVENT_GADCON_CLIENT_CLASS_ADD = -1;
+E_API int E_EVENT_GADCON_CLIENT_CLASS_DEL = -1;
+E_API int E_EVENT_GADCON_CLIENT_ADD = -1;
+E_API int E_EVENT_GADCON_CLIENT_DEL = -1;
+E_API int E_EVENT_GADCON_POPULATE = -1;
static Eina_Hash *providers = NULL;
static Eina_List *providers_list = NULL;
@@ -257,7 +257,7 @@ e_gadcon_shutdown(void)
* @param cc version of gadcon, name and callbacks to use
* for handling creation and destroying a gadget
*/
-EAPI void
+E_API void
e_gadcon_provider_register(const E_Gadcon_Client_Class *cc)
{
E_Gadcon *gc;
@@ -292,7 +292,7 @@ e_gadcon_provider_register(const E_Gadcon_Client_Class *cc)
*
* @param cc the gadget class that was used to register the gadget
*/
-EAPI void
+E_API void
e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc)
{
Eina_List *l, *ll, *dlist = NULL;
@@ -328,7 +328,7 @@ e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc)
}
}
-EAPI void
+E_API void
e_gadcon_client_queue(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc)
{
Eina_List *l;
@@ -340,13 +340,13 @@ e_gadcon_client_queue(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc)
eina_hash_set(gc->awaiting_classes, cf_gcc->name, l);
}
-EAPI Eina_List *
+E_API Eina_List *
e_gadcon_provider_list(void)
{
return providers_list;
}
-EAPI void
+E_API void
e_gadcon_custom_new(E_Gadcon *gc)
{
E_OBJECT_CHECK(gc);
@@ -364,7 +364,7 @@ e_gadcon_custom_new(E_Gadcon *gc)
gc->custom = EINA_TRUE;
}
-EAPI void
+E_API void
e_gadcon_custom_del(E_Gadcon *gc)
{
E_OBJECT_CHECK(gc);
@@ -376,7 +376,7 @@ e_gadcon_custom_del(E_Gadcon *gc)
gadcons = eina_list_remove(gadcons, gc);
}
-EAPI void
+E_API void
e_gadcon_custom_populate_request(E_Gadcon *gc)
{
E_OBJECT_CHECK(gc);
@@ -392,7 +392,7 @@ e_gadcon_custom_populate_request(E_Gadcon *gc)
custom_populate_requests = eina_list_append(custom_populate_requests, gc);
}
-EAPI E_Gadcon *
+E_API E_Gadcon *
e_gadcon_dummy_new(int id)
{
E_Gadcon *gc;
@@ -410,7 +410,7 @@ e_gadcon_dummy_new(int id)
return gc;
}
-EAPI void
+E_API void
e_gadcon_config_del(E_Gadcon *gc)
{
E_OBJECT_CHECK(gc);
@@ -418,7 +418,7 @@ e_gadcon_config_del(E_Gadcon *gc)
gc->cfg_delete = 1;
}
-EAPI void
+E_API void
e_gadcon_drop_handler_add(E_Gadcon *gc, E_Gadcon_DND_Cb enter, E_Gadcon_DND_Cb leave, E_Gadcon_DND_Cb move, E_Gadcon_DND_Cb drop, int x, int y, int w, int h)
{
const char *drop_types[] = { "enlightenment/gadcon_client" };
@@ -437,7 +437,7 @@ e_gadcon_drop_handler_add(E_Gadcon *gc, E_Gadcon_DND_Cb enter, E_Gadcon_DND_Cb l
gc->dnd_drop_cb = drop;
}
-EAPI E_Gadcon *
+E_API E_Gadcon *
e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, const char *swallow_name)
{
E_Gadcon *gc;
@@ -495,7 +495,7 @@ e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, const char *s
return gc;
}
-EAPI void
+E_API void
e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
{
E_OBJECT_CHECK(gc);
@@ -508,7 +508,7 @@ e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
}
}
-EAPI void
+E_API void
e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data)
{
E_OBJECT_CHECK(gc);
@@ -517,7 +517,7 @@ e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_
gc->min_size_request.data = data;
}
-EAPI void
+E_API void
e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data)
{
E_OBJECT_CHECK(gc);
@@ -526,7 +526,7 @@ e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadc
gc->resize_request.data = data;
}
-EAPI void
+E_API void
e_gadcon_frame_request_callback_set(E_Gadcon *gc, Evas_Object *(*func)(void *data, E_Gadcon_Client * gcc, const char *style), void *data)
{
E_OBJECT_CHECK(gc);
@@ -535,7 +535,7 @@ e_gadcon_frame_request_callback_set(E_Gadcon *gc, Evas_Object *(*func)(void *dat
gc->frame_request.data = data;
}
-EAPI void
+E_API void
e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc), void *data)
{
E_OBJECT_CHECK(gc);
@@ -544,7 +544,7 @@ e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *
gc->populate_class.data = data;
}
-EAPI void
+E_API void
e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy)
{
E_OBJECT_CHECK(gc);
@@ -554,7 +554,7 @@ e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy)
/* FIXME: delete container obj, re-pack all clients */
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_gadcon_populate(E_Gadcon *gc)
{
Eina_List *l;
@@ -588,7 +588,7 @@ e_gadcon_populate(E_Gadcon *gc)
return EINA_TRUE;
}
-EAPI void
+E_API void
e_gadcon_unpopulate(E_Gadcon *gc)
{
E_Gadcon_Client *gcc;
@@ -614,7 +614,7 @@ e_gadcon_unpopulate(E_Gadcon *gc)
if (gc->o_container && (!stopping)) e_gadcon_layout_thaw(gc->o_container);
}
-EAPI void
+E_API void
e_gadcon_repopulate(E_Gadcon *gc)
{
E_OBJECT_CHECK(gc);
@@ -625,7 +625,7 @@ e_gadcon_repopulate(E_Gadcon *gc)
if (gc->o_container) e_gadcon_layout_thaw(gc->o_container);
}
-EAPI void
+E_API void
e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
{
Eina_List *l;
@@ -643,7 +643,7 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
e_gadcon_layout_thaw(gc->o_container);
}
-EAPI void
+E_API void
e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
{
Eina_List *l;
@@ -695,7 +695,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
e_gadcon_layout_thaw(gc->o_container);
}
-EAPI void
+E_API void
e_gadcon_edit_begin(E_Gadcon *gc)
{
Eina_List *l;
@@ -711,7 +711,7 @@ e_gadcon_edit_begin(E_Gadcon *gc)
e_gadcon_layout_thaw(gc->o_container);
}
-EAPI void
+E_API void
e_gadcon_edit_end(E_Gadcon *gc)
{
Eina_List *l;
@@ -727,7 +727,7 @@ e_gadcon_edit_end(E_Gadcon *gc)
e_gadcon_locked_set(gc, 0);
}
-EAPI void
+E_API void
e_gadcon_all_edit_begin(void)
{
Eina_List *l;
@@ -737,7 +737,7 @@ e_gadcon_all_edit_begin(void)
e_gadcon_edit_begin(gc);
}
-EAPI void
+E_API void
e_gadcon_all_edit_end(void)
{
Eina_List *l;
@@ -747,7 +747,7 @@ e_gadcon_all_edit_end(void)
e_gadcon_edit_end(gc);
}
-EAPI void
+E_API void
e_gadcon_zone_set(E_Gadcon *gc, E_Zone *zone)
{
E_OBJECT_CHECK(gc);
@@ -756,7 +756,7 @@ e_gadcon_zone_set(E_Gadcon *gc, E_Zone *zone)
if (gc->cf) gc->cf->zone = zone->num;
}
-EAPI E_Zone *
+E_API E_Zone *
e_gadcon_zone_get(E_Gadcon *gc)
{
E_OBJECT_CHECK_RETURN(gc, NULL);
@@ -766,7 +766,7 @@ e_gadcon_zone_get(E_Gadcon *gc)
return e_win_client_get(gc->toolbar->fwin)->zone;
}
-EAPI void
+E_API void
e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee)
{
E_OBJECT_CHECK(gc);
@@ -774,7 +774,7 @@ e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee)
gc->ecore_evas = ee;
}
-EAPI int
+E_API int
e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h)
{
E_OBJECT_CHECK_RETURN(gc, 0);
@@ -790,7 +790,7 @@ e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h)
return 1;
}
-EAPI void
+E_API void
e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data)
{
E_OBJECT_CHECK(gc);
@@ -799,7 +799,7 @@ e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadc
gc->menu_attach.data = data;
}
-EAPI void
+E_API void
e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), void *data)
{
E_OBJECT_CHECK(gc);
@@ -808,7 +808,7 @@ e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), vo
gc->locked_set.data = data;
}
-EAPI void
+E_API void
e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void *data)
{
E_OBJECT_CHECK(gc);
@@ -817,7 +817,7 @@ e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void
gc->urgent_show.data = data;
}
-EAPI void
+E_API void
e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win)
{
E_OBJECT_CHECK(gc);
@@ -825,7 +825,7 @@ e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win)
gc->dnd_win = win;
}
-EAPI Ecore_X_Window
+E_API Ecore_X_Window
e_gadcon_dnd_window_get(E_Gadcon *gc)
{
E_OBJECT_CHECK_RETURN(gc, 0);
@@ -833,7 +833,7 @@ e_gadcon_dnd_window_get(E_Gadcon *gc)
return gc->dnd_win;
}
-EAPI void
+E_API void
e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win)
{
E_OBJECT_CHECK(gc);
@@ -841,7 +841,7 @@ e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win)
gc->xdnd_win = win;
}
-EAPI Ecore_X_Window
+E_API Ecore_X_Window
e_gadcon_xdnd_window_get(E_Gadcon *gc)
{
E_OBJECT_CHECK_RETURN(gc, 0);
@@ -849,7 +849,7 @@ e_gadcon_xdnd_window_get(E_Gadcon *gc)
return gc->xdnd_win;
}
-EAPI void
+E_API void
e_gadcon_name_set(E_Gadcon *gc, const char *name)
{
if (!gc) return;
@@ -859,7 +859,7 @@ e_gadcon_name_set(E_Gadcon *gc, const char *name)
eina_stringshare_replace(&gc->cf->name, name);
}
-EAPI void
+E_API void
e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf)
{
E_OBJECT_CHECK(gc);
@@ -867,7 +867,7 @@ e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf)
gc->shelf = shelf;
}
-EAPI E_Shelf *
+E_API E_Shelf *
e_gadcon_shelf_get(E_Gadcon *gc)
{
E_OBJECT_CHECK_RETURN(gc, NULL);
@@ -875,7 +875,7 @@ e_gadcon_shelf_get(E_Gadcon *gc)
return gc->shelf;
}
-EAPI void
+E_API void
e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar)
{
E_OBJECT_CHECK(gc);
@@ -883,7 +883,7 @@ e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar)
gc->toolbar = toolbar;
}
-EAPI E_Toolbar *
+E_API E_Toolbar *
e_gadcon_toolbar_get(E_Gadcon *gc)
{
E_OBJECT_CHECK_RETURN(gc, NULL);
@@ -891,7 +891,7 @@ e_gadcon_toolbar_get(E_Gadcon *gc)
return gc->toolbar;
}
-EAPI E_Config_Gadcon_Client *
+E_API E_Config_Gadcon_Client *
e_gadcon_client_config_new(E_Gadcon *gc, const char *name)
{
E_Gadcon_Client_Class *cc;
@@ -948,7 +948,7 @@ e_gadcon_client_config_new(E_Gadcon *gc, const char *name)
return cf_gcc;
}
-EAPI void
+E_API void
e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc)
{
E_Gadcon *gc;
@@ -969,7 +969,7 @@ e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gc
free(cf_gcc);
}
-EAPI E_Gadcon_Client *
+E_API E_Gadcon_Client *
e_gadcon_client_find(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc)
{
E_Gadcon_Client *gcc;
@@ -1008,7 +1008,7 @@ _e_gadcon_client_frame_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
gcc->o_frame = NULL;
}
-EAPI void
+E_API void
e_gadcon_drag_finished_cb(E_Drag *drag, int dropped)
{
E_Gadcon_Client *gcc;
@@ -1039,7 +1039,7 @@ e_gadcon_drag_finished_cb(E_Drag *drag, int dropped)
* @param base_obj the evas object that will show up in the shelf or gadget module
* @return returns pointer to created gadget, on failure returns null
*/
-EAPI E_Gadcon_Client *
+E_API E_Gadcon_Client *
e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id EINA_UNUSED, const char *style, Evas_Object *base_obj)
{
E_Gadcon_Client *gcc;
@@ -1131,7 +1131,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id EINA_UNUSED,
return gcc;
}
-EAPI void
+E_API void
e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
{
Evas_Coord x, y, w, h;
@@ -1226,7 +1226,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
evas_object_show(gcc->o_control);
}
-EAPI void
+E_API void
e_gadcon_client_edit_end(E_Gadcon_Client *gcc)
{
Eina_List *l = NULL;
@@ -1269,7 +1269,7 @@ e_gadcon_client_edit_end(E_Gadcon_Client *gcc)
gcc->gadcon->editing = 0;
}
-EAPI void
+E_API void
e_gadcon_client_show(E_Gadcon_Client *gcc)
{
E_OBJECT_CHECK(gcc);
@@ -1294,7 +1294,7 @@ e_gadcon_client_show(E_Gadcon_Client *gcc)
gcc->hidden = 0;
}
-EAPI void
+E_API void
e_gadcon_client_hide(E_Gadcon_Client *gcc)
{
E_OBJECT_CHECK(gcc);
@@ -1313,7 +1313,7 @@ e_gadcon_client_hide(E_Gadcon_Client *gcc)
gcc->hidden = 1;
}
-EAPI void
+E_API void
e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
{
E_OBJECT_CHECK(gcc);
@@ -1352,7 +1352,7 @@ e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
}
}
-EAPI void
+E_API void
e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
{
E_OBJECT_CHECK(gcc);
@@ -1370,7 +1370,7 @@ e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
_e_gadcon_moveresize_handle(gcc);
}
-EAPI void
+E_API void
e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h)
{
E_OBJECT_CHECK(gcc);
@@ -1391,7 +1391,7 @@ e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h)
_e_gadcon_moveresize_handle(gcc);
}
-EAPI void
+E_API void
e_gadcon_client_autoscroll_toggle_disabled_set(E_Gadcon_Client *gcc, Eina_Bool disable)
{
disable = !!disable;
@@ -1400,7 +1400,7 @@ e_gadcon_client_autoscroll_toggle_disabled_set(E_Gadcon_Client *gcc, Eina_Bool d
if (disable) e_gadcon_client_autoscroll_set(gcc, 1);
}
-EAPI void
+E_API void
e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll)
{
E_OBJECT_CHECK(gcc);
@@ -1451,7 +1451,7 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll)
}
}
-EAPI void
+E_API void
e_gadcon_client_resizable_set(E_Gadcon_Client *gcc EINA_UNUSED, int resizable EINA_UNUSED)
{
E_OBJECT_CHECK(gcc);
@@ -1495,7 +1495,7 @@ e_gadcon_client_resizable_set(E_Gadcon_Client *gcc EINA_UNUSED, int resizable EI
*/
}
-EAPI int
+E_API int
e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h)
{
int gx = 0, gy = 0;
@@ -1510,7 +1510,7 @@ e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *
return 1;
}
-EAPI int
+E_API int
e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h)
{
E_OBJECT_CHECK_RETURN(gcc, 0);
@@ -1529,7 +1529,7 @@ e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int
return 1;
}
-EAPI E_Zone *
+E_API E_Zone *
e_gadcon_client_zone_get(E_Gadcon_Client *gcc)
{
E_OBJECT_CHECK_RETURN(gcc, NULL);
@@ -1669,7 +1669,7 @@ _e_gadcon_gadget_move_to_pre_cb(void *data, E_Menu *m)
_e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_UNKNOWN, &n);
}
-EAPI void
+E_API void
e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu)
{
E_Menu *mn;
@@ -1690,7 +1690,7 @@ e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu)
}
}
-EAPI E_Menu *
+E_API E_Menu *
e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m)
{
E_Menu *ret;
@@ -1708,7 +1708,7 @@ e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m)
return ret;
}
-EAPI E_Menu *
+E_API E_Menu *
e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget, int flags EINA_UNUSED)
{
E_Menu *mo, *menu_main = NULL;
@@ -1839,7 +1839,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget
return menu_main;
}
-EAPI void
+E_API void
e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc)
{
E_OBJECT_CHECK(gcc);
@@ -1876,7 +1876,7 @@ e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc)
}
}
-EAPI void
+E_API void
e_gadcon_locked_set(E_Gadcon *gc, int lock)
{
E_OBJECT_CHECK(gc);
@@ -1885,7 +1885,7 @@ e_gadcon_locked_set(E_Gadcon *gc, int lock)
gc->locked_set.func(gc->locked_set.data, lock);
}
-EAPI void
+E_API void
e_gadcon_urgent_show(E_Gadcon *gc)
{
E_OBJECT_CHECK(gc);
@@ -1897,7 +1897,7 @@ e_gadcon_urgent_show(E_Gadcon *gc)
/*
* NOTE: x & y are relative to the o_box of the gadcon.
*/
-EAPI void
+E_API void
e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, Evas_Coord x, Evas_Coord y)
{
E_OBJECT_CHECK(gcc);
@@ -1933,7 +1933,7 @@ e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, Evas_Coord x, Evas_Coord
}
}
-EAPI void
+E_API void
e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data), void *data)
{
E_OBJECT_CHECK(gcc);
@@ -1942,25 +1942,25 @@ e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data)
gcc->scroll_cb.data = data;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_gadcon_site_is_shelf(E_Gadcon_Site site)
{
return site == E_GADCON_SITE_SHELF;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_gadcon_site_is_desktop(E_Gadcon_Site site)
{
return site == E_GADCON_SITE_DESKTOP;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site)
{
return site == E_GADCON_SITE_EFM_TOOLBAR;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_gadcon_site_is_any_toolbar(E_Gadcon_Site site)
{
switch (site)
@@ -1976,7 +1976,7 @@ e_gadcon_site_is_any_toolbar(E_Gadcon_Site site)
return EINA_FALSE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_gadcon_site_is_not_toolbar(E_Gadcon_Site site)
{
switch (site)
@@ -1992,7 +1992,7 @@ e_gadcon_site_is_not_toolbar(E_Gadcon_Site site)
return EINA_TRUE;
}
-EAPI void
+E_API void
e_gadcon_client_drag_set(E_Gadcon_Client *gcc)
{
Eina_List *l;
@@ -5697,7 +5697,7 @@ _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc)
/* gadgets movement between different gadcons */
-EAPI E_Gadcon_Location *
+E_API E_Gadcon_Location *
e_gadcon_location_new(const char *name,
E_Gadcon_Site site,
int (*add_func)(void *data, E_Gadcon_Client *gcc, const E_Gadcon_Client_Class *cc),
@@ -5718,7 +5718,7 @@ e_gadcon_location_new(const char *name,
return loc;
}
-EAPI void
+E_API void
e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name)
{
if (loc->icon_name) eina_stringshare_del(loc->icon_name);
@@ -5728,7 +5728,7 @@ e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name)
loc->icon_name = NULL;
}
-EAPI void
+E_API void
e_gadcon_location_free(E_Gadcon_Location *loc)
{
eina_stringshare_del(loc->name);
@@ -5736,13 +5736,13 @@ e_gadcon_location_free(E_Gadcon_Location *loc)
free(loc);
}
-EAPI void
+E_API void
e_gadcon_location_register(E_Gadcon_Location *loc)
{
gadcon_locations = eina_list_append(gadcon_locations, loc);
}
-EAPI void
+E_API void
e_gadcon_location_unregister(E_Gadcon_Location *loc)
{
gadcon_locations = eina_list_remove(gadcon_locations, loc);
@@ -5761,7 +5761,7 @@ _e_gadcon_location_change(E_Gadcon_Client *gcc, E_Gadcon_Location *src, E_Gadcon
return 1;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_gadcon_client_visible_get(const E_Gadcon_Client *gcc, const E_Desk *desk)
{
const Eina_List *l;
diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h
index 87a02e750..71485d9dc 100644
--- a/src/bin/e_gadcon.h
+++ b/src/bin/e_gadcon.h
@@ -61,11 +61,11 @@ typedef void (*E_Gadcon_DND_Cb)(E_Gadcon*, E_Gadcon_Client*);
#define E_GADCON_DUMMY_TYPE 0xE0b01016
#define E_GADCON_CLIENT_TYPE 0xE0b01007
-EAPI extern int E_EVENT_GADCON_CLIENT_ADD;
-EAPI extern int E_EVENT_GADCON_CLIENT_DEL;
-EAPI extern int E_EVENT_GADCON_CLIENT_CLASS_ADD;
-EAPI extern int E_EVENT_GADCON_CLIENT_CLASS_DEL;
-EAPI extern int E_EVENT_GADCON_POPULATE;
+E_API extern int E_EVENT_GADCON_CLIENT_ADD;
+E_API extern int E_EVENT_GADCON_CLIENT_DEL;
+E_API extern int E_EVENT_GADCON_CLIENT_CLASS_ADD;
+E_API extern int E_EVENT_GADCON_CLIENT_CLASS_DEL;
+E_API extern int E_EVENT_GADCON_POPULATE;
struct _E_Gadcon
{
@@ -274,99 +274,99 @@ struct _E_Gadcon_Location
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);
-EAPI E_Gadcon *e_gadcon_dummy_new(int id);
-EAPI void e_gadcon_drop_handler_add(E_Gadcon *gc, E_Gadcon_DND_Cb enter, E_Gadcon_DND_Cb leave, E_Gadcon_DND_Cb move, E_Gadcon_DND_Cb drop, int x, int y, int w, int h);
-EAPI void e_gadcon_config_del(E_Gadcon *gc);
-EAPI E_Gadcon *e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, const char *swallow_name);
-EAPI void e_gadcon_custom_new(E_Gadcon *gc);
-EAPI void e_gadcon_custom_del(E_Gadcon *gc);
-EAPI void e_gadcon_custom_populate_request(E_Gadcon *gc);
-EAPI void e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
-EAPI void e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data);
-EAPI void e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data);
-EAPI void e_gadcon_frame_request_callback_set(E_Gadcon * gc, Evas_Object * (*func)(void *data, E_Gadcon_Client * gcc, const char *style), void *data);
-EAPI void e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc), void *data);
-EAPI void e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy);
-EAPI Eina_Bool e_gadcon_populate(E_Gadcon *gc);
-EAPI void e_gadcon_unpopulate(E_Gadcon *gc);
-EAPI void e_gadcon_repopulate(E_Gadcon *gc);
-EAPI void e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc);
-EAPI void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient);
-EAPI void e_gadcon_edit_begin(E_Gadcon *gc);
-EAPI void e_gadcon_edit_end(E_Gadcon *gc);
-EAPI void e_gadcon_all_edit_begin(void);
-EAPI void e_gadcon_all_edit_end(void);
-EAPI void e_gadcon_zone_set(E_Gadcon *gc, E_Zone *zone);
-EAPI E_Zone *e_gadcon_zone_get(E_Gadcon *gc);
-EAPI void e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee);
-EAPI int e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h);
-EAPI void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data);
-EAPI void e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), void *data);
-EAPI void e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void *data);
-EAPI void e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win);
-EAPI Ecore_X_Window e_gadcon_dnd_window_get(E_Gadcon *gc);
-EAPI void e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win);
-EAPI Ecore_X_Window e_gadcon_xdnd_window_get(E_Gadcon *gc);
-EAPI void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf);
-EAPI E_Shelf *e_gadcon_shelf_get(E_Gadcon *gc);
-EAPI void e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar);
-EAPI E_Toolbar *e_gadcon_toolbar_get(E_Gadcon *gc);
-EAPI E_Gadcon_Client *e_gadcon_client_find(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc);
-EAPI E_Config_Gadcon_Client *e_gadcon_client_config_new(E_Gadcon *gc, const char *name);
-EAPI void e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc);
-EAPI E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *style, Evas_Object *base_obj);
-EAPI void e_gadcon_client_edit_begin(E_Gadcon_Client *gcc);
-EAPI void e_gadcon_client_edit_end(E_Gadcon_Client *gcc);
-EAPI void e_gadcon_client_queue(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc);
-EAPI void e_gadcon_client_show(E_Gadcon_Client *gcc);
-EAPI void e_gadcon_client_hide(E_Gadcon_Client *gcc);
-EAPI void e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h);
-EAPI void e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h);
-EAPI void e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h);
-EAPI void e_gadcon_client_autoscroll_toggle_disabled_set(E_Gadcon_Client *gcc, Eina_Bool disable);
-EAPI void e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll);
-EAPI void e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, int mx, int my);
-EAPI void e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data), void *data);
-EAPI void e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable);
-EAPI int e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h);
-EAPI int e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h);
-EAPI E_Zone *e_gadcon_client_zone_get(E_Gadcon_Client *gcc);
-EAPI E_Menu *e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m);
-EAPI E_Menu *e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget, int flags);
-EAPI void e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc);
-EAPI void e_gadcon_locked_set(E_Gadcon *gc, int lock);
-EAPI void e_gadcon_urgent_show(E_Gadcon *gc);
-EAPI void e_gadcon_name_set(E_Gadcon *gc, const char *name);
+E_API void e_gadcon_provider_register(const E_Gadcon_Client_Class *cc);
+E_API void e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc);
+E_API Eina_List *e_gadcon_provider_list(void);
+E_API E_Gadcon *e_gadcon_dummy_new(int id);
+E_API void e_gadcon_drop_handler_add(E_Gadcon *gc, E_Gadcon_DND_Cb enter, E_Gadcon_DND_Cb leave, E_Gadcon_DND_Cb move, E_Gadcon_DND_Cb drop, int x, int y, int w, int h);
+E_API void e_gadcon_config_del(E_Gadcon *gc);
+E_API E_Gadcon *e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, const char *swallow_name);
+E_API void e_gadcon_custom_new(E_Gadcon *gc);
+E_API void e_gadcon_custom_del(E_Gadcon *gc);
+E_API void e_gadcon_custom_populate_request(E_Gadcon *gc);
+E_API void e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
+E_API void e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data);
+E_API void e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data);
+E_API void e_gadcon_frame_request_callback_set(E_Gadcon * gc, Evas_Object * (*func)(void *data, E_Gadcon_Client * gcc, const char *style), void *data);
+E_API void e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc), void *data);
+E_API void e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy);
+E_API Eina_Bool e_gadcon_populate(E_Gadcon *gc);
+E_API void e_gadcon_unpopulate(E_Gadcon *gc);
+E_API void e_gadcon_repopulate(E_Gadcon *gc);
+E_API void e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc);
+E_API void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient);
+E_API void e_gadcon_edit_begin(E_Gadcon *gc);
+E_API void e_gadcon_edit_end(E_Gadcon *gc);
+E_API void e_gadcon_all_edit_begin(void);
+E_API void e_gadcon_all_edit_end(void);
+E_API void e_gadcon_zone_set(E_Gadcon *gc, E_Zone *zone);
+E_API E_Zone *e_gadcon_zone_get(E_Gadcon *gc);
+E_API void e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee);
+E_API int e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h);
+E_API void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data);
+E_API void e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), void *data);
+E_API void e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void *data);
+E_API void e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win);
+E_API Ecore_X_Window e_gadcon_dnd_window_get(E_Gadcon *gc);
+E_API void e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win);
+E_API Ecore_X_Window e_gadcon_xdnd_window_get(E_Gadcon *gc);
+E_API void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf);
+E_API E_Shelf *e_gadcon_shelf_get(E_Gadcon *gc);
+E_API void e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar);
+E_API E_Toolbar *e_gadcon_toolbar_get(E_Gadcon *gc);
+E_API E_Gadcon_Client *e_gadcon_client_find(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc);
+E_API E_Config_Gadcon_Client *e_gadcon_client_config_new(E_Gadcon *gc, const char *name);
+E_API void e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc);
+E_API E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *style, Evas_Object *base_obj);
+E_API void e_gadcon_client_edit_begin(E_Gadcon_Client *gcc);
+E_API void e_gadcon_client_edit_end(E_Gadcon_Client *gcc);
+E_API void e_gadcon_client_queue(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc);
+E_API void e_gadcon_client_show(E_Gadcon_Client *gcc);
+E_API void e_gadcon_client_hide(E_Gadcon_Client *gcc);
+E_API void e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h);
+E_API void e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h);
+E_API void e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h);
+E_API void e_gadcon_client_autoscroll_toggle_disabled_set(E_Gadcon_Client *gcc, Eina_Bool disable);
+E_API void e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll);
+E_API void e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, int mx, int my);
+E_API void e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data), void *data);
+E_API void e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable);
+E_API int e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h);
+E_API int e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h);
+E_API E_Zone *e_gadcon_client_zone_get(E_Gadcon_Client *gcc);
+E_API E_Menu *e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m);
+E_API E_Menu *e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget, int flags);
+E_API void e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc);
+E_API void e_gadcon_locked_set(E_Gadcon *gc, int lock);
+E_API void e_gadcon_urgent_show(E_Gadcon *gc);
+E_API void e_gadcon_name_set(E_Gadcon *gc, const char *name);
/* site helpers */
-EAPI Eina_Bool e_gadcon_site_is_shelf(E_Gadcon_Site site);
-EAPI Eina_Bool e_gadcon_site_is_desktop(E_Gadcon_Site site);
-EAPI Eina_Bool e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site);
+E_API Eina_Bool e_gadcon_site_is_shelf(E_Gadcon_Site site);
+E_API Eina_Bool e_gadcon_site_is_desktop(E_Gadcon_Site site);
+E_API Eina_Bool e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site);
-EAPI Eina_Bool e_gadcon_site_is_any_toolbar(E_Gadcon_Site site); // all toolbar sities
-EAPI Eina_Bool e_gadcon_site_is_not_toolbar(E_Gadcon_Site site); // all non-toolbar sities
+E_API Eina_Bool e_gadcon_site_is_any_toolbar(E_Gadcon_Site site); // all toolbar sities
+E_API Eina_Bool e_gadcon_site_is_not_toolbar(E_Gadcon_Site site); // all non-toolbar sities
/* location helpers */
-EAPI E_Gadcon_Location *
+E_API E_Gadcon_Location *
e_gadcon_location_new(const char *name, E_Gadcon_Site site,
int (*add_func)(void *data, E_Gadcon_Client *, const E_Gadcon_Client_Class *cc),
void *add_data,
void (*remove_func)(void *data, E_Gadcon_Client *cc),
void *remove_data);
-EAPI void e_gadcon_location_free(E_Gadcon_Location *loc);
-EAPI void e_gadcon_location_register(E_Gadcon_Location *loc);
-EAPI void e_gadcon_location_unregister(E_Gadcon_Location *loc);
-EAPI void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name);
-EAPI void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu);
-EAPI void e_gadcon_drag_finished_cb(E_Drag *drag, int dropped);
-EAPI void e_gadcon_client_drag_set(E_Gadcon_Client *gcc);
-
-EAPI Eina_Bool e_gadcon_client_visible_get(const E_Gadcon_Client *gcc, const E_Desk *desk);
+E_API void e_gadcon_location_free(E_Gadcon_Location *loc);
+E_API void e_gadcon_location_register(E_Gadcon_Location *loc);
+E_API void e_gadcon_location_unregister(E_Gadcon_Location *loc);
+E_API void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name);
+E_API void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu);
+E_API void e_gadcon_drag_finished_cb(E_Drag *drag, int dropped);
+E_API void e_gadcon_client_drag_set(E_Gadcon_Client *gcc);
+
+E_API Eina_Bool e_gadcon_client_visible_get(const E_Gadcon_Client *gcc, const E_Desk *desk);
#define GADCON_CLIENT_CONFIG_GET(_type, _items, _gc_class, _id) \
if (!_id) \
diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c
index 836f06180..268c09335 100644
--- a/src/bin/e_gadcon_popup.c
+++ b/src/bin/e_gadcon_popup.c
@@ -204,7 +204,7 @@ _e_gadcon_popup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *
/* externally accessible functions */
-EAPI E_Gadcon_Popup *
+E_API E_Gadcon_Popup *
e_gadcon_popup_new(E_Gadcon_Client *gcc, Eina_Bool noshadow)
{
E_Gadcon_Popup *pop;
@@ -231,7 +231,7 @@ e_gadcon_popup_new(E_Gadcon_Client *gcc, Eina_Bool noshadow)
return pop;
}
-EAPI void
+E_API void
e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o)
{
Evas_Object *old_o;
@@ -258,7 +258,7 @@ e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o)
_e_gadcon_popup_size_recalc(pop, o);
}
-EAPI void
+E_API void
e_gadcon_popup_show(E_Gadcon_Popup *pop)
{
E_OBJECT_CHECK(pop);
@@ -275,7 +275,7 @@ e_gadcon_popup_show(E_Gadcon_Popup *pop)
pop->visible = EINA_TRUE;
}
-EAPI void
+E_API void
e_gadcon_popup_hide(E_Gadcon_Popup *pop)
{
E_OBJECT_CHECK(pop);
@@ -287,7 +287,7 @@ e_gadcon_popup_hide(E_Gadcon_Popup *pop)
pop->visible = EINA_FALSE;
}
-EAPI void
+E_API void
e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop)
{
if (!pop) return;
@@ -306,7 +306,7 @@ e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop)
}
}
-EAPI void
+E_API void
e_gadcon_popup_lock_set(E_Gadcon_Popup *pop, Eina_Bool setting)
{
E_OBJECT_CHECK(pop);
diff --git a/src/bin/e_gadcon_popup.h b/src/bin/e_gadcon_popup.h
index bb5c0c5c8..4914ddc50 100644
--- a/src/bin/e_gadcon_popup.h
+++ b/src/bin/e_gadcon_popup.h
@@ -25,12 +25,12 @@ struct _E_Gadcon_Popup
Eina_Bool visible : 1;
};
-EAPI E_Gadcon_Popup *e_gadcon_popup_new(E_Gadcon_Client *gcc, Eina_Bool noshadow);
-EAPI void e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o);
-EAPI void e_gadcon_popup_show(E_Gadcon_Popup *pop);
-EAPI void e_gadcon_popup_hide(E_Gadcon_Popup *pop);
-EAPI void e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop);
-EAPI void e_gadcon_popup_lock_set(E_Gadcon_Popup *pop, Eina_Bool setting);
+E_API E_Gadcon_Popup *e_gadcon_popup_new(E_Gadcon_Client *gcc, Eina_Bool noshadow);
+E_API void e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o);
+E_API void e_gadcon_popup_show(E_Gadcon_Popup *pop);
+E_API void e_gadcon_popup_hide(E_Gadcon_Popup *pop);
+E_API void e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop);
+E_API void e_gadcon_popup_lock_set(E_Gadcon_Popup *pop, Eina_Bool setting);
#endif
#endif
diff --git a/src/bin/e_grab_dialog.c b/src/bin/e_grab_dialog.c
index ee1657f2e..db533fe72 100644
--- a/src/bin/e_grab_dialog.c
+++ b/src/bin/e_grab_dialog.c
@@ -96,7 +96,7 @@ _e_grab_dialog_dia_del(void *data)
e_object_del(dia->data);
}
-EAPI E_Grab_Dialog *
+E_API E_Grab_Dialog *
e_grab_dialog_show(Evas_Object *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key, Ecore_Event_Handler_Cb mouse, Ecore_Event_Handler_Cb wheel, const void *data)
{
E_Grab_Dialog *eg;
diff --git a/src/bin/e_grab_dialog.h b/src/bin/e_grab_dialog.h
index d3adcc2b9..e82e5b5b9 100644
--- a/src/bin/e_grab_dialog.h
+++ b/src/bin/e_grab_dialog.h
@@ -21,7 +21,7 @@ struct _E_Grab_Dialog
void *data;
};
-EAPI E_Grab_Dialog *e_grab_dialog_show(Evas_Object *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key, Ecore_Event_Handler_Cb mouse, Ecore_Event_Handler_Cb wheel, const void *data);
+E_API E_Grab_Dialog *e_grab_dialog_show(Evas_Object *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key, Ecore_Event_Handler_Cb mouse, Ecore_Event_Handler_Cb wheel, const void *data);
#endif
#endif
diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c
index 7c42db76a..de78c09f2 100644
--- a/src/bin/e_grabinput.c
+++ b/src/bin/e_grabinput.c
@@ -33,7 +33,7 @@ e_grabinput_shutdown(void)
return 1;
}
-EAPI int
+E_API int
e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
{
if (grab_mouse_win)
@@ -118,7 +118,7 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
return 1;
}
-EAPI void
+E_API void
e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win)
{
if (mouse_win == grab_mouse_win)
@@ -154,7 +154,7 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win)
}
}
-EAPI void
+E_API void
e_grabinput_focus(Ecore_Window win, E_Focus_Method method)
{
if (grab_key_win != 0)
@@ -170,25 +170,25 @@ e_grabinput_focus(Ecore_Window win, E_Focus_Method method)
}
}
-EAPI double
+E_API double
e_grabinput_last_focus_time_get(void)
{
return last_focus_time;
}
-EAPI Ecore_Window
+E_API Ecore_Window
e_grabinput_last_focus_win_get(void)
{
return focus_fix_win;
}
-EAPI Ecore_Window
+E_API Ecore_Window
e_grabinput_key_win_get(void)
{
return grab_key_win;
}
-EAPI Ecore_Window
+E_API Ecore_Window
e_grabinput_mouse_win_get(void)
{
return grab_mouse_win;
diff --git a/src/bin/e_grabinput.h b/src/bin/e_grabinput.h
index 8d3732e9a..5dabb8118 100644
--- a/src/bin/e_grabinput.h
+++ b/src/bin/e_grabinput.h
@@ -14,13 +14,13 @@ typedef enum _E_Focus_Method
EINTERN int e_grabinput_init(void);
EINTERN int e_grabinput_shutdown(void);
-EAPI int e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win);
-EAPI void e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win);
-EAPI void e_grabinput_focus(Ecore_Window win, E_Focus_Method method);
-EAPI double e_grabinput_last_focus_time_get(void);
-EAPI Ecore_Window e_grabinput_last_focus_win_get(void);
-EAPI Ecore_Window e_grabinput_key_win_get(void);
-EAPI Ecore_Window e_grabinput_mouse_win_get(void);
+E_API int e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win);
+E_API void e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win);
+E_API void e_grabinput_focus(Ecore_Window win, E_Focus_Method method);
+E_API double e_grabinput_last_focus_time_get(void);
+E_API Ecore_Window e_grabinput_last_focus_win_get(void);
+E_API Ecore_Window e_grabinput_key_win_get(void);
+E_API Ecore_Window e_grabinput_mouse_win_get(void);
#endif
#endif
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 443d1c229..29f8cc1d1 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -6,15 +6,15 @@ static void e_hints_e16_comms_pretend(Ecore_X_Window root, Ecore_X_Window propwi
static void e_hints_openoffice_gnome_fake(Ecore_Window root);
//static void e_hints_openoffice_kde_fake(Ecore_Window root);
-EAPI Ecore_X_Atom ATM__QTOPIA_SOFT_MENU = 0;
-EAPI Ecore_X_Atom ATM__QTOPIA_SOFT_MENUS = 0;
-EAPI Ecore_X_Atom ATM_GNOME_SM_PROXY = 0;
-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 Ecore_X_Atom ATM_NETWM_SHOW_WINDOW_MENU = 0;
-EAPI Ecore_X_Atom ATM_NETWM_PERFORM_BUTTON_ACTION = 0;
+E_API Ecore_X_Atom ATM__QTOPIA_SOFT_MENU = 0;
+E_API Ecore_X_Atom ATM__QTOPIA_SOFT_MENUS = 0;
+E_API Ecore_X_Atom ATM_GNOME_SM_PROXY = 0;
+E_API Ecore_X_Atom ATM_ENLIGHTENMENT_COMMS = 0;
+E_API Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION = 0;
+E_API Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE = 0;
+
+E_API Ecore_X_Atom ATM_NETWM_SHOW_WINDOW_MENU = 0;
+E_API Ecore_X_Atom ATM_NETWM_PERFORM_BUTTON_ACTION = 0;
#endif
EINTERN void
@@ -294,7 +294,7 @@ e_hints_manager_init(E_Manager *man)
}
#endif
-EAPI void
+E_API void
e_hints_client_list_set(void)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -323,7 +323,7 @@ e_hints_client_list_set(void)
/* Client list is already in stacking order, so this function is nearly
* identical to the previous one */
-EAPI void
+E_API void
e_hints_client_stacking_set(void)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -382,7 +382,7 @@ e_hints_client_stacking_set(void)
#endif
}
-EAPI void
+E_API void
e_hints_active_window_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -573,7 +573,7 @@ e_hints_window_init(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_state_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -633,7 +633,7 @@ e_hints_window_state_set(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_allowed_action_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -668,7 +668,7 @@ e_hints_allowed_action_set(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_type_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -679,7 +679,7 @@ e_hints_window_type_set(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_type_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -729,7 +729,7 @@ e_hints_window_type_get(E_Client *ec)
}
#ifdef E_COMP_X_H
-EAPI void
+E_API void
e_hints_window_state_update(E_Client *ec, int state, int action)
{
if (!e_pixmap_is_x(ec->pixmap)) return;
@@ -994,7 +994,7 @@ e_hints_window_state_update(E_Client *ec, int state, int action)
}
#endif
-EAPI void
+E_API void
e_hints_window_state_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1084,7 +1084,7 @@ e_hints_window_state_get(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_allowed_action_update(E_Client *ec, int action)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1133,7 +1133,7 @@ e_hints_allowed_action_update(E_Client *ec, int action)
#endif
}
-EAPI void
+E_API void
e_hints_allowed_action_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1228,7 +1228,7 @@ _e_hints_process_wakeup(E_Client *ec)
}
#endif
-EAPI void
+E_API void
e_hints_window_visible_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1248,7 +1248,7 @@ e_hints_window_visible_set(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_iconic_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1268,7 +1268,7 @@ e_hints_window_iconic_set(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_hidden_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1288,7 +1288,7 @@ e_hints_window_hidden_set(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_shaded_set(E_Client *ec, int on)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1316,7 +1316,7 @@ e_hints_window_shaded_set(E_Client *ec, int on)
#endif
}
-EAPI void
+E_API void
e_hints_window_shade_direction_set(E_Client *ec, E_Direction dir)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1328,7 +1328,7 @@ e_hints_window_shade_direction_set(E_Client *ec, E_Direction dir)
#endif
}
-EAPI E_Direction
+E_API E_Direction
e_hints_window_shade_direction_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1347,7 +1347,7 @@ e_hints_window_shade_direction_get(E_Client *ec)
return E_DIRECTION_UP;
}
-EAPI void
+E_API void
e_hints_window_size_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1364,7 +1364,7 @@ e_hints_window_size_set(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_size_unset(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1375,7 +1375,7 @@ e_hints_window_size_unset(E_Client *ec)
#endif
}
-EAPI int
+E_API int
e_hints_window_size_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1400,7 +1400,7 @@ e_hints_window_size_get(E_Client *ec)
return 1;
}
-EAPI void
+E_API void
e_hints_window_maximized_set(E_Client *ec, int horizontal, int vertical)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1436,7 +1436,7 @@ e_hints_window_maximized_set(E_Client *ec, int horizontal, int vertical)
#endif
}
-EAPI void
+E_API void
e_hints_window_fullscreen_set(E_Client *ec,
int on)
{
@@ -1460,7 +1460,7 @@ e_hints_window_fullscreen_set(E_Client *ec,
#endif
}
-EAPI void
+E_API void
e_hints_window_sticky_set(E_Client *ec, int on)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1483,7 +1483,7 @@ e_hints_window_sticky_set(E_Client *ec, int on)
#endif
}
-EAPI void
+E_API void
e_hints_window_stacking_set(E_Client *ec, E_Stacking stacking)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1498,7 +1498,7 @@ e_hints_window_stacking_set(E_Client *ec, E_Stacking stacking)
#endif
}
-EAPI void
+E_API void
e_hints_window_desktop_set(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1526,7 +1526,7 @@ e_hints_window_desktop_set(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_e_state_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1556,13 +1556,13 @@ e_hints_window_e_state_get(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_e_state_set(E_Client *ec EINA_UNUSED)
{
/* TODO */
}
-EAPI void
+E_API void
e_hints_window_qtopia_soft_menu_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1578,7 +1578,7 @@ e_hints_window_qtopia_soft_menu_get(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_qtopia_soft_menus_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1594,7 +1594,7 @@ e_hints_window_qtopia_soft_menus_get(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_virtual_keyboard_state_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1613,7 +1613,7 @@ e_hints_window_virtual_keyboard_state_get(E_Client *ec)
#endif
}
-EAPI void
+E_API void
e_hints_window_virtual_keyboard_get(E_Client *ec)
{
#ifdef HAVE_WAYLAND_ONLY
@@ -1652,7 +1652,7 @@ e_hints_openoffice_kde_fake(Ecore_Window root)
}
#endif
-EAPI void
+E_API void
e_hints_scale_update(void)
{
#ifdef HAVE_WAYLAND_ONLY
diff --git a/src/bin/e_hints.h b/src/bin/e_hints.h
index 72f33858c..7e81e4020 100644
--- a/src/bin/e_hints.h
+++ b/src/bin/e_hints.h
@@ -5,58 +5,58 @@
EINTERN void e_hints_init(Ecore_Window win, Ecore_Window propwin);
//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);
+E_API void e_hints_client_list_set(void);
+E_API void e_hints_client_stacking_set(void);
-EAPI void e_hints_active_window_set(E_Client *ec);
+E_API void e_hints_active_window_set(E_Client *ec);
EINTERN void e_hints_window_init(E_Client *ec);
-EAPI void e_hints_window_state_set(E_Client *ec);
-EAPI void e_hints_window_state_get(E_Client *ec);
-EAPI void e_hints_window_type_set(E_Client *ec);
-EAPI void e_hints_window_type_get(E_Client *ec);
+E_API void e_hints_window_state_set(E_Client *ec);
+E_API void e_hints_window_state_get(E_Client *ec);
+E_API void e_hints_window_type_set(E_Client *ec);
+E_API void e_hints_window_type_get(E_Client *ec);
-EAPI void e_hints_window_visible_set(E_Client *ec);
-EAPI void e_hints_window_iconic_set(E_Client *ec);
-EAPI void e_hints_window_hidden_set(E_Client *ec);
+E_API void e_hints_window_visible_set(E_Client *ec);
+E_API void e_hints_window_iconic_set(E_Client *ec);
+E_API void e_hints_window_hidden_set(E_Client *ec);
-EAPI void e_hints_window_shade_direction_set(E_Client *ec, E_Direction dir);
-EAPI E_Direction e_hints_window_shade_direction_get(E_Client *ec);
+E_API void e_hints_window_shade_direction_set(E_Client *ec, E_Direction dir);
+E_API E_Direction e_hints_window_shade_direction_get(E_Client *ec);
-EAPI void e_hints_window_size_set(E_Client *ec);
-EAPI void e_hints_window_size_unset(E_Client *ec);
-EAPI int e_hints_window_size_get(E_Client *ec);
+E_API void e_hints_window_size_set(E_Client *ec);
+E_API void e_hints_window_size_unset(E_Client *ec);
+E_API int e_hints_window_size_get(E_Client *ec);
-EAPI void e_hints_window_shaded_set(E_Client *ec, int on);
-EAPI void e_hints_window_maximized_set(E_Client *ec, int horizontal, int vertical);
-EAPI void e_hints_window_fullscreen_set(E_Client *ec, int on);
-EAPI void e_hints_window_sticky_set(E_Client *ec, int on);
-EAPI void e_hints_window_stacking_set(E_Client *ec, E_Stacking stacking);
-EAPI void e_hints_window_desktop_set(E_Client *ec);
+E_API void e_hints_window_shaded_set(E_Client *ec, int on);
+E_API void e_hints_window_maximized_set(E_Client *ec, int horizontal, int vertical);
+E_API void e_hints_window_fullscreen_set(E_Client *ec, int on);
+E_API void e_hints_window_sticky_set(E_Client *ec, int on);
+E_API void e_hints_window_stacking_set(E_Client *ec, E_Stacking stacking);
+E_API void e_hints_window_desktop_set(E_Client *ec);
-EAPI void e_hints_window_e_state_set(E_Client *ec);
-EAPI void e_hints_window_e_state_get(E_Client *ec);
+E_API void e_hints_window_e_state_set(E_Client *ec);
+E_API void e_hints_window_e_state_get(E_Client *ec);
-EAPI void e_hints_window_qtopia_soft_menu_get(E_Client *ec);
-EAPI void e_hints_window_qtopia_soft_menus_get(E_Client *ec);
+E_API void e_hints_window_qtopia_soft_menu_get(E_Client *ec);
+E_API void e_hints_window_qtopia_soft_menus_get(E_Client *ec);
-EAPI void e_hints_window_virtual_keyboard_state_get(E_Client *ec);
-EAPI void e_hints_window_virtual_keyboard_get(E_Client *ec);
+E_API void e_hints_window_virtual_keyboard_state_get(E_Client *ec);
+E_API void e_hints_window_virtual_keyboard_get(E_Client *ec);
-EAPI void e_hints_scale_update(void);
+E_API void e_hints_scale_update(void);
#ifdef E_COMP_X_H
-EAPI void e_hints_window_state_update(E_Client *ec, int state, int action);
-extern EAPI Ecore_X_Atom ATM__QTOPIA_SOFT_MENU;
-extern EAPI Ecore_X_Atom ATM__QTOPIA_SOFT_MENUS;
-extern EAPI Ecore_X_Atom ATM_GNOME_SM_PROXY;
-extern EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_COMMS;
-extern EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION;
-extern EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE;
-extern EAPI Ecore_X_Atom ATM_NETWM_SHOW_WINDOW_MENU;
-extern EAPI Ecore_X_Atom ATM_NETWM_PERFORM_BUTTON_ACTION;
+E_API void e_hints_window_state_update(E_Client *ec, int state, int action);
+extern E_API Ecore_X_Atom ATM__QTOPIA_SOFT_MENU;
+extern E_API Ecore_X_Atom ATM__QTOPIA_SOFT_MENUS;
+extern E_API Ecore_X_Atom ATM_GNOME_SM_PROXY;
+extern E_API Ecore_X_Atom ATM_ENLIGHTENMENT_COMMS;
+extern E_API Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION;
+extern E_API Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE;
+extern E_API Ecore_X_Atom ATM_NETWM_SHOW_WINDOW_MENU;
+extern E_API Ecore_X_Atom ATM_NETWM_PERFORM_BUTTON_ACTION;
#endif
#endif
#endif
diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c
index bf7e7ba0d..ab60380eb 100644
--- a/src/bin/e_icon.c
+++ b/src/bin/e_icon.c
@@ -151,7 +151,7 @@ e_icon_shutdown(void)
}
/* externally accessible functions */
-EAPI Evas_Object *
+E_API Evas_Object *
e_icon_add(Evas *evas)
{
_e_icon_smart_init();
@@ -217,7 +217,7 @@ _handle_anim(E_Smart_Data *sd)
return 1;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_file_set(Evas_Object *obj, const char *file)
{
E_Smart_Data *sd;
@@ -297,7 +297,7 @@ e_icon_file_set(Evas_Object *obj, const char *file)
return EINA_TRUE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_file_key_set(Evas_Object *obj, const char *file, const char *key)
{
E_Smart_Data *sd;
@@ -343,7 +343,7 @@ e_icon_file_key_set(Evas_Object *obj, const char *file, const char *key)
return EINA_TRUE;
}
-EAPI void
+E_API void
e_icon_edje_object_set(Evas_Object *obj, Evas_Object *edje)
{
E_Smart_Data *sd;
@@ -374,7 +374,7 @@ e_icon_edje_object_set(Evas_Object *obj, Evas_Object *edje)
_e_icon_smart_reconfigure(sd);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_icon_edje_get(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -385,7 +385,7 @@ e_icon_edje_get(Evas_Object *obj)
return sd->edje ? sd->obj : NULL;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_file_edje_set(Evas_Object *obj, const char *file, const char *part)
{
E_Smart_Data *sd;
@@ -421,7 +421,7 @@ e_icon_file_edje_set(Evas_Object *obj, const char *file, const char *part)
return EINA_TRUE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
{
E_Smart_Data *sd;
@@ -478,7 +478,7 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
return EINA_TRUE;
}
-EAPI void
+E_API void
e_icon_image_object_set(Evas_Object *obj, Evas_Object *o)
{
E_Smart_Data *sd;
@@ -508,7 +508,7 @@ e_icon_image_object_set(Evas_Object *obj, Evas_Object *o)
_e_icon_smart_reconfigure(sd);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_file_get(const Evas_Object *obj, const char **file, const char **group)
{
E_Smart_Data *sd;
@@ -534,7 +534,7 @@ e_icon_file_get(const Evas_Object *obj, const char **file, const char **group)
return file || group;
}
-EAPI void
+E_API void
e_icon_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth)
{
E_Smart_Data *sd;
@@ -545,7 +545,7 @@ e_icon_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth)
evas_object_image_smooth_scale_set(sd->obj, smooth);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_smooth_scale_get(const Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -557,7 +557,7 @@ e_icon_smooth_scale_get(const Evas_Object *obj)
return evas_object_image_smooth_scale_get(sd->obj);
}
-EAPI void
+E_API void
e_icon_alpha_set(Evas_Object *obj, Eina_Bool alpha)
{
E_Smart_Data *sd;
@@ -568,7 +568,7 @@ e_icon_alpha_set(Evas_Object *obj, Eina_Bool alpha)
evas_object_image_alpha_set(sd->obj, alpha);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_alpha_get(const Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -579,7 +579,7 @@ e_icon_alpha_get(const Evas_Object *obj)
return evas_object_image_alpha_get(sd->obj);
}
-EAPI void
+E_API void
e_icon_preload_set(Evas_Object *obj, Eina_Bool preload)
{
E_Smart_Data *sd;
@@ -589,7 +589,7 @@ e_icon_preload_set(Evas_Object *obj, Eina_Bool preload)
sd->preload = preload;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_preload_get(const Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -599,7 +599,7 @@ e_icon_preload_get(const Evas_Object *obj)
return sd->preload;
}
-EAPI void
+E_API void
e_icon_size_get(const Evas_Object *obj, int *w, int *h)
{
E_Smart_Data *sd;
@@ -617,7 +617,7 @@ e_icon_size_get(const Evas_Object *obj, int *w, int *h)
evas_object_image_size_get(sd->obj, w, h);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_fill_inside_get(const Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -627,7 +627,7 @@ e_icon_fill_inside_get(const Evas_Object *obj)
return sd->fill_inside;
}
-EAPI void
+E_API void
e_icon_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside)
{
E_Smart_Data *sd;
@@ -640,7 +640,7 @@ e_icon_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside)
_e_icon_smart_reconfigure(sd);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_icon_scale_up_get(const Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -650,7 +650,7 @@ e_icon_scale_up_get(const Evas_Object *obj)
return sd->scale_up;
}
-EAPI void
+E_API void
e_icon_scale_up_set(Evas_Object *obj, Eina_Bool scale_up)
{
E_Smart_Data *sd;
@@ -663,7 +663,7 @@ e_icon_scale_up_set(Evas_Object *obj, Eina_Bool scale_up)
_e_icon_smart_reconfigure(sd);
}
-EAPI void
+E_API void
e_icon_data_set(Evas_Object *obj, void *data, int w, int h)
{
E_Smart_Data *sd;
@@ -675,7 +675,7 @@ e_icon_data_set(Evas_Object *obj, void *data, int w, int h)
evas_object_image_data_copy_set(sd->obj, data);
}
-EAPI void *
+E_API void *
e_icon_data_get(const Evas_Object *obj, int *w, int *h)
{
E_Smart_Data *sd;
@@ -687,7 +687,7 @@ e_icon_data_get(const Evas_Object *obj, int *w, int *h)
return evas_object_image_data_get(sd->obj, 0);
}
-EAPI void
+E_API void
e_icon_scale_size_set(Evas_Object *obj, int size)
{
E_Smart_Data *sd;
@@ -699,7 +699,7 @@ e_icon_scale_size_set(Evas_Object *obj, int size)
evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
}
-EAPI int
+E_API int
e_icon_scale_size_get(const Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -709,7 +709,7 @@ e_icon_scale_size_get(const Evas_Object *obj)
return sd->size;
}
-EAPI void
+E_API void
e_icon_selected_set(const Evas_Object *obj, Eina_Bool selected)
{
E_Smart_Data *sd;
diff --git a/src/bin/e_icon.h b/src/bin/e_icon.h
index bdb48355e..cbe42bb6c 100644
--- a/src/bin/e_icon.h
+++ b/src/bin/e_icon.h
@@ -6,31 +6,31 @@
EINTERN int e_icon_init(void);
EINTERN int e_icon_shutdown(void);
-EAPI Evas_Object *e_icon_add (Evas *evas);
-EAPI Eina_Bool e_icon_file_set (Evas_Object *obj, const char *file);
-EAPI Eina_Bool e_icon_file_key_set (Evas_Object *obj, const char *file, const char *key);
-EAPI Evas_Object *e_icon_edje_get(Evas_Object *obj);
-EAPI Eina_Bool e_icon_file_edje_set (Evas_Object *obj, const char *file, const char *part);
-EAPI Eina_Bool e_icon_fdo_icon_set (Evas_Object *obj, const char *icon);
-EAPI void e_icon_edje_object_set(Evas_Object *obj, Evas_Object *edje);
-EAPI void e_icon_image_object_set (Evas_Object *obj, Evas_Object *o);
-EAPI Eina_Bool e_icon_file_get(const Evas_Object *obj, const char **file, const char **group);
-EAPI void e_icon_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth);
-EAPI Eina_Bool e_icon_smooth_scale_get (const Evas_Object *obj);
-EAPI void e_icon_alpha_set (Evas_Object *obj, Eina_Bool smooth);
-EAPI Eina_Bool e_icon_alpha_get (const Evas_Object *obj);
-EAPI void e_icon_preload_set (Evas_Object *obj, Eina_Bool preload);
-EAPI Eina_Bool e_icon_preload_get (const Evas_Object *obj);
-EAPI void e_icon_size_get (const Evas_Object *obj, int *w, int *h);
-EAPI Eina_Bool e_icon_fill_inside_get (const Evas_Object *obj);
-EAPI void e_icon_fill_inside_set (Evas_Object *obj, Eina_Bool fill_inside);
-EAPI Eina_Bool e_icon_scale_up_get (const Evas_Object *obj);
-EAPI void e_icon_scale_up_set (Evas_Object *obj, Eina_Bool scale_up);
-EAPI void e_icon_data_set (Evas_Object *obj, void *data, int w, int h);
-EAPI void *e_icon_data_get (const Evas_Object *obj, int *w, int *h);
-EAPI void e_icon_scale_size_set (Evas_Object *obj, int size);
-EAPI int e_icon_scale_size_get (const Evas_Object *obj);
-EAPI void e_icon_selected_set (const Evas_Object *obj, Eina_Bool selected);
+E_API Evas_Object *e_icon_add (Evas *evas);
+E_API Eina_Bool e_icon_file_set (Evas_Object *obj, const char *file);
+E_API Eina_Bool e_icon_file_key_set (Evas_Object *obj, const char *file, const char *key);
+E_API Evas_Object *e_icon_edje_get(Evas_Object *obj);
+E_API Eina_Bool e_icon_file_edje_set (Evas_Object *obj, const char *file, const char *part);
+E_API Eina_Bool e_icon_fdo_icon_set (Evas_Object *obj, const char *icon);
+E_API void e_icon_edje_object_set(Evas_Object *obj, Evas_Object *edje);
+E_API void e_icon_image_object_set (Evas_Object *obj, Evas_Object *o);
+E_API Eina_Bool e_icon_file_get(const Evas_Object *obj, const char **file, const char **group);
+E_API void e_icon_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth);
+E_API Eina_Bool e_icon_smooth_scale_get (const Evas_Object *obj);
+E_API void e_icon_alpha_set (Evas_Object *obj, Eina_Bool smooth);
+E_API Eina_Bool e_icon_alpha_get (const Evas_Object *obj);
+E_API void e_icon_preload_set (Evas_Object *obj, Eina_Bool preload);
+E_API Eina_Bool e_icon_preload_get (const Evas_Object *obj);
+E_API void e_icon_size_get (const Evas_Object *obj, int *w, int *h);
+E_API Eina_Bool e_icon_fill_inside_get (const Evas_Object *obj);
+E_API void e_icon_fill_inside_set (Evas_Object *obj, Eina_Bool fill_inside);
+E_API Eina_Bool e_icon_scale_up_get (const Evas_Object *obj);
+E_API void e_icon_scale_up_set (Evas_Object *obj, Eina_Bool scale_up);
+E_API void e_icon_data_set (Evas_Object *obj, void *data, int w, int h);
+E_API void *e_icon_data_get (const Evas_Object *obj, int *w, int *h);
+E_API void e_icon_scale_size_set (Evas_Object *obj, int size);
+E_API int e_icon_scale_size_get (const Evas_Object *obj);
+E_API void e_icon_selected_set (const Evas_Object *obj, Eina_Bool selected);
#endif
#endif
diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c
index c1c20ac0b..59f17fb99 100644
--- a/src/bin/e_ilist.c
+++ b/src/bin/e_ilist.c
@@ -56,14 +56,14 @@ static void _item_unselect(E_Ilist_Item *si);
static Evas_Smart *_e_smart = NULL;
-EAPI Evas_Object *
+E_API Evas_Object *
e_ilist_add(Evas *evas)
{
_e_smart_init();
return evas_object_smart_add(evas, _e_smart);
}
-EAPI void
+E_API void
e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func)(void *data, void *data2), void (*func_hilight)(void *data, void *data2), void *data, void *data2)
{
E_Ilist_Item *si;
@@ -90,7 +90,7 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char
evas_object_show(si->o_base);
}
-EAPI void
+E_API void
e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func)(void *data, void *data2), void (*func_hilight)(void *data, void *data2), void *data, void *data2, int relative)
{
E_Ilist_Item *si, *ri;
@@ -124,7 +124,7 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, c
evas_object_show(si->o_base);
}
-EAPI void
+E_API void
e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func)(void *data, void *data2), void (*func_hilight)(void *data, void *data2), void *data, void *data2)
{
E_Ilist_Item *si;
@@ -142,7 +142,7 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const cha
evas_object_show(si->o_base);
}
-EAPI void
+E_API void
e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func)(void *data, void *data2), void (*func_hilight)(void *data, void *data2), void *data, void *data2, int relative)
{
E_Ilist_Item *si, *ri;
@@ -168,7 +168,7 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end,
evas_object_show(si->o_base);
}
-EAPI void
+E_API void
e_ilist_clear(Evas_Object *obj)
{
E_Ilist_Item *si = NULL;
@@ -190,54 +190,54 @@ e_ilist_clear(Evas_Object *obj)
sd->selected = -1;
}
-EAPI void
+E_API void
e_ilist_freeze(Evas_Object *obj)
{
API_ENTRY return;
}
-EAPI void
+E_API void
e_ilist_thaw(Evas_Object *obj)
{
API_ENTRY return;
}
-EAPI int
+E_API int
e_ilist_count(Evas_Object *obj)
{
API_ENTRY return 0;
return eina_list_count(sd->items);
}
-EAPI int
+E_API int
e_ilist_selector_get(Evas_Object *obj)
{
API_ENTRY return 0;
return sd->selector;
}
-EAPI void
+E_API void
e_ilist_selector_set(Evas_Object *obj, int selector)
{
API_ENTRY return;
sd->selector = selector;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_ilist_multi_select_get(Evas_Object *obj)
{
API_ENTRY return 0;
return sd->multi_select;
}
-EAPI void
+E_API void
e_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi)
{
API_ENTRY return;
sd->multi_select = multi;
}
-EAPI void
+E_API void
e_ilist_size_min_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{
API_ENTRY return;
@@ -245,7 +245,7 @@ e_ilist_size_min_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
evas_object_size_hint_min_get(sd->o_box, w, h);
}
-EAPI void
+E_API void
e_ilist_unselect(Evas_Object *obj)
{
API_ENTRY return;
@@ -257,7 +257,7 @@ e_ilist_unselect(Evas_Object *obj)
sd->selected = -1;
}
-EAPI void
+E_API void
e_ilist_selected_set(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
@@ -291,14 +291,14 @@ e_ilist_selected_set(Evas_Object *obj, int n)
}
}
-EAPI const Eina_List *
+E_API const Eina_List *
e_ilist_selected_items_get(Evas_Object *obj)
{
API_ENTRY return NULL;
return sd->selected_items;
}
-EAPI int
+E_API int
e_ilist_selected_get(Evas_Object *obj)
{
Eina_List *l = NULL;
@@ -319,7 +319,7 @@ e_ilist_selected_get(Evas_Object *obj)
return j;
}
-EAPI const char *
+E_API const char *
e_ilist_selected_label_get(Evas_Object *obj)
{
E_Ilist_Item *si = NULL;
@@ -342,7 +342,7 @@ e_ilist_selected_label_get(Evas_Object *obj)
return NULL;
}
-EAPI void *
+E_API void *
e_ilist_selected_data_get(Evas_Object *obj)
{
E_Ilist_Item *si = NULL;
@@ -356,7 +356,7 @@ e_ilist_selected_data_get(Evas_Object *obj)
return NULL;
}
-EAPI void *
+E_API void *
e_ilist_selected_data2_get(Evas_Object *obj)
{
E_Ilist_Item *si = NULL;
@@ -370,7 +370,7 @@ e_ilist_selected_data2_get(Evas_Object *obj)
return NULL;
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_ilist_selected_icon_get(Evas_Object *obj)
{
E_Ilist_Item *si = NULL;
@@ -384,7 +384,7 @@ e_ilist_selected_icon_get(Evas_Object *obj)
return NULL;
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_ilist_selected_end_get(Evas_Object *obj)
{
E_Ilist_Item *si = NULL;
@@ -398,7 +398,7 @@ e_ilist_selected_end_get(Evas_Object *obj)
return NULL;
}
-EAPI void
+E_API void
e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
{
E_Ilist_Item *si = NULL;
@@ -412,7 +412,7 @@ e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Ev
*y -= sd->y;
}
-EAPI int
+E_API int
e_ilist_selected_count_get(Evas_Object *obj)
{
API_ENTRY return 0;
@@ -420,7 +420,7 @@ e_ilist_selected_count_get(Evas_Object *obj)
return eina_list_count(sd->selected_items);
}
-EAPI void
+E_API void
e_ilist_remove_num(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
@@ -459,7 +459,7 @@ e_ilist_remove_num(Evas_Object *obj, int n)
evas_object_resize(sd->o_smart, w, sd->h - h);
}
-EAPI const char *
+E_API const char *
e_ilist_nth_label_get(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
@@ -480,7 +480,7 @@ e_ilist_nth_label_get(Evas_Object *obj, int n)
return NULL;
}
-EAPI void
+E_API void
e_ilist_item_label_set(E_Ilist_Item *si, const char *label)
{
EINA_SAFETY_ON_NULL_RETURN(si);
@@ -488,7 +488,7 @@ e_ilist_item_label_set(E_Ilist_Item *si, const char *label)
edje_object_part_text_set(si->o_base, "e.text.label", label);
}
-EAPI void
+E_API void
e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
{
E_Ilist_Item *si = NULL;
@@ -502,7 +502,7 @@ e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
if (si) e_ilist_item_label_set(si, label);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_ilist_nth_icon_get(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
@@ -514,7 +514,7 @@ e_ilist_nth_icon_get(Evas_Object *obj, int n)
return NULL;
}
-EAPI void
+E_API void
e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
{
E_Ilist_Item *si = NULL;
@@ -538,7 +538,7 @@ e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
}
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_ilist_nth_end_get(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
@@ -550,7 +550,7 @@ e_ilist_nth_end_get(Evas_Object *obj, int n)
return NULL;
}
-EAPI void
+E_API void
e_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end)
{
E_Ilist_Item *si = NULL;
@@ -572,7 +572,7 @@ e_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end)
}
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_ilist_nth_is_header(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
@@ -584,7 +584,7 @@ e_ilist_nth_is_header(Evas_Object *obj, int n)
return 0;
}
-EAPI void
+E_API void
e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
{
E_Ilist_Item *si = NULL;
@@ -597,7 +597,7 @@ e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y,
*y -= sd->y;
}
-EAPI void
+E_API void
e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Eina_List *l = NULL;
@@ -634,14 +634,14 @@ e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
}
}
-EAPI const Eina_List *
+E_API const Eina_List *
e_ilist_items_get(Evas_Object *obj)
{
API_ENTRY return NULL;
return sd->items;
}
-EAPI void
+E_API void
e_ilist_multi_select(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
@@ -678,7 +678,7 @@ e_ilist_multi_select(Evas_Object *obj, int n)
}
}
-EAPI void
+E_API void
e_ilist_range_select(Evas_Object *obj, int n)
{
int i, j, dir;
@@ -707,7 +707,7 @@ e_ilist_range_select(Evas_Object *obj, int n)
}
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group)
{
Eina_List *l;
diff --git a/src/bin/e_ilist.h b/src/bin/e_ilist.h
index 42b146531..c5c6f05e0 100644
--- a/src/bin/e_ilist.h
+++ b/src/bin/e_ilist.h
@@ -22,45 +22,45 @@ struct _E_Ilist_Item
void *data, *data2;
};
-EAPI Evas_Object *e_ilist_add (Evas *evas);
-EAPI void e_ilist_append (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2);
-EAPI void e_ilist_append_relative (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative);
-EAPI void e_ilist_prepend (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2);
-EAPI void e_ilist_prepend_relative (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative);
-EAPI void e_ilist_clear (Evas_Object *obj);
-EAPI void e_ilist_freeze (Evas_Object *obj);
-EAPI void e_ilist_thaw (Evas_Object *obj);
-EAPI int e_ilist_count (Evas_Object *obj);
-EAPI int e_ilist_selector_get (Evas_Object *obj);
-EAPI void e_ilist_selector_set (Evas_Object *obj, int selector);
-EAPI Eina_Bool e_ilist_multi_select_get (Evas_Object *obj);
-EAPI void e_ilist_multi_select_set (Evas_Object *obj, Eina_Bool multi);
-EAPI void e_ilist_size_min_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-EAPI void e_ilist_unselect (Evas_Object *obj);
-EAPI void e_ilist_selected_set (Evas_Object *obj, int n);
-EAPI int e_ilist_selected_get (Evas_Object *obj);
-EAPI const char *e_ilist_selected_label_get (Evas_Object *obj);
-EAPI void *e_ilist_selected_data_get (Evas_Object *obj);
-EAPI void *e_ilist_selected_data2_get (Evas_Object *obj);
-EAPI Evas_Object *e_ilist_selected_icon_get (Evas_Object *obj);
-EAPI Evas_Object *e_ilist_selected_end_get (Evas_Object *obj);
-EAPI void e_ilist_selected_geometry_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-EAPI const Eina_List *e_ilist_selected_items_get(Evas_Object *obj);
-EAPI int e_ilist_selected_count_get (Evas_Object *obj);
-EAPI void e_ilist_remove_num (Evas_Object *obj, int n);
-EAPI const char *e_ilist_nth_label_get (Evas_Object *obj, int n);
-EAPI void e_ilist_nth_label_set (Evas_Object *obj, int n, const char *label);
-EAPI Evas_Object *e_ilist_nth_icon_get (Evas_Object *obj, int n);
-EAPI void e_ilist_nth_icon_set (Evas_Object *obj, int n, Evas_Object *icon);
-EAPI Evas_Object *e_ilist_nth_end_get (Evas_Object *obj, int n);
-EAPI void e_ilist_nth_end_set (Evas_Object *obj, int n, Evas_Object *end);
-EAPI Eina_Bool e_ilist_nth_is_header (Evas_Object *obj, int n);
-EAPI void e_ilist_nth_geometry_get (Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-EAPI void e_ilist_icon_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-EAPI const Eina_List *e_ilist_items_get (Evas_Object *obj);
-EAPI void e_ilist_multi_select (Evas_Object *obj, int n);
-EAPI void e_ilist_range_select (Evas_Object *obj, int n);
-EAPI void e_ilist_item_label_set(E_Ilist_Item *si, const char *label);
-EAPI Eina_Bool e_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group);
+E_API Evas_Object *e_ilist_add (Evas *evas);
+E_API void e_ilist_append (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2);
+E_API void e_ilist_append_relative (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative);
+E_API void e_ilist_prepend (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2);
+E_API void e_ilist_prepend_relative (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative);
+E_API void e_ilist_clear (Evas_Object *obj);
+E_API void e_ilist_freeze (Evas_Object *obj);
+E_API void e_ilist_thaw (Evas_Object *obj);
+E_API int e_ilist_count (Evas_Object *obj);
+E_API int e_ilist_selector_get (Evas_Object *obj);
+E_API void e_ilist_selector_set (Evas_Object *obj, int selector);
+E_API Eina_Bool e_ilist_multi_select_get (Evas_Object *obj);
+E_API void e_ilist_multi_select_set (Evas_Object *obj, Eina_Bool multi);
+E_API void e_ilist_size_min_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+E_API void e_ilist_unselect (Evas_Object *obj);
+E_API void e_ilist_selected_set (Evas_Object *obj, int n);
+E_API int e_ilist_selected_get (Evas_Object *obj);
+E_API const char *e_ilist_selected_label_get (Evas_Object *obj);
+E_API void *e_ilist_selected_data_get (Evas_Object *obj);
+E_API void *e_ilist_selected_data2_get (Evas_Object *obj);
+E_API Evas_Object *e_ilist_selected_icon_get (Evas_Object *obj);
+E_API Evas_Object *e_ilist_selected_end_get (Evas_Object *obj);
+E_API void e_ilist_selected_geometry_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+E_API const Eina_List *e_ilist_selected_items_get(Evas_Object *obj);
+E_API int e_ilist_selected_count_get (Evas_Object *obj);
+E_API void e_ilist_remove_num (Evas_Object *obj, int n);
+E_API const char *e_ilist_nth_label_get (Evas_Object *obj, int n);
+E_API void e_ilist_nth_label_set (Evas_Object *obj, int n, const char *label);
+E_API Evas_Object *e_ilist_nth_icon_get (Evas_Object *obj, int n);
+E_API void e_ilist_nth_icon_set (Evas_Object *obj, int n, Evas_Object *icon);
+E_API Evas_Object *e_ilist_nth_end_get (Evas_Object *obj, int n);
+E_API void e_ilist_nth_end_set (Evas_Object *obj, int n, Evas_Object *end);
+E_API Eina_Bool e_ilist_nth_is_header (Evas_Object *obj, int n);
+E_API void e_ilist_nth_geometry_get (Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+E_API void e_ilist_icon_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+E_API const Eina_List *e_ilist_items_get (Evas_Object *obj);
+E_API void e_ilist_multi_select (Evas_Object *obj, int n);
+E_API void e_ilist_range_select (Evas_Object *obj, int n);
+E_API void e_ilist_item_label_set(E_Ilist_Item *si, const char *label);
+E_API Eina_Bool e_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group);
#endif
#endif
diff --git a/src/bin/e_import_config_dialog.c b/src/bin/e_import_config_dialog.c
index 10646ad77..fe1cfdc6b 100644
--- a/src/bin/e_import_config_dialog.c
+++ b/src/bin/e_import_config_dialog.c
@@ -433,7 +433,7 @@ _e_import_config_dialog_win_del(void *data, Evas *e EINA_UNUSED, Evas_Object *ob
///////////////////////////////////////////////////////////////////////////////////
-EAPI E_Import_Config_Dialog *
+E_API E_Import_Config_Dialog *
e_import_config_dialog_show(Evas_Object *parent, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel)
{
Evas *evas;
diff --git a/src/bin/e_import_config_dialog.h b/src/bin/e_import_config_dialog.h
index 620fa00a6..3cc80cf44 100644
--- a/src/bin/e_import_config_dialog.h
+++ b/src/bin/e_import_config_dialog.h
@@ -26,7 +26,7 @@ struct _E_Import_Config_Dialog
E_Dialog *dia;
};
-EAPI E_Import_Config_Dialog *e_import_config_dialog_show(Evas_Object *parent, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel);
+E_API E_Import_Config_Dialog *e_import_config_dialog_show(Evas_Object *parent, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel);
#endif
#endif
diff --git a/src/bin/e_import_dialog.c b/src/bin/e_import_dialog.c
index 5bbebed42..cb07a1197 100644
--- a/src/bin/e_import_dialog.c
+++ b/src/bin/e_import_dialog.c
@@ -132,7 +132,7 @@ _e_import_dialog_win_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
//////////////////////////////////////////////////////////////////////////////////
-EAPI E_Import_Dialog *
+E_API E_Import_Dialog *
e_import_dialog_show(Evas_Object *parent EINA_UNUSED, const char *dev, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel)
{
Evas *evas;
diff --git a/src/bin/e_import_dialog.h b/src/bin/e_import_dialog.h
index a18999b16..836bc28ea 100644
--- a/src/bin/e_import_dialog.h
+++ b/src/bin/e_import_dialog.h
@@ -15,7 +15,7 @@ struct _E_Import_Dialog
E_Dialog *dia;
};
-EAPI E_Import_Dialog *e_import_dialog_show(Evas_Object *parent, const char *dev, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel);
+E_API E_Import_Dialog *e_import_dialog_show(Evas_Object *parent, const char *dev, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel);
#endif
#endif
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index 2ab6f6140..f009f13f7 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -1,6 +1,6 @@
#include "e.h"
-EAPI int E_EVENT_INIT_DONE = 0;
+E_API int E_EVENT_INIT_DONE = 0;
/* local variables */
static int done = 0;
@@ -41,7 +41,7 @@ e_init_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_init_show(void)
{
Evas_Object *o;
@@ -79,7 +79,7 @@ e_init_show(void)
e_init_version_set(VERSION);
}
-EAPI void
+E_API void
e_init_hide(void)
{
E_FREE_LIST(splash_objs, evas_object_del);
@@ -88,28 +88,28 @@ e_init_hide(void)
E_FREE_FUNC(_e_init_timeout_timer, ecore_timer_del);
}
-EAPI void
+E_API void
e_init_title_set(const char *str)
{
if (!_e_init_object) return;
edje_object_part_text_set(_e_init_object, "e.text.title", str);
}
-EAPI void
+E_API void
e_init_version_set(const char *str)
{
if (!_e_init_object) return;
edje_object_part_text_set(_e_init_object, "e.text.version", str);
}
-EAPI void
+E_API void
e_init_status_set(const char *str)
{
if (!_e_init_object) return;
edje_object_part_text_set(_e_init_object, "e.text.status", str);
}
-EAPI void
+E_API void
e_init_done(void)
{
undone--;
@@ -120,13 +120,13 @@ e_init_done(void)
edje_object_signal_emit(_e_init_object, "e,state,done", "e");
}
-EAPI void
+E_API void
e_init_undone(void)
{
undone++;
}
-EAPI int
+E_API int
e_init_count_get(void)
{
return undone;
diff --git a/src/bin/e_init.h b/src/bin/e_init.h
index fba785dfb..df1cd5255 100644
--- a/src/bin/e_init.h
+++ b/src/bin/e_init.h
@@ -5,18 +5,18 @@
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);
-EAPI void e_init_version_set(const char *str);
-EAPI void e_init_status_set(const char *str);
-EAPI void e_init_done(void);
-EAPI void e_init_undone(void);
-EAPI void e_init_client_data(Ecore_Ipc_Event_Client_Data *e);
-EAPI void e_init_client_del(Ecore_Ipc_Event_Client_Del *e);
-EAPI int e_init_count_get(void);
+E_API void e_init_show(void);
+E_API void e_init_hide(void);
+E_API void e_init_title_set(const char *str);
+E_API void e_init_version_set(const char *str);
+E_API void e_init_status_set(const char *str);
+E_API void e_init_done(void);
+E_API void e_init_undone(void);
+E_API void e_init_client_data(Ecore_Ipc_Event_Client_Data *e);
+E_API void e_init_client_del(Ecore_Ipc_Event_Client_Del *e);
+E_API int e_init_count_get(void);
-extern EAPI int E_EVENT_INIT_DONE;
+extern E_API int E_EVENT_INIT_DONE;
#endif
#endif
diff --git a/src/bin/e_int_client_locks.c b/src/bin/e_int_client_locks.c
index 876865582..7f4eb7211 100644
--- a/src/bin/e_int_client_locks.c
+++ b/src/bin/e_int_client_locks.c
@@ -44,7 +44,7 @@ struct _E_Config_Dialog_Data
};
/* a nice easy setup function that does the dirty work */
-EAPI void
+E_API void
e_int_client_locks(E_Client *ec)
{
E_Config_Dialog *cfd;
diff --git a/src/bin/e_int_client_locks.h b/src/bin/e_int_client_locks.h
index 9cf421cfe..e3881cd6f 100644
--- a/src/bin/e_int_client_locks.h
+++ b/src/bin/e_int_client_locks.h
@@ -3,7 +3,7 @@
#ifndef E_INT_BORDER_LOCKS_H
#define E_INT_BORDER_LOCKS_H
-EAPI void e_int_client_locks(E_Client *ec);
+E_API void e_int_client_locks(E_Client *ec);
#endif
#endif
diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c
index 08d5b15bc..00add27a0 100644
--- a/src/bin/e_int_client_menu.c
+++ b/src/bin/e_int_client_menu.c
@@ -54,7 +54,7 @@ static void _e_client_menu_cb_netwm_icon(void *data, E_Menu *m, E_Menu_Item *mi)
static Eina_List *menu_hooks = NULL;
-EAPI E_Client_Menu_Hook *
+E_API E_Client_Menu_Hook *
e_int_client_menu_hook_add(E_Client_Menu_Hook_Cb cb, const void *data)
{
E_Client_Menu_Hook *h;
@@ -69,7 +69,7 @@ e_int_client_menu_hook_add(E_Client_Menu_Hook_Cb cb, const void *data)
return h;
}
-EAPI void
+E_API void
e_int_client_menu_hook_del(E_Client_Menu_Hook *hook)
{
E_Client_Menu_Hook *h;
@@ -86,7 +86,7 @@ e_int_client_menu_hook_del(E_Client_Menu_Hook *hook)
}
}
-EAPI void
+E_API void
e_int_client_menu_hooks_clear(void)
{
E_Client_Menu_Hook *h;
@@ -94,7 +94,7 @@ e_int_client_menu_hooks_clear(void)
free(h);
}
-EAPI void
+E_API void
e_int_client_menu_create(E_Client *ec)
{
E_Menu *m;
@@ -246,7 +246,7 @@ e_int_client_menu_create(E_Client *ec)
h->cb(h->data, ec);
}
-EAPI void
+E_API void
e_int_client_menu_show(E_Client *ec, Evas_Coord x, Evas_Coord y, int key, unsigned int timestamp)
{
e_int_client_menu_create(ec);
@@ -258,7 +258,7 @@ e_int_client_menu_show(E_Client *ec, Evas_Coord x, Evas_Coord y, int key, unsign
E_MENU_POP_DIRECTION_DOWN, timestamp);
}
-EAPI void
+E_API void
e_int_client_menu_del(E_Client *ec)
{
if (!ec->border_menu) return;
diff --git a/src/bin/e_int_client_menu.h b/src/bin/e_int_client_menu.h
index 2915b0f7c..58f230bfd 100644
--- a/src/bin/e_int_client_menu.h
+++ b/src/bin/e_int_client_menu.h
@@ -11,12 +11,12 @@ typedef struct E_Client_Menu_Hook
void *data;
} E_Client_Menu_Hook;
-EAPI E_Client_Menu_Hook *e_int_client_menu_hook_add(E_Client_Menu_Hook_Cb cb, const void *data);
-EAPI void e_int_client_menu_hook_del(E_Client_Menu_Hook *hook);
-EAPI void e_int_client_menu_hooks_clear(void);
-EAPI void e_int_client_menu_create(E_Client *ec);
-EAPI void e_int_client_menu_show(E_Client *ec, Evas_Coord x, Evas_Coord y, int key, unsigned int timestamp);
-EAPI void e_int_client_menu_del(E_Client *ec);
+E_API E_Client_Menu_Hook *e_int_client_menu_hook_add(E_Client_Menu_Hook_Cb cb, const void *data);
+E_API void e_int_client_menu_hook_del(E_Client_Menu_Hook *hook);
+E_API void e_int_client_menu_hooks_clear(void);
+E_API void e_int_client_menu_create(E_Client *ec);
+E_API void e_int_client_menu_show(E_Client *ec, Evas_Coord x, Evas_Coord y, int key, unsigned int timestamp);
+E_API void e_int_client_menu_del(E_Client *ec);
#endif
#endif
diff --git a/src/bin/e_int_client_prop.c b/src/bin/e_int_client_prop.c
index 8e0f0d5d8..1388ef977 100644
--- a/src/bin/e_int_client_prop.c
+++ b/src/bin/e_int_client_prop.c
@@ -64,7 +64,7 @@ struct _E_Config_Dialog_Data
} netwm;
};
-EAPI void
+E_API void
e_int_client_prop(E_Client *ec)
{
E_Dialog *dia;
diff --git a/src/bin/e_int_client_prop.h b/src/bin/e_int_client_prop.h
index 85464572b..a8a8bc376 100644
--- a/src/bin/e_int_client_prop.h
+++ b/src/bin/e_int_client_prop.h
@@ -3,7 +3,7 @@
#ifndef E_INT_BORDER_PROP_H
#define E_INT_BORDER_PROP_H
-EAPI void e_int_client_prop(E_Client *ec);
+E_API void e_int_client_prop(E_Client *ec);
#endif
#endif
diff --git a/src/bin/e_int_client_remember.c b/src/bin/e_int_client_remember.c
index c34cc43f8..3de60006b 100644
--- a/src/bin/e_int_client_remember.c
+++ b/src/bin/e_int_client_remember.c
@@ -68,7 +68,7 @@ struct _E_Config_Dialog_Data
};
/* a nice easy setup function that does the dirty work */
-EAPI E_Config_Dialog *
+E_API E_Config_Dialog *
e_int_client_remember_edit(E_Remember *rem)
{
E_Config_Dialog_View *v;
@@ -87,7 +87,7 @@ e_int_client_remember_edit(E_Remember *rem)
NULL, 0, v, rem);
}
-EAPI void
+E_API void
e_int_client_remember(E_Client *ec)
{
E_Config_Dialog *cfd;
diff --git a/src/bin/e_int_client_remember.h b/src/bin/e_int_client_remember.h
index 379db8242..8b7c4c8da 100644
--- a/src/bin/e_int_client_remember.h
+++ b/src/bin/e_int_client_remember.h
@@ -3,8 +3,8 @@
#ifndef E_INT_BORDER_REMEMBER_H
#define E_INT_BORDER_REMEMBER_H
-EAPI void e_int_client_remember(E_Client *ec);
-EAPI E_Config_Dialog *e_int_client_remember_edit(E_Remember *rem);
+E_API void e_int_client_remember(E_Client *ec);
+E_API E_Config_Dialog *e_int_client_remember_edit(E_Remember *rem);
#endif
#endif
diff --git a/src/bin/e_int_config_comp.c b/src/bin/e_int_config_comp.c
index f53f24a1e..198357b9b 100644
--- a/src/bin/e_int_config_comp.c
+++ b/src/bin/e_int_config_comp.c
@@ -67,7 +67,7 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd,
static int _advanced_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
-EAPI E_Config_Dialog *
+E_API E_Config_Dialog *
e_int_config_comp(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
{
E_Config_Dialog *cfd;
diff --git a/src/bin/e_int_config_comp_match.c b/src/bin/e_int_config_comp_match.c
index f5d80c236..d179fc41d 100644
--- a/src/bin/e_int_config_comp_match.c
+++ b/src/bin/e_int_config_comp_match.c
@@ -868,7 +868,7 @@ _create_data(E_Config_Dialog *cfd)
return cfdata;
}
-EAPI E_Config_Dialog *
+E_API E_Config_Dialog *
e_int_config_comp_match(Evas_Object *parent, const char *params EINA_UNUSED)
{
E_Config_Dialog *cfd;
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index fa9687c39..efcc6a801 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -82,7 +82,7 @@ static int _types_list_sort(const void *data1, const void *data2);
static void _btn_cb_unload(void *data, void *data2);
static void _btn_cb_load(void *data, void *data2);
-EAPI E_Config_Dialog *
+E_API E_Config_Dialog *
e_int_config_modules(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
{
E_Config_Dialog *cfd = NULL;
diff --git a/src/bin/e_int_config_modules.h b/src/bin/e_int_config_modules.h
index 67273717e..f95582dcd 100644
--- a/src/bin/e_int_config_modules.h
+++ b/src/bin/e_int_config_modules.h
@@ -3,7 +3,7 @@
#ifndef E_INT_CONFIG_MODULES_H
#define E_INT_CONFIG_MODULES_H
-EAPI E_Config_Dialog *e_int_config_modules(Evas_Object *parent, const char *params);
+E_API E_Config_Dialog *e_int_config_modules(Evas_Object *parent, const char *params);
#endif
#endif
diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c
index 79d6d2952..e53b01689 100644
--- a/src/bin/e_int_gadcon_config.c
+++ b/src/bin/e_int_gadcon_config.c
@@ -777,19 +777,19 @@ _cb_load_timer(void *data)
return ECORE_CALLBACK_CANCEL;
}
-EAPI void
+E_API void
e_int_gadcon_config_shelf(E_Gadcon *gc)
{
_create_dialog(gc, _("Shelf Contents"), 0);
}
-EAPI void
+E_API void
e_int_gadcon_config_toolbar(E_Gadcon *gc)
{
_create_dialog(gc, _("Toolbar Contents"), 0);
}
-EAPI void
+E_API void
e_int_gadcon_config_hook(E_Gadcon *gc, const char *name, E_Gadcon_Site site)
{
_create_dialog(gc, name, site);
diff --git a/src/bin/e_int_gadcon_config.h b/src/bin/e_int_gadcon_config.h
index a88b3a83a..9ed888bb6 100644
--- a/src/bin/e_int_gadcon_config.h
+++ b/src/bin/e_int_gadcon_config.h
@@ -3,9 +3,9 @@
#ifndef E_INT_GADCON_CONFIG_H
#define E_INT_GADCON_CONFIG_H
-EAPI void e_int_gadcon_config_shelf (E_Gadcon *gc);
-EAPI void e_int_gadcon_config_toolbar (E_Gadcon *gc);
-EAPI void e_int_gadcon_config_hook(E_Gadcon *gc, const char *name, E_Gadcon_Site site);
+E_API void e_int_gadcon_config_shelf (E_Gadcon *gc);
+E_API void e_int_gadcon_config_toolbar (E_Gadcon *gc);
+E_API void e_int_gadcon_config_hook(E_Gadcon *gc, const char *name, E_Gadcon_Site site);
#endif
#endif
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index effa5ccc1..a536f50e4 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -121,7 +121,7 @@ _TEST(void *d EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED)
#endif
/* externally accessible functions */
-EAPI E_Menu *
+E_API E_Menu *
e_int_menus_main_new(void)
{
E_Menu *m, *subm;
@@ -298,7 +298,7 @@ e_int_menus_main_new(void)
return m;
}
-EAPI E_Menu *
+E_API E_Menu *
e_int_menus_apps_new(const char *dir)
{
E_Menu *m;
@@ -309,7 +309,7 @@ e_int_menus_apps_new(const char *dir)
return m;
}
-EAPI E_Menu *
+E_API E_Menu *
e_int_menus_desktops_new(void)
{
E_Menu *m, *subm;
@@ -344,7 +344,7 @@ e_int_menus_desktops_new(void)
return m;
}
-EAPI E_Menu *
+E_API E_Menu *
e_int_menus_favorite_apps_new(void)
{
E_Menu *m = NULL;
@@ -356,7 +356,7 @@ e_int_menus_favorite_apps_new(void)
return m;
}
-EAPI E_Menu *
+E_API E_Menu *
e_int_menus_all_apps_new(void)
{
E_Menu *m;
@@ -365,7 +365,7 @@ e_int_menus_all_apps_new(void)
return m;
}
-EAPI E_Menu *
+E_API E_Menu *
e_int_menus_config_new(void)
{
E_Menu *m;
@@ -376,7 +376,7 @@ e_int_menus_config_new(void)
return m;
}
-EAPI E_Menu *
+E_API E_Menu *
e_int_menus_clients_new(void)
{
E_Menu *m;
@@ -386,7 +386,7 @@ e_int_menus_clients_new(void)
return m;
}
-EAPI E_Menu *
+E_API E_Menu *
e_int_menus_lost_clients_new(void)
{
E_Menu *m;
@@ -396,7 +396,7 @@ e_int_menus_lost_clients_new(void)
return m;
}
-EAPI E_Int_Menu_Augmentation *
+E_API E_Int_Menu_Augmentation *
e_int_menus_menu_augmentation_add_sorted(const char *menu,
const char *sort_key,
void (*func_add)(void *data, E_Menu *m),
@@ -461,7 +461,7 @@ e_int_menus_menu_augmentation_add_sorted(const char *menu,
return maug;
}
-EAPI E_Int_Menu_Augmentation *
+E_API E_Int_Menu_Augmentation *
e_int_menus_menu_augmentation_add(const char *menu,
void (*func_add)(void *data, E_Menu *m),
void *data_add,
@@ -472,7 +472,7 @@ e_int_menus_menu_augmentation_add(const char *menu,
(menu, NULL, func_add, data_add, func_del, data_del);
}
-EAPI void
+E_API void
e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *maug)
{
Eina_List *l;
@@ -498,14 +498,14 @@ e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *mau
free(maug);
}
-EAPI void
+E_API void
e_int_menus_cache_clear(void)
{
if (_e_int_menus_app_menus)
eina_hash_free_buckets(_e_int_menus_app_menus);
}
-EAPI void
+E_API void
e_int_menus_menu_augmentation_point_disabled_set(const char *menu, Eina_Bool disabled)
{
if (!menu) return;
diff --git a/src/bin/e_int_menus.h b/src/bin/e_int_menus.h
index 8af653259..bc7d29042 100644
--- a/src/bin/e_int_menus.h
+++ b/src/bin/e_int_menus.h
@@ -58,33 +58,33 @@ struct _E_Int_Menu_Augmentation
} add, del;
};
-EAPI E_Menu *e_int_menus_main_new(void);
-EAPI E_Menu *e_int_menus_desktops_new(void);
-EAPI E_Menu *e_int_menus_clients_new(void);
-EAPI E_Menu *e_int_menus_apps_new(const char *dir);
-EAPI E_Menu *e_int_menus_favorite_apps_new(void);
-EAPI E_Menu *e_int_menus_all_apps_new(void);
-EAPI E_Menu *e_int_menus_config_new(void);
-EAPI E_Menu *e_int_menus_lost_clients_new(void);
-EAPI E_Menu *e_int_menus_shelves_new(void);
+E_API E_Menu *e_int_menus_main_new(void);
+E_API E_Menu *e_int_menus_desktops_new(void);
+E_API E_Menu *e_int_menus_clients_new(void);
+E_API E_Menu *e_int_menus_apps_new(const char *dir);
+E_API E_Menu *e_int_menus_favorite_apps_new(void);
+E_API E_Menu *e_int_menus_all_apps_new(void);
+E_API E_Menu *e_int_menus_config_new(void);
+E_API E_Menu *e_int_menus_lost_clients_new(void);
+E_API E_Menu *e_int_menus_shelves_new(void);
-EAPI E_Int_Menu_Augmentation *e_int_menus_menu_augmentation_add(const char *menu,
+E_API E_Int_Menu_Augmentation *e_int_menus_menu_augmentation_add(const char *menu,
void (*func_add) (void *data, E_Menu *m),
void *data_add,
void (*func_del) (void *data, E_Menu *m),
void *data_del);
-EAPI E_Int_Menu_Augmentation *e_int_menus_menu_augmentation_add_sorted(const char *menu,
+E_API E_Int_Menu_Augmentation *e_int_menus_menu_augmentation_add_sorted(const char *menu,
const char *sort_key,
void (*func_add) (void *data, E_Menu *m),
void *data_add,
void (*func_del) (void *data, E_Menu *m),
void *data_del);
-EAPI void e_int_menus_menu_augmentation_del(const char *menu,
+E_API void e_int_menus_menu_augmentation_del(const char *menu,
E_Int_Menu_Augmentation *maug);
-EAPI void e_int_menus_menu_augmentation_point_disabled_set(const char *menu,
+E_API void e_int_menus_menu_augmentation_point_disabled_set(const char *menu,
Eina_Bool disabled);
-EAPI void e_int_menus_cache_clear(void);
+E_API void e_int_menus_cache_clear(void);
EINTERN void e_int_menus_init(void);
EINTERN void e_int_menus_shutdown(void);
#endif
diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index 3043ed2c6..6c21944ad 100644
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -29,7 +29,7 @@ static void _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj)
static void _cb_autohide_change(void *data, Evas_Object *obj EINA_UNUSED);
static void _fill_desks(E_Config_Dialog_Data *cfdata);
-EAPI void
+E_API void
e_int_shelf_config(E_Shelf *es)
{
E_Config_Dialog_View *v;
diff --git a/src/bin/e_int_shelf_config.h b/src/bin/e_int_shelf_config.h
index 5289aba76..7982d4a5c 100644
--- a/src/bin/e_int_shelf_config.h
+++ b/src/bin/e_int_shelf_config.h
@@ -3,7 +3,7 @@
#ifndef E_INT_SHELF_CONFIG_H
#define E_INT_SHELF_CONFIG_H
-EAPI void e_int_shelf_config(E_Shelf *es);
+E_API void e_int_shelf_config(E_Shelf *es);
#endif
#endif
diff --git a/src/bin/e_int_toolbar_config.c b/src/bin/e_int_toolbar_config.c
index e82874dd3..dc0e72470 100644
--- a/src/bin/e_int_toolbar_config.c
+++ b/src/bin/e_int_toolbar_config.c
@@ -13,7 +13,7 @@ struct _E_Config_Dialog_Data
int orient;
};
-EAPI void
+E_API void
e_int_toolbar_config(E_Toolbar *tbar)
{
E_Config_Dialog *cfd;
diff --git a/src/bin/e_int_toolbar_config.h b/src/bin/e_int_toolbar_config.h
index 529e1a10d..67fb83dd3 100644
--- a/src/bin/e_int_toolbar_config.h
+++ b/src/bin/e_int_toolbar_config.h
@@ -3,7 +3,7 @@
#ifndef E_INT_TOOLBAR_CONFIG_H
#define E_INT_TOOLBAR_CONFIG_H
-EAPI void e_int_toolbar_config(E_Toolbar *tbar);
+E_API void e_int_toolbar_config(E_Toolbar *tbar);
#endif
#endif
diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c
index 1609228f7..75763ad6c 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@@ -133,7 +133,7 @@ e_intl_post_shutdown(void)
* - Add support of compound locales i.e. (en_US;zh_CN;C) ==Defer==
* - Add Configuration for to-be-set environment variables
*/
-EAPI void
+E_API void
e_intl_language_set(const char *lang)
{
int set_envars;
@@ -253,19 +253,19 @@ e_intl_language_set(const char *lang)
}
}
-EAPI const char *
+E_API const char *
e_intl_language_get(void)
{
return _e_intl_language;
}
-EAPI const char *
+E_API const char *
e_intl_language_alias_get(void)
{
return _e_intl_language_alias;
}
-EAPI Eina_List *
+E_API Eina_List *
e_intl_language_list(void)
{
Eina_List *next;
@@ -311,7 +311,7 @@ _e_intl_language_list_find(Eina_List *language_list, char *language)
return 0;
}
-EAPI void
+E_API void
e_intl_input_method_set(const char *imc_path)
{
if (!imc_path)
@@ -365,7 +365,7 @@ e_intl_input_method_set(const char *imc_path)
}
}
-EAPI Eina_List *
+E_API Eina_List *
e_intl_input_method_list(void)
{
Eina_List *input_methods;
@@ -613,7 +613,7 @@ _e_intl_locale_alias_hash_get(void)
/*
* Not canonic, just gets the parts
*/
-EAPI E_Locale_Parts *
+E_API E_Locale_Parts *
e_intl_locale_parts_get(const char *locale)
{
/* Parse Results */
@@ -756,7 +756,7 @@ e_intl_locale_parts_get(const char *locale)
return locale_parts;
}
-EAPI void
+E_API void
e_intl_locale_parts_free(E_Locale_Parts *locale_parts)
{
if (locale_parts)
@@ -769,7 +769,7 @@ e_intl_locale_parts_free(E_Locale_Parts *locale_parts)
}
}
-EAPI char *
+E_API char *
e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask)
{
int locale_size;
@@ -825,7 +825,7 @@ e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask)
return locale;
}
-EAPI char *
+E_API char *
e_intl_locale_charset_canonic_get(const char *charset)
{
char charset_canonic[32];
diff --git a/src/bin/e_intl.h b/src/bin/e_intl.h
index 584511ec1..90f8da080 100644
--- a/src/bin/e_intl.h
+++ b/src/bin/e_intl.h
@@ -45,22 +45,22 @@ 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);
-EAPI const char *e_intl_language_alias_get(void);
-EAPI Eina_List *e_intl_language_list(void);
+E_API void e_intl_language_set(const char *lang);
+E_API const char *e_intl_language_get(void);
+E_API const char *e_intl_language_alias_get(void);
+E_API Eina_List *e_intl_language_list(void);
/* Setting & Getting Input Method */
-EAPI void e_intl_input_method_set(const char *method);
-EAPI const char *e_intl_input_method_get(void);
-EAPI Eina_List *e_intl_input_method_list(void);
-EAPI const char *e_intl_imc_personal_path_get(void);
-EAPI const char *e_intl_imc_system_path_get(void);
+E_API void e_intl_input_method_set(const char *method);
+E_API const char *e_intl_input_method_get(void);
+E_API Eina_List *e_intl_input_method_list(void);
+E_API const char *e_intl_imc_personal_path_get(void);
+E_API const char *e_intl_imc_system_path_get(void);
/* Getting locale */
-EAPI E_Locale_Parts *e_intl_locale_parts_get(const char *locale);
-EAPI void e_intl_locale_parts_free(E_Locale_Parts *locale_parts);
-EAPI char *e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask);
-EAPI char *e_intl_locale_charset_canonic_get(const char *charset);
+E_API E_Locale_Parts *e_intl_locale_parts_get(const char *locale);
+E_API void e_intl_locale_parts_free(E_Locale_Parts *locale_parts);
+E_API char *e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask);
+E_API char *e_intl_locale_charset_canonic_get(const char *charset);
# endif
#endif
diff --git a/src/bin/e_intl_data.c b/src/bin/e_intl_data.c
index a8156e452..bd02c8110 100644
--- a/src/bin/e_intl_data.c
+++ b/src/bin/e_intl_data.c
@@ -31,7 +31,7 @@ e_intl_data_shutdown(void)
}
/* Get the input method configuration from the file */
-EAPI E_Input_Method_Config *
+E_API E_Input_Method_Config *
e_intl_input_method_config_read(Eet_File *imc_file)
{
E_Input_Method_Config *imc;
@@ -45,7 +45,7 @@ e_intl_input_method_config_read(Eet_File *imc_file)
}
/* Write the input method configuration to the file */
-EAPI int
+E_API int
e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc)
{
int ok = 0;
@@ -57,7 +57,7 @@ e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc)
return ok;
}
-EAPI void
+E_API void
e_intl_input_method_config_free(E_Input_Method_Config *imc)
{
if (imc)
diff --git a/src/bin/e_intl_data.h b/src/bin/e_intl_data.h
index 07b8650fa..d2dfb22e9 100644
--- a/src/bin/e_intl_data.h
+++ b/src/bin/e_intl_data.h
@@ -22,8 +22,8 @@ struct _E_Input_Method_Config
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);
+E_API E_Input_Method_Config *e_intl_input_method_config_read(Eet_File *imc_file);
+E_API int e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc);
+E_API void e_intl_input_method_config_free(E_Input_Method_Config *imc);
#endif
#endif
diff --git a/src/bin/e_ipc_codec.c b/src/bin/e_ipc_codec.c
index d237a7800..1a8c41364 100644
--- a/src/bin/e_ipc_codec.c
+++ b/src/bin/e_ipc_codec.c
@@ -164,7 +164,7 @@ e_ipc_codec_shutdown(void)
E_CONFIG_DD_FREE(_e_ipc_str_4int_list_edd);
}
-EAPI int
+E_API int
e_ipc_codec_int_dec(char *data, int bytes, int *dest)
{
E_Ipc_Int *dat;
@@ -177,7 +177,7 @@ e_ipc_codec_int_dec(char *data, int bytes, int *dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_int_enc(int val, int *size_ret)
{
E_Ipc_Int dat;
@@ -186,7 +186,7 @@ e_ipc_codec_int_enc(int val, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_int_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_double_dec(char *data, int bytes, double *dest)
{
E_Ipc_Double *dat;
@@ -199,7 +199,7 @@ e_ipc_codec_double_dec(char *data, int bytes, double *dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_double_enc(double val, int *size_ret)
{
E_Ipc_Double dat;
@@ -208,7 +208,7 @@ e_ipc_codec_double_enc(double val, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_double_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2)
{
E_Ipc_2Int *dat;
@@ -222,7 +222,7 @@ e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_2int_enc(int val1, int val2, int *size_ret)
{
E_Ipc_2Int dat;
@@ -232,7 +232,7 @@ e_ipc_codec_2int_enc(int val1, int val2, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_2int_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_str_dec(char *data, int bytes, char **dest)
{
E_Ipc_Str *dat;
@@ -245,7 +245,7 @@ e_ipc_codec_str_dec(char *data, int bytes, char **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_str_enc(const char *str, int *size_ret)
{
E_Ipc_Str dat;
@@ -254,7 +254,7 @@ e_ipc_codec_str_enc(const char *str, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_str_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest)
{
E_Ipc_2Str *dat;
@@ -266,7 +266,7 @@ e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret)
{
E_Ipc_2Str dat;
@@ -276,7 +276,7 @@ e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_2str_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -289,7 +289,7 @@ e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
@@ -297,7 +297,7 @@ e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_2str_list_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -317,7 +317,7 @@ e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
@@ -338,7 +338,7 @@ e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret)
return data;
}
-EAPI int
+E_API int
e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest)
{
E_Ipc_Str_Int *dat;
@@ -350,7 +350,7 @@ e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret)
{
E_Ipc_Str_Int dat;
@@ -360,7 +360,7 @@ e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_str_int_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -373,7 +373,7 @@ e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
@@ -381,7 +381,7 @@ e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_str_int_list_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest)
{
E_Ipc_2Str_Int *dat;
@@ -393,7 +393,7 @@ e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret)
{
E_Ipc_2Str_Int dat;
@@ -404,7 +404,7 @@ e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_
return eet_data_descriptor_encode(_e_ipc_2str_int_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -417,7 +417,7 @@ e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
@@ -425,7 +425,7 @@ e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_2str_int_list_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest)
{
E_Ipc_4Int_2Str *dat;
@@ -437,7 +437,7 @@ e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret)
{
E_Ipc_4Int_2Str dat;
@@ -451,7 +451,7 @@ e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *st
return eet_data_descriptor_encode(_e_ipc_4int_2str_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -464,7 +464,7 @@ e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
@@ -472,7 +472,7 @@ e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_4int_2str_list_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest)
{
E_Ipc_5Int_2Str *dat;
@@ -484,7 +484,7 @@ e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret)
{
E_Ipc_5Int_2Str dat;
@@ -499,7 +499,7 @@ e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, cons
return eet_data_descriptor_encode(_e_ipc_5int_2str_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -512,7 +512,7 @@ e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
@@ -520,7 +520,7 @@ e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_5int_2str_list_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest)
{
E_Ipc_3Int_4Str *dat;
@@ -532,7 +532,7 @@ e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret)
{
E_Ipc_3Int_4Str dat;
@@ -547,7 +547,7 @@ e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const
return eet_data_descriptor_encode(_e_ipc_3int_4str_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -560,7 +560,7 @@ e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
@@ -568,7 +568,7 @@ e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_3int_4str_list_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest)
{
E_Ipc_3Int_3Str *dat;
@@ -580,7 +580,7 @@ e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret)
{
E_Ipc_3Int_3Str dat;
@@ -594,7 +594,7 @@ e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const
return eet_data_descriptor_encode(_e_ipc_3int_3str_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -607,7 +607,7 @@ e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
@@ -615,7 +615,7 @@ e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret)
return eet_data_descriptor_encode(_e_ipc_3int_3str_list_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest)
{
E_Ipc_Str_4Int *dat;
@@ -627,7 +627,7 @@ e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret)
{
E_Ipc_Str_4Int dat;
@@ -641,7 +641,7 @@ e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val
return eet_data_descriptor_encode(_e_ipc_str_4int_edd, &dat, size_ret);
}
-EAPI int
+E_API int
e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@@ -654,7 +654,7 @@ e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest)
return 1;
}
-EAPI void *
+E_API void *
e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
diff --git a/src/bin/e_ipc_codec.h b/src/bin/e_ipc_codec.h
index d03eb95be..a4bdf5ff4 100644
--- a/src/bin/e_ipc_codec.h
+++ b/src/bin/e_ipc_codec.h
@@ -98,57 +98,57 @@ struct _E_Ipc_Str_4Int
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);
-EAPI int e_ipc_codec_double_dec(char *data, int bytes, double *dest);
-EAPI void *e_ipc_codec_double_enc(double val, int *size_ret);
-EAPI int e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2x);
-EAPI void *e_ipc_codec_2int_enc(int val1, int val2, int *size_ret);
-
-EAPI int e_ipc_codec_str_dec(char *data, int bytes, char **dest);
-EAPI void *e_ipc_codec_str_enc(const char *str, int *size_ret);
-EAPI int e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret);
-
-EAPI int e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest);
-EAPI void *e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret);
-EAPI int e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret);
-
-EAPI int e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest);
-EAPI void *e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret);
-EAPI int e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret);
-
-EAPI int e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest);
-EAPI void *e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret);
-EAPI int e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret);
-
-EAPI int e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest);
-EAPI void *e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret);
-EAPI int e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret);
-
-EAPI int e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest);
-EAPI void *e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret);
-EAPI int e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret);
-
-EAPI int e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest);
-EAPI void *e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret);
-EAPI int e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret);
-
-EAPI int e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest);
-EAPI void *e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret);
-EAPI int e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret);
-
-EAPI int e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest);
-EAPI void *e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret);
-EAPI int e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest);
-EAPI void *e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret);
+E_API int e_ipc_codec_int_dec(char *data, int bytes, int *dest);
+E_API void *e_ipc_codec_int_enc(int val, int *size_ret);
+E_API int e_ipc_codec_double_dec(char *data, int bytes, double *dest);
+E_API void *e_ipc_codec_double_enc(double val, int *size_ret);
+E_API int e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2x);
+E_API void *e_ipc_codec_2int_enc(int val1, int val2, int *size_ret);
+
+E_API int e_ipc_codec_str_dec(char *data, int bytes, char **dest);
+E_API void *e_ipc_codec_str_enc(const char *str, int *size_ret);
+E_API int e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret);
+
+E_API int e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest);
+E_API void *e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret);
+E_API int e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret);
+
+E_API int e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest);
+E_API void *e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret);
+E_API int e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret);
+
+E_API int e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest);
+E_API void *e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret);
+E_API int e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret);
+
+E_API int e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest);
+E_API void *e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret);
+E_API int e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret);
+
+E_API int e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest);
+E_API void *e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret);
+E_API int e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret);
+
+E_API int e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest);
+E_API void *e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret);
+E_API int e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret);
+
+E_API int e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest);
+E_API void *e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret);
+E_API int e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret);
+
+E_API int e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest);
+E_API void *e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret);
+E_API int e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest);
+E_API void *e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret);
#endif
#endif
diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index 51e711932..33ddbf594 100644
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -47,14 +47,14 @@ static void _e_layout_smart_clip_unset(Evas_Object *obj);
static Evas_Smart *_e_smart = NULL;
/* externally accessible functions */
-EAPI Evas_Object *
+E_API Evas_Object *
e_layout_add(Evas *evas)
{
_e_layout_smart_init();
return evas_object_smart_add(evas, _e_smart);
}
-EAPI int
+E_API int
e_layout_freeze(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -65,7 +65,7 @@ e_layout_freeze(Evas_Object *obj)
return sd->frozen;
}
-EAPI int
+E_API int
e_layout_thaw(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -77,7 +77,7 @@ e_layout_thaw(Evas_Object *obj)
return sd->frozen;
}
-EAPI void
+E_API void
e_layout_virtual_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
E_Smart_Data *sd;
@@ -93,7 +93,7 @@ e_layout_virtual_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
if (sd->frozen <= 0) _e_layout_smart_reconfigure(sd);
}
-EAPI void
+E_API void
e_layout_virtual_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{
E_Smart_Data *sd;
@@ -104,7 +104,7 @@ e_layout_virtual_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
if (h) *h = sd->vh;
}
-EAPI void
+E_API void
e_layout_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy)
{
E_Smart_Data *sd;
@@ -116,7 +116,7 @@ e_layout_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy,
if (vy) *vy = (cy - sd->y) * ((double)(sd->vh) / sd->h);
}
-EAPI void
+E_API void
e_layout_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy)
{
E_Smart_Data *sd;
@@ -128,7 +128,7 @@ e_layout_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy,
if (cy) *cy = vy * ((double)(sd->h) / sd->vh) + sd->y;
}
-EAPI void
+E_API void
e_layout_pack(Evas_Object *obj, Evas_Object *child)
{
E_Smart_Data *sd;
@@ -142,7 +142,7 @@ e_layout_pack(Evas_Object *obj, Evas_Object *child)
if (sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
}
-EAPI void
+E_API void
e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
E_Layout_Item *li;
@@ -155,7 +155,7 @@ e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_layout_child_above_get(Evas_Object *obj)
{
E_Layout_Item *li;
@@ -166,7 +166,7 @@ e_layout_child_above_get(Evas_Object *obj)
return li ? li->obj : NULL;
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_layout_child_below_get(Evas_Object *obj)
{
E_Layout_Item *li;
@@ -177,7 +177,7 @@ e_layout_child_below_get(Evas_Object *obj)
return li ? li->obj : NULL;
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_layout_top_child_get(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -190,7 +190,7 @@ e_layout_top_child_get(Evas_Object *obj)
return li->obj;
}
-EAPI void
+E_API void
e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
E_Layout_Item *li;
@@ -205,7 +205,7 @@ e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
}
-EAPI void
+E_API void
e_layout_child_lower(Evas_Object *obj)
{
E_Layout_Item *li;
@@ -217,7 +217,7 @@ e_layout_child_lower(Evas_Object *obj)
evas_object_lower(obj);
}
-EAPI void
+E_API void
e_layout_child_raise(Evas_Object *obj)
{
E_Layout_Item *li;
@@ -229,7 +229,7 @@ e_layout_child_raise(Evas_Object *obj)
evas_object_raise(obj);
}
-EAPI void
+E_API void
e_layout_child_lower_below(Evas_Object *obj, Evas_Object *below)
{
E_Layout_Item *li, *li2;
@@ -245,7 +245,7 @@ e_layout_child_lower_below(Evas_Object *obj, Evas_Object *below)
li->sd->items = eina_inlist_prepend_relative(li->sd->items, EINA_INLIST_GET(li), EINA_INLIST_GET(li2));
}
-EAPI void
+E_API void
e_layout_child_raise_above(Evas_Object *obj, Evas_Object *above)
{
E_Layout_Item *li, *li2;
@@ -261,7 +261,7 @@ e_layout_child_raise_above(Evas_Object *obj, Evas_Object *above)
li->sd->items = eina_inlist_append_relative(li->sd->items, EINA_INLIST_GET(li), EINA_INLIST_GET(li2));
}
-EAPI void
+E_API void
e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
{
E_Layout_Item *li;
@@ -275,7 +275,7 @@ e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas
if (h) *h = li->h;
}
-EAPI void
+E_API void
e_layout_unpack(Evas_Object *obj)
{
E_Layout_Item *li;
@@ -288,7 +288,7 @@ e_layout_unpack(Evas_Object *obj)
_e_layout_smart_disown(obj);
}
-EAPI Eina_List *
+E_API Eina_List *
e_layout_children_get(Evas_Object *obj)
{
E_Smart_Data *sd;
@@ -302,7 +302,7 @@ e_layout_children_get(Evas_Object *obj)
return l;
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_layout_top_child_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Eina_Bool vis, const Eina_List *ignore)
{
E_Smart_Data *sd;
diff --git a/src/bin/e_layout.h b/src/bin/e_layout.h
index 730149aa3..c38fe34e8 100644
--- a/src/bin/e_layout.h
+++ b/src/bin/e_layout.h
@@ -3,30 +3,30 @@
#ifndef E_LAYOUT_H
#define E_LAYOUT_H
-EAPI Evas_Object *e_layout_add (Evas *evas);
-EAPI int e_layout_freeze (Evas_Object *obj);
-EAPI int e_layout_thaw (Evas_Object *obj);
-EAPI void e_layout_virtual_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-EAPI void e_layout_virtual_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+E_API Evas_Object *e_layout_add (Evas *evas);
+E_API int e_layout_freeze (Evas_Object *obj);
+E_API int e_layout_thaw (Evas_Object *obj);
+E_API void e_layout_virtual_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+E_API void e_layout_virtual_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-EAPI void e_layout_coord_canvas_to_virtual (Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy);
-EAPI void e_layout_coord_virtual_to_canvas (Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy);
+E_API void e_layout_coord_canvas_to_virtual (Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy);
+E_API void e_layout_coord_virtual_to_canvas (Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy);
-EAPI void e_layout_pack (Evas_Object *obj, Evas_Object *child);
-EAPI void e_layout_child_move (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-EAPI void e_layout_child_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-EAPI void e_layout_child_raise (Evas_Object *obj);
-EAPI void e_layout_child_lower (Evas_Object *obj);
-EAPI void e_layout_child_raise_above (Evas_Object *obj, Evas_Object *above);
-EAPI void e_layout_child_lower_below (Evas_Object *obj, Evas_Object *below);
-EAPI void e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-EAPI void e_layout_unpack (Evas_Object *obj);
+E_API void e_layout_pack (Evas_Object *obj, Evas_Object *child);
+E_API void e_layout_child_move (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+E_API void e_layout_child_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+E_API void e_layout_child_raise (Evas_Object *obj);
+E_API void e_layout_child_lower (Evas_Object *obj);
+E_API void e_layout_child_raise_above (Evas_Object *obj, Evas_Object *above);
+E_API void e_layout_child_lower_below (Evas_Object *obj, Evas_Object *below);
+E_API void e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+E_API void e_layout_unpack (Evas_Object *obj);
-EAPI Eina_List *e_layout_children_get(Evas_Object *obj);
-EAPI Evas_Object *e_layout_top_child_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Eina_Bool vis, const Eina_List *ignore);
+E_API Eina_List *e_layout_children_get(Evas_Object *obj);
+E_API Evas_Object *e_layout_top_child_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Eina_Bool vis, const Eina_List *ignore);
-EAPI Evas_Object *e_layout_child_below_get(Evas_Object *obj);
-EAPI Evas_Object *e_layout_child_above_get(Evas_Object *obj);
-EAPI Evas_Object *e_layout_top_child_get(Evas_Object *obj);
+E_API Evas_Object *e_layout_child_below_get(Evas_Object *obj);
+E_API Evas_Object *e_layout_child_above_get(Evas_Object *obj);
+E_API Evas_Object *e_layout_top_child_get(Evas_Object *obj);
#endif
#endif
diff --git a/src/bin/e_livethumb.c b/src/bin/e_livethumb.c
index cbb7980d9..818e1f07b 100644
--- a/src/bin/e_livethumb.c
+++ b/src/bin/e_livethumb.c
@@ -35,21 +35,21 @@ static void _e_smart_init(void);
static Evas_Smart *_e_smart = NULL;
/* externally accessible functions */
-EAPI Evas_Object *
+E_API Evas_Object *
e_livethumb_add(Evas *e)
{
_e_smart_init();
return evas_object_smart_add(e, _e_smart);
}
-EAPI Evas *
+E_API Evas *
e_livethumb_evas_get(Evas_Object *obj)
{
API_ENTRY return NULL;
return sd->evas;
}
-EAPI void
+E_API void
e_livethumb_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
API_ENTRY return;
@@ -60,7 +60,7 @@ e_livethumb_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
if (sd->thumb_obj) evas_object_resize(sd->thumb_obj, sd->vw, sd->vh);
}
-EAPI void
+E_API void
e_livethumb_vsize_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{
API_ENTRY return;
@@ -76,7 +76,7 @@ _e_livethumb_edje_preloaded(void *data EINA_UNUSED, Evas_Object *obj,
evas_object_show(obj);
}
-EAPI void
+E_API void
e_livethumb_thumb_set(Evas_Object *obj, Evas_Object *thumb)
{
API_ENTRY return;
@@ -101,7 +101,7 @@ e_livethumb_thumb_set(Evas_Object *obj, Evas_Object *thumb)
evas_object_resize(sd->thumb_obj, sd->vw, sd->vh);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_livethumb_thumb_get(Evas_Object *obj)
{
API_ENTRY return NULL;
diff --git a/src/bin/e_livethumb.h b/src/bin/e_livethumb.h
index 67a78e67e..f2026ff41 100644
--- a/src/bin/e_livethumb.h
+++ b/src/bin/e_livethumb.h
@@ -3,12 +3,12 @@
#ifndef E_LIVETHUMB_H
#define E_LIVETHUMB_H
-EAPI Evas_Object *e_livethumb_add (Evas *e);
-EAPI Evas *e_livethumb_evas_get (Evas_Object *obj);
-EAPI void e_livethumb_vsize_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-EAPI void e_livethumb_vsize_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-EAPI void e_livethumb_thumb_set (Evas_Object *obj, Evas_Object *thumb);
-EAPI Evas_Object *e_livethumb_thumb_get (Evas_Object *obj);
+E_API Evas_Object *e_livethumb_add (Evas *e);
+E_API Evas *e_livethumb_evas_get (Evas_Object *obj);
+E_API void e_livethumb_vsize_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+E_API void e_livethumb_vsize_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+E_API void e_livethumb_thumb_set (Evas_Object *obj, Evas_Object *thumb);
+E_API Evas_Object *e_livethumb_thumb_get (Evas_Object *obj);
#endif
#endif
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 48e7ec0a6..4c37d22ec 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -105,14 +105,14 @@ static Ecore_Idle_Enterer *_idle_flush = NULL;
static Ecore_Event_Handler *mod_init_end = NULL;
/* external variables */
-EAPI Eina_Bool e_precache_end = EINA_FALSE;
-EAPI Eina_Bool x_fatal = EINA_FALSE;
-EAPI Eina_Bool good = EINA_FALSE;
-EAPI Eina_Bool evil = EINA_FALSE;
-EAPI Eina_Bool starting = EINA_TRUE;
-EAPI Eina_Bool stopping = EINA_FALSE;
-EAPI Eina_Bool restart = EINA_FALSE;
-EAPI Eina_Bool e_nopause = EINA_FALSE;
+E_API Eina_Bool e_precache_end = EINA_FALSE;
+E_API Eina_Bool x_fatal = EINA_FALSE;
+E_API Eina_Bool good = EINA_FALSE;
+E_API Eina_Bool evil = EINA_FALSE;
+E_API Eina_Bool starting = EINA_TRUE;
+E_API Eina_Bool stopping = EINA_FALSE;
+E_API Eina_Bool restart = EINA_FALSE;
+E_API Eina_Bool e_nopause = EINA_FALSE;
EINTERN const char *e_first_frame = NULL;
EINTERN double e_first_frame_start_time = -1;
@@ -1065,7 +1065,7 @@ main(int argc, char **argv)
return 0;
}
-EAPI double
+E_API double
e_main_ts(const char *str)
{
double ret;
diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c
index b1f557db1..6cf3b163f 100644
--- a/src/bin/e_maximize.c
+++ b/src/bin/e_maximize.c
@@ -19,13 +19,13 @@ static void _e_maximize_client_rects_fill_both(E_Client *ec, Eina_List *rects, i
static void _e_maximize_client_rects_fill_horiz(E_Client *ec, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh);
static void _e_maximize_client_rects_fill_vert(E_Client *ec, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh);
-EAPI void
+E_API void
e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir)
{
e_maximize_client_shelf_fill(ec, x1, yy1, x2, y2, dir);
}
-EAPI void
+E_API void
e_maximize_client_dock_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2)
{
E_Client *ec2;
@@ -123,7 +123,7 @@ e_maximize_client_dock_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2)
if (y2) *y2 = cy2;
}
-EAPI void
+E_API void
e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir)
{
Eina_List *l, *rects = NULL;
@@ -145,7 +145,7 @@ e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2,
}
}
-EAPI void
+E_API void
e_maximize_client_client_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir)
{
Eina_List *rects = NULL;
diff --git a/src/bin/e_maximize.h b/src/bin/e_maximize.h
index 95d3aa416..ea0852a80 100644
--- a/src/bin/e_maximize.h
+++ b/src/bin/e_maximize.h
@@ -3,10 +3,10 @@
#ifndef E_MAXIMIZE_H
#define E_MAXIMIZE_H
-EAPI void e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
-EAPI void e_maximize_client_dock_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2);
-EAPI void e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
-EAPI void e_maximize_client_client_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
+E_API void e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
+E_API void e_maximize_client_dock_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2);
+E_API void e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
+E_API void e_maximize_client_client_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
#endif
#endif
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 792c42f4c..267d50977 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -192,7 +192,7 @@ e_menu_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_menu_hide_all(void)
{
E_Menu *m;
@@ -208,7 +208,7 @@ e_menu_hide_all(void)
}
}
-EAPI E_Menu *
+E_API E_Menu *
e_menu_new(void)
{
E_Menu *m;
@@ -221,7 +221,7 @@ e_menu_new(void)
return m;
}
-EAPI void
+E_API void
e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir)
{
E_OBJECT_CHECK(m);
@@ -294,7 +294,7 @@ e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir
}
}
-EAPI void
+E_API void
e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir, unsigned int activate_time)
{
E_Menu_Item *pmi;
@@ -360,7 +360,7 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
_mouse_up_feed(e_comp->evas, activate_time);
}
-EAPI void
+E_API void
e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir)
{
E_Menu_Item *pmi;
@@ -429,7 +429,7 @@ e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir)
if (pmi) e_menu_item_active_set(pmi, 0);
}
-EAPI void
+E_API void
e_menu_deactivate(E_Menu *m)
{
E_OBJECT_CHECK(m);
@@ -441,7 +441,7 @@ e_menu_deactivate(E_Menu *m)
m->post_deactivate_cb.func(m->post_deactivate_cb.data, m);
}
-EAPI int
+E_API int
e_menu_freeze(E_Menu *m)
{
E_OBJECT_CHECK_RETURN(m, 0);
@@ -450,7 +450,7 @@ e_menu_freeze(E_Menu *m)
return m->frozen;
}
-EAPI int
+E_API int
e_menu_thaw(E_Menu *m)
{
E_OBJECT_CHECK_RETURN(m, 0);
@@ -460,7 +460,7 @@ e_menu_thaw(E_Menu *m)
return m->frozen;
}
-EAPI void
+E_API void
e_menu_title_set(E_Menu *m, const char *title)
{
E_OBJECT_CHECK(m);
@@ -483,7 +483,7 @@ e_menu_title_set(E_Menu *m, const char *title)
edje_object_message_signal_process(m->bg_object);
}
-EAPI void
+E_API void
e_menu_icon_file_set(E_Menu *m EINA_UNUSED, const char *icon EINA_UNUSED)
{
/* FIXME: support menu icons
@@ -492,7 +492,7 @@ e_menu_icon_file_set(E_Menu *m EINA_UNUSED, const char *icon EINA_UNUSED)
*/
}
-EAPI void
+E_API void
e_menu_category_set(E_Menu *m, const char *category)
{
E_OBJECT_CHECK(m);
@@ -509,7 +509,7 @@ e_menu_category_set(E_Menu *m, const char *category)
m->changed = 1;
}
-EAPI void
+E_API void
e_menu_category_data_set(char *category, void *data)
{
E_Menu_Category *cat;
@@ -525,7 +525,7 @@ e_menu_category_data_set(char *category, void *data)
}
}
-EAPI E_Menu_Category_Callback *
+E_API E_Menu_Category_Callback *
e_menu_category_callback_add(char *category, void (*create_cb)(void *data, E_Menu *m, void *category_data), Ecore_Cb free_cb, void *data)
{
E_Menu_Category *cat;
@@ -552,7 +552,7 @@ e_menu_category_callback_add(char *category, void (*create_cb)(void *data, E_Men
return cb;
}
-EAPI void
+E_API void
e_menu_category_callback_del(E_Menu_Category_Callback *cb)
{
E_Menu_Category *cat;
@@ -567,7 +567,7 @@ e_menu_category_callback_del(E_Menu_Category_Callback *cb)
}
}
-EAPI void
+E_API void
e_menu_pre_activate_callback_set(E_Menu *m, void (*func)(void *data, E_Menu *m), void *data)
{
E_OBJECT_CHECK(m);
@@ -576,7 +576,7 @@ e_menu_pre_activate_callback_set(E_Menu *m, void (*func)(void *data, E_Menu *m),
m->pre_activate_cb.data = data;
}
-EAPI void
+E_API void
e_menu_post_deactivate_callback_set(E_Menu *m, void (*func)(void *data, E_Menu *m), void *data)
{
E_OBJECT_CHECK(m);
@@ -585,7 +585,7 @@ e_menu_post_deactivate_callback_set(E_Menu *m, void (*func)(void *data, E_Menu *
m->post_deactivate_cb.data = data;
}
-EAPI E_Menu *
+E_API E_Menu *
e_menu_root_get(E_Menu *m)
{
E_Menu *ret;
@@ -599,7 +599,7 @@ e_menu_root_get(E_Menu *m)
return ret;
}
-EAPI E_Menu_Item *
+E_API E_Menu_Item *
e_menu_item_new(E_Menu *m)
{
E_Menu_Item *mi;
@@ -613,7 +613,7 @@ e_menu_item_new(E_Menu *m)
return mi;
}
-EAPI E_Menu_Item *
+E_API E_Menu_Item *
e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel)
{
E_Menu_Item *mi;
@@ -646,7 +646,7 @@ e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel)
return mi;
}
-EAPI E_Menu_Item *
+E_API E_Menu_Item *
e_menu_item_nth(E_Menu *m, int n)
{
E_OBJECT_CHECK_RETURN(m, NULL);
@@ -654,7 +654,7 @@ e_menu_item_nth(E_Menu *m, int n)
return (E_Menu_Item *)eina_list_nth(m->items, n);
}
-EAPI int
+E_API int
e_menu_item_num_get(const E_Menu_Item *mi)
{
const Eina_List *l;
@@ -672,7 +672,7 @@ e_menu_item_num_get(const E_Menu_Item *mi)
return -1;
}
-EAPI void
+E_API void
e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon)
{
E_OBJECT_CHECK(mi);
@@ -694,7 +694,7 @@ e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon)
mi->menu->changed = 1;
}
-EAPI void
+E_API void
e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key)
{
E_OBJECT_CHECK(mi);
@@ -709,7 +709,7 @@ e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key)
mi->menu->changed = 1;
}
-EAPI void
+E_API void
e_menu_item_label_set(E_Menu_Item *mi, const char *label)
{
E_OBJECT_CHECK(mi);
@@ -724,7 +724,7 @@ e_menu_item_label_set(E_Menu_Item *mi, const char *label)
mi->menu->changed = 1;
}
-EAPI void
+E_API void
e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub)
{
Eina_Bool submenu = EINA_FALSE;
@@ -810,7 +810,7 @@ out:
_e_menu_list_free_unref(tmp);
}
-EAPI void
+E_API void
e_menu_item_separator_set(E_Menu_Item *mi, int sep)
{
E_OBJECT_CHECK(mi);
@@ -821,7 +821,7 @@ e_menu_item_separator_set(E_Menu_Item *mi, int sep)
mi->menu->changed = 1;
}
-EAPI void
+E_API void
e_menu_item_check_set(E_Menu_Item *mi, int chk)
{
E_OBJECT_CHECK(mi);
@@ -832,7 +832,7 @@ e_menu_item_check_set(E_Menu_Item *mi, int chk)
mi->menu->changed = 1;
}
-EAPI void
+E_API void
e_menu_item_radio_set(E_Menu_Item *mi, int rad)
{
E_OBJECT_CHECK(mi);
@@ -843,7 +843,7 @@ e_menu_item_radio_set(E_Menu_Item *mi, int rad)
mi->menu->changed = 1;
}
-EAPI void
+E_API void
e_menu_item_radio_group_set(E_Menu_Item *mi, int radg)
{
E_OBJECT_CHECK(mi);
@@ -854,7 +854,7 @@ e_menu_item_radio_group_set(E_Menu_Item *mi, int radg)
mi->menu->changed = 1;
}
-EAPI void
+E_API void
e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
{
E_OBJECT_CHECK(mi);
@@ -909,7 +909,7 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
}
}
-EAPI int
+E_API int
e_menu_item_toggle_get(E_Menu_Item *mi)
{
E_OBJECT_CHECK_RETURN(mi, 0);
@@ -917,7 +917,7 @@ e_menu_item_toggle_get(E_Menu_Item *mi)
return mi->toggle;
}
-EAPI void
+E_API void
e_menu_item_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), const void *data)
{
E_OBJECT_CHECK(mi);
@@ -926,7 +926,7 @@ e_menu_item_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_
mi->cb.data = (void *)data;
}
-EAPI void
+E_API void
e_menu_item_realize_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), void *data)
{
E_OBJECT_CHECK(mi);
@@ -935,7 +935,7 @@ e_menu_item_realize_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Men
mi->realize_cb.data = data;
}
-EAPI void
+E_API void
e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), const void *data)
{
E_OBJECT_CHECK(mi);
@@ -946,7 +946,7 @@ e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, void (*func)(void *data, E
mi->submenu_post_cb.func = _e_menu_cb_item_submenu_post_default;
}
-EAPI void
+E_API void
e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), const void *data)
{
E_OBJECT_CHECK(mi);
@@ -955,7 +955,7 @@ e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, void (*func)(void *data,
mi->submenu_post_cb.data = (void *)data;
}
-EAPI void
+E_API void
e_menu_item_drag_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), void *data)
{
E_OBJECT_CHECK(mi);
@@ -964,7 +964,7 @@ e_menu_item_drag_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *
mi->drag_cb.data = data;
}
-EAPI void
+E_API void
e_menu_item_active_set(E_Menu_Item *mi, int active)
{
Eina_List *tmp = NULL;
@@ -1047,20 +1047,20 @@ e_menu_item_active_set(E_Menu_Item *mi, int active)
_e_menu_list_free_unref(tmp);
}
-EAPI E_Menu_Item *
+E_API E_Menu_Item *
e_menu_item_active_get(void)
{
return _e_active_menu_item;
}
-EAPI void
+E_API void
e_menu_active_item_activate(void)
{
_e_menu_active_call();
_e_menu_deactivate_all();
}
-EAPI void
+E_API void
e_menu_item_disabled_set(E_Menu_Item *mi, int disable)
{
E_OBJECT_CHECK(mi);
@@ -1089,7 +1089,7 @@ e_menu_item_disabled_set(E_Menu_Item *mi, int disable)
}
}
-EAPI void
+E_API void
e_menu_idler_before(void)
{
/* when e goes "idle" this gets called so leave all our hard work till */
@@ -1201,7 +1201,7 @@ e_menu_idler_before(void)
}
}
-EAPI Ecore_Window
+E_API Ecore_Window
e_menu_grab_window_get(void)
{
return _e_menu_win;
diff --git a/src/bin/e_menu.h b/src/bin/e_menu.h
index 8206afd77..ec9ec516e 100644
--- a/src/bin/e_menu.h
+++ b/src/bin/e_menu.h
@@ -154,56 +154,56 @@ struct _E_Menu_Category_Callback
EINTERN int e_menu_init(void);
EINTERN int e_menu_shutdown(void);
-EAPI void e_menu_hide_all(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);
-EAPI void e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir, unsigned int activate_time);
-EAPI void e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir);
-EAPI void e_menu_deactivate(E_Menu *m);
-EAPI int e_menu_freeze(E_Menu *m);
-EAPI int e_menu_thaw(E_Menu *m);
-EAPI void e_menu_title_set(E_Menu *m, const char *title);
-EAPI void e_menu_icon_file_set(E_Menu *m, const char *icon);
+E_API void e_menu_hide_all(void);
+E_API E_Menu *e_menu_new(void);
+E_API void e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir);
+E_API void e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir, unsigned int activate_time);
+E_API void e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir);
+E_API void e_menu_deactivate(E_Menu *m);
+E_API int e_menu_freeze(E_Menu *m);
+E_API int e_menu_thaw(E_Menu *m);
+E_API void e_menu_title_set(E_Menu *m, const char *title);
+E_API void e_menu_icon_file_set(E_Menu *m, const char *icon);
/* menu categories functions */
-EAPI void e_menu_category_set(E_Menu *m, const char *category);
-EAPI void e_menu_category_data_set(char *category, void *data);
-EAPI E_Menu_Category_Callback *e_menu_category_callback_add(char *category, void (*create_cb) (void *data, E_Menu *m, void *category_data), Ecore_Cb free_cb, void *data);
-EAPI void e_menu_category_callback_del(E_Menu_Category_Callback *cb);
-
-
-EAPI void e_menu_pre_activate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data);
-EAPI void e_menu_post_deactivate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data);
-
-EAPI E_Menu *e_menu_root_get(E_Menu *m);
-
-EAPI E_Menu_Item *e_menu_item_new(E_Menu *m);
-EAPI E_Menu_Item *e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel);
-EAPI E_Menu_Item *e_menu_item_nth(E_Menu *m, int n);
-EAPI int e_menu_item_num_get(const E_Menu_Item *mi);
-EAPI void e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon);
-EAPI void e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key);
-EAPI void e_menu_item_label_set(E_Menu_Item *mi, const char *label);
-EAPI void e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub);
-EAPI void e_menu_item_separator_set(E_Menu_Item *mi, int sep);
-EAPI void e_menu_item_check_set(E_Menu_Item *mi, int chk);
-EAPI void e_menu_item_radio_set(E_Menu_Item *mi, int rad);
-EAPI void e_menu_item_radio_group_set(E_Menu_Item *mi, int radg);
-EAPI void e_menu_item_toggle_set(E_Menu_Item *mi, int tog);
-EAPI int e_menu_item_toggle_get(E_Menu_Item *mi);
-EAPI void e_menu_item_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data);
-EAPI void e_menu_item_realize_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data);
-EAPI void e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data);
-EAPI void e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data);
-EAPI void e_menu_item_drag_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data);
-EAPI E_Menu_Item *e_menu_item_active_get(void);
-EAPI void e_menu_active_item_activate(void);
-EAPI void e_menu_item_active_set(E_Menu_Item *mi, int active);
-EAPI void e_menu_item_disabled_set(E_Menu_Item *mi, int disable);
-
-EAPI void e_menu_idler_before(void);
-
-EAPI Ecore_Window e_menu_grab_window_get(void);
+E_API void e_menu_category_set(E_Menu *m, const char *category);
+E_API void e_menu_category_data_set(char *category, void *data);
+E_API E_Menu_Category_Callback *e_menu_category_callback_add(char *category, void (*create_cb) (void *data, E_Menu *m, void *category_data), Ecore_Cb free_cb, void *data);
+E_API void e_menu_category_callback_del(E_Menu_Category_Callback *cb);
+
+
+E_API void e_menu_pre_activate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data);
+E_API void e_menu_post_deactivate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data);
+
+E_API E_Menu *e_menu_root_get(E_Menu *m);
+
+E_API E_Menu_Item *e_menu_item_new(E_Menu *m);
+E_API E_Menu_Item *e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel);
+E_API E_Menu_Item *e_menu_item_nth(E_Menu *m, int n);
+E_API int e_menu_item_num_get(const E_Menu_Item *mi);
+E_API void e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon);
+E_API void e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key);
+E_API void e_menu_item_label_set(E_Menu_Item *mi, const char *label);
+E_API void e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub);
+E_API void e_menu_item_separator_set(E_Menu_Item *mi, int sep);
+E_API void e_menu_item_check_set(E_Menu_Item *mi, int chk);
+E_API void e_menu_item_radio_set(E_Menu_Item *mi, int rad);
+E_API void e_menu_item_radio_group_set(E_Menu_Item *mi, int radg);
+E_API void e_menu_item_toggle_set(E_Menu_Item *mi, int tog);
+E_API int e_menu_item_toggle_get(E_Menu_Item *mi);
+E_API void e_menu_item_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data);
+E_API void e_menu_item_realize_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data);
+E_API void e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data);
+E_API void e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data);
+E_API void e_menu_item_drag_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data);
+E_API E_Menu_Item *e_menu_item_active_get(void);
+E_API void e_menu_active_item_activate(void);
+E_API void e_menu_item_active_set(E_Menu_Item *mi, int active);
+E_API void e_menu_item_disabled_set(E_Menu_Item *mi, int disable);
+
+E_API void e_menu_idler_before(void);
+
+E_API Ecore_Window e_menu_grab_window_get(void);
#endif
#endif
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index baa8ba8d7..3d21468c1 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -30,8 +30,8 @@ static Eina_List *_e_module_path_lists = NULL;
static Eina_List *handlers = NULL;
static Eina_Hash *_e_module_path_hash = NULL;
-EAPI int E_EVENT_MODULE_UPDATE = 0;
-EAPI int E_EVENT_MODULE_INIT_END = 0;
+E_API int E_EVENT_MODULE_UPDATE = 0;
+E_API int E_EVENT_MODULE_INIT_END = 0;
static Eina_Stringshare *mod_src_path = NULL;
@@ -223,7 +223,7 @@ e_module_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_module_all_load(void)
{
Eina_List *l, *ll;
@@ -283,13 +283,13 @@ e_module_all_load(void)
unsetenv("E_MODULE_LOAD");
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_module_loading_get(void)
{
return !_e_modules_init_end;
}
-EAPI E_Module *
+E_API E_Module *
e_module_new(const char *name)
{
E_Module *m;
@@ -456,7 +456,7 @@ init_done:
return m;
}
-EAPI int
+E_API int
e_module_save(E_Module *m)
{
E_OBJECT_CHECK_RETURN(m, 0);
@@ -465,7 +465,7 @@ e_module_save(E_Module *m)
return m->func.save ? m->func.save(m) : 1;
}
-EAPI const char *
+E_API const char *
e_module_dir_get(E_Module *m)
{
E_OBJECT_CHECK_RETURN(m, NULL);
@@ -473,7 +473,7 @@ e_module_dir_get(E_Module *m)
return m->dir;
}
-EAPI int
+E_API int
e_module_enable(E_Module *m)
{
Eina_List *l;
@@ -510,7 +510,7 @@ e_module_enable(E_Module *m)
return 0;
}
-EAPI int
+E_API int
e_module_disable(E_Module *m)
{
E_Event_Module_Update *ev;
@@ -543,7 +543,7 @@ e_module_disable(E_Module *m)
return ret;
}
-EAPI int
+E_API int
e_module_enabled_get(E_Module *m)
{
E_OBJECT_CHECK_RETURN(m, 0);
@@ -551,7 +551,7 @@ e_module_enabled_get(E_Module *m)
return m->enabled;
}
-EAPI int
+E_API int
e_module_save_all(void)
{
Eina_List *l;
@@ -570,20 +570,20 @@ e_module_save_all(void)
return ret;
}
-EAPI E_Module *
+E_API E_Module *
e_module_find(const char *name)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);
return eina_hash_find(_e_modules_hash, name);
}
-EAPI Eina_List *
+E_API Eina_List *
e_module_list(void)
{
return _e_modules;
}
-EAPI void
+E_API void
e_module_dialog_show(E_Module *m, const char *title, const char *body)
{
E_Dialog *dia;
@@ -631,7 +631,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body)
e_win_client_icon_set(dia->win, icon);
}
-EAPI void
+E_API void
e_module_delayed_set(E_Module *m, int delayed)
{
Eina_List *l;
@@ -652,7 +652,7 @@ e_module_delayed_set(E_Module *m, int delayed)
}
}
-EAPI void
+E_API void
e_module_priority_set(E_Module *m, int priority)
{
/* Set the loading order for a module.
@@ -675,7 +675,7 @@ e_module_priority_set(E_Module *m, int priority)
}
}
-EAPI Eina_List *
+E_API Eina_List *
e_module_desktop_list(void)
{
Eina_List *l = NULL;
@@ -684,7 +684,7 @@ e_module_desktop_list(void)
return l;
}
-EAPI void
+E_API void
e_module_desktop_free(E_Module_Desktop *md)
{
if (!md) return;
diff --git a/src/bin/e_module.h b/src/bin/e_module.h
index 72075d104..07a51f8c2 100644
--- a/src/bin/e_module.h
+++ b/src/bin/e_module.h
@@ -15,8 +15,8 @@ typedef struct E_Module_Desktop E_Module_Desktop;
#define E_MODULE_TYPE 0xE0b0100b
-extern EAPI int E_EVENT_MODULE_UPDATE;
-extern EAPI int E_EVENT_MODULE_INIT_END;
+extern E_API int E_EVENT_MODULE_UPDATE;
+extern E_API int E_EVENT_MODULE_INIT_END;
struct _E_Event_Module_Update
{
@@ -62,21 +62,21 @@ struct _E_Module_Api
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);
-EAPI int e_module_save(E_Module *m);
-EAPI const char *e_module_dir_get(E_Module *m);
-EAPI int e_module_enable(E_Module *m);
-EAPI int e_module_disable(E_Module *m);
-EAPI int e_module_enabled_get(E_Module *m);
-EAPI int e_module_save_all(void);
-EAPI E_Module *e_module_find(const char *name);
-EAPI Eina_List *e_module_list(void);
-EAPI Eina_List *e_module_desktop_list(void);
-EAPI void e_module_desktop_free(E_Module_Desktop *md);
-EAPI void e_module_dialog_show(E_Module *m, const char *title, const char *body);
-EAPI void e_module_delayed_set(E_Module *m, int delayed);
-EAPI void e_module_priority_set(E_Module *m, int priority);
-EAPI Eina_Bool e_module_loading_get(void);
+E_API void e_module_all_load(void);
+E_API E_Module *e_module_new(const char *name);
+E_API int e_module_save(E_Module *m);
+E_API const char *e_module_dir_get(E_Module *m);
+E_API int e_module_enable(E_Module *m);
+E_API int e_module_disable(E_Module *m);
+E_API int e_module_enabled_get(E_Module *m);
+E_API int e_module_save_all(void);
+E_API E_Module *e_module_find(const char *name);
+E_API Eina_List *e_module_list(void);
+E_API Eina_List *e_module_desktop_list(void);
+E_API void e_module_desktop_free(E_Module_Desktop *md);
+E_API void e_module_dialog_show(E_Module *m, const char *title, const char *body);
+E_API void e_module_delayed_set(E_Module *m, int delayed);
+E_API void e_module_priority_set(E_Module *m, int priority);
+E_API Eina_Bool e_module_loading_get(void);
#endif
#endif
diff --git a/src/bin/e_mouse.c b/src/bin/e_mouse.c
index 7cae8ecc3..5de709d86 100644
--- a/src/bin/e_mouse.c
+++ b/src/bin/e_mouse.c
@@ -1,6 +1,6 @@
#include "e.h"
-EAPI int
+E_API int
e_mouse_update(void)
{
unsigned char map[256] = { 0 };
diff --git a/src/bin/e_mouse.h b/src/bin/e_mouse.h
index 39115c6ea..f86c0b243 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_update(void);
+E_API int e_mouse_update(void);
#endif
#endif
diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c
index b5a844d70..d78d65bdf 100644
--- a/src/bin/e_moveresize.c
+++ b/src/bin/e_moveresize.c
@@ -47,13 +47,13 @@ e_moveresize_shutdown(void)
return 1;
}
-EAPI void
+E_API void
e_moveresize_replace(Eina_Bool enable)
{
_e_moveresize_enabled = !enable;
}
-EAPI void
+E_API void
e_moveresize_client_extents(const E_Client *ec, int *w, int *h)
{
if ((ec->icccm.base_w >= 0) &&
diff --git a/src/bin/e_moveresize.h b/src/bin/e_moveresize.h
index 11b47ae96..273c97ca9 100644
--- a/src/bin/e_moveresize.h
+++ b/src/bin/e_moveresize.h
@@ -6,7 +6,7 @@
EINTERN int e_moveresize_init(void);
EINTERN int e_moveresize_shutdown(void);
-EAPI void e_moveresize_replace(Eina_Bool enable);
-EAPI void e_moveresize_client_extents(const E_Client *ec, int *w, int *h);
+E_API void e_moveresize_replace(Eina_Bool enable);
+E_API void e_moveresize_client_extents(const E_Client *ec, int *w, int *h);
#endif
#endif
diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c
index 4edcc43ce..0b549017b 100644
--- a/src/bin/e_msg.c
+++ b/src/bin/e_msg.c
@@ -51,7 +51,7 @@ e_msg_shutdown(void)
return 1;
}
-EAPI void
+E_API 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)
{
unsigned int size, pos, name_len, info_len;
@@ -84,7 +84,7 @@ e_msg_send(const char *name, const char *info, int val, E_Object *obj, void *msg
ecore_event_add(E_EVENT_MSG, ev, _e_msg_event_free, NULL);
}
-EAPI E_Msg_Handler *
+E_API 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)
{
E_Msg_Handler *emsgh;
@@ -97,7 +97,7 @@ e_msg_handler_add(void (*func)(void *data, const char *name, const char *info, i
return emsgh;
}
-EAPI void
+E_API void
e_msg_handler_del(E_Msg_Handler *emsgh)
{
if (processing_handlers > 0)
diff --git a/src/bin/e_msg.h b/src/bin/e_msg.h
index 247903f17..031e15acd 100644
--- a/src/bin/e_msg.h
+++ b/src/bin/e_msg.h
@@ -9,9 +9,9 @@ typedef struct _E_Msg_Handler E_Msg_Handler;
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);
-EAPI void e_msg_handler_del(E_Msg_Handler *emsgh);
+E_API 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);
+E_API 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);
+E_API void e_msg_handler_del(E_Msg_Handler *emsgh);
#endif
#endif
diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c
index 1c8a9347c..03f882801 100644
--- a/src/bin/e_msgbus.c
+++ b/src/bin/e_msgbus.c
@@ -154,7 +154,7 @@ e_msgbus_shutdown(void)
return 1;
}
-EAPI Eldbus_Service_Interface *
+E_API Eldbus_Service_Interface *
e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc)
{
if (!_e_msgbus_data->iface)
diff --git a/src/bin/e_msgbus.h b/src/bin/e_msgbus.h
index ae4857217..1e6f621ac 100644
--- a/src/bin/e_msgbus.h
+++ b/src/bin/e_msgbus.h
@@ -16,7 +16,7 @@ struct _E_Msgbus_Data
EINTERN int e_msgbus_init(void);
EINTERN int e_msgbus_shutdown(void);
-EAPI Eldbus_Service_Interface *e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc);
+E_API Eldbus_Service_Interface *e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc);
#endif
#endif
diff --git a/src/bin/e_notification.c b/src/bin/e_notification.c
index ae57eb793..08883c804 100644
--- a/src/bin/e_notification.c
+++ b/src/bin/e_notification.c
@@ -184,7 +184,7 @@ static const Eldbus_Service_Interface_Desc desc = {
INTERFACE, methods, signals, NULL, NULL, NULL
};
-EAPI Eina_Bool
+E_API Eina_Bool
e_notification_server_register(const E_Notification_Server_Info *server_info, E_Notification_Notify_Cb n_cb, E_Notification_Close_Cb close_cb, const void *data)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(server_info, EINA_FALSE);
@@ -206,7 +206,7 @@ e_notification_server_register(const E_Notification_Server_Info *server_info, E_
return EINA_TRUE;
}
-EAPI void
+E_API void
e_notification_server_unregister(void)
{
EINA_SAFETY_ON_NULL_RETURN(n_data);
@@ -217,7 +217,7 @@ e_notification_server_unregister(void)
n_data = NULL;
}
-EAPI void
+E_API void
e_notification_notify_close(E_Notification_Notify *notify, E_Notification_Notify_Closed_Reason reason)
{
EINA_SAFETY_ON_NULL_RETURN(n_data);
@@ -227,7 +227,7 @@ e_notification_notify_close(E_Notification_Notify *notify, E_Notification_Notify
notify->id, reason);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_notification_notify_raw_image_get(E_Notification_Notify *notify, Evas *evas)
{
Evas_Object *o;
@@ -392,7 +392,7 @@ normalize_notify(E_Notification_Notify *notify)
notify->timeout = -1;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_notification_client_send(E_Notification_Notify *notify, E_Notification_Client_Send_Cb cb, const void *data)
{
unsigned id;
diff --git a/src/bin/e_notification.h b/src/bin/e_notification.h
index e97ee00d0..8f0bbc3f0 100644
--- a/src/bin/e_notification.h
+++ b/src/bin/e_notification.h
@@ -68,19 +68,19 @@ typedef struct _E_Notification_Server_Info
*
* @return EINA_TRUE if server was registered, EINA_FALSE otherwise.
*/
-EAPI Eina_Bool e_notification_server_register(const E_Notification_Server_Info *server_info, E_Notification_Notify_Cb notify_cb, E_Notification_Close_Cb close_cb, const void *data);
+E_API Eina_Bool e_notification_server_register(const E_Notification_Server_Info *server_info, E_Notification_Notify_Cb notify_cb, E_Notification_Close_Cb close_cb, const void *data);
/**
* Unregister the sole notification server
*/
-EAPI void e_notification_server_unregister(void);
+E_API void e_notification_server_unregister(void);
-EAPI void e_notification_notify_close(E_Notification_Notify *notify, E_Notification_Notify_Closed_Reason reason);
-EAPI Evas_Object *e_notification_notify_raw_image_get(E_Notification_Notify *notify, Evas *evas);
+E_API void e_notification_notify_close(E_Notification_Notify *notify, E_Notification_Notify_Closed_Reason reason);
+E_API Evas_Object *e_notification_notify_raw_image_get(E_Notification_Notify *notify, Evas *evas);
//client
typedef void (*E_Notification_Client_Send_Cb)(void *data, unsigned int id);
-EAPI Eina_Bool e_notification_client_send(E_Notification_Notify *notify, E_Notification_Client_Send_Cb cb, const void *data);
+E_API Eina_Bool e_notification_client_send(E_Notification_Notify *notify, E_Notification_Client_Send_Cb cb, const void *data);
#endif
diff --git a/src/bin/e_obj_dialog.c b/src/bin/e_obj_dialog.c
index a2a703131..c74f60f8d 100644
--- a/src/bin/e_obj_dialog.c
+++ b/src/bin/e_obj_dialog.c
@@ -18,7 +18,7 @@ _key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
_e_obj_dialog_cb_delete(data, NULL, NULL, NULL);
}
-EAPI E_Obj_Dialog *
+E_API E_Obj_Dialog *
e_obj_dialog_new(char *title, char *class_name, char *class_class)
{
E_Obj_Dialog *od;
@@ -55,13 +55,13 @@ e_obj_dialog_new(char *title, char *class_name, char *class_class)
return od;
}
-EAPI void
+E_API void
e_obj_dialog_cb_delete_set(E_Obj_Dialog *od, void (*func)(E_Obj_Dialog *od))
{
od->cb_delete = func;
}
-EAPI void
+E_API void
e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon)
{
E_OBJECT_CHECK(od);
@@ -69,7 +69,7 @@ e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon)
e_win_client_icon_set(od->win, icon);
}
-EAPI void
+E_API void
e_obj_dialog_show(E_Obj_Dialog *od)
{
Evas_Coord w, h, mw, mh;
@@ -96,7 +96,7 @@ e_obj_dialog_show(E_Obj_Dialog *od)
evas_object_show(od->win);
}
-EAPI void
+E_API void
e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *text)
{
E_OBJECT_CHECK(od);
@@ -104,7 +104,7 @@ e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *t
edje_object_part_text_set(od->bg_object, part, text);
}
-EAPI void
+E_API void
e_obj_dialog_obj_theme_set(E_Obj_Dialog *od, char *theme_cat, char *theme_obj)
{
E_OBJECT_CHECK(od);
diff --git a/src/bin/e_obj_dialog.h b/src/bin/e_obj_dialog.h
index a6dc9524d..5ce2dfc71 100644
--- a/src/bin/e_obj_dialog.h
+++ b/src/bin/e_obj_dialog.h
@@ -18,12 +18,12 @@ struct _E_Obj_Dialog
void (*cb_delete)(E_Obj_Dialog *od);
};
-EAPI E_Obj_Dialog *e_obj_dialog_new(char *title, char *class_name, char *class_class);
-EAPI void e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon);
-EAPI void e_obj_dialog_show(E_Obj_Dialog *od);
-EAPI void e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *text);
-EAPI void e_obj_dialog_obj_theme_set(E_Obj_Dialog *od, char *theme_cat, char *theme_obj);
-EAPI void e_obj_dialog_cb_delete_set(E_Obj_Dialog *od, void (*func)(E_Obj_Dialog *od));
+E_API E_Obj_Dialog *e_obj_dialog_new(char *title, char *class_name, char *class_class);
+E_API void e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon);
+E_API void e_obj_dialog_show(E_Obj_Dialog *od);
+E_API void e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *text);
+E_API void e_obj_dialog_obj_theme_set(E_Obj_Dialog *od, char *theme_cat, char *theme_obj);
+E_API void e_obj_dialog_cb_delete_set(E_Obj_Dialog *od, void (*func)(E_Obj_Dialog *od));
#endif
#endif
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index b8bb78e21..3af9dcebb 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -12,7 +12,7 @@ static sigjmp_buf _e_object_segv_buf;
#endif
/* externally accessible functions */
-EAPI void *
+E_API void *
e_object_alloc(int size, int type, E_Object_Cleanup_Func cleanup_func)
{
E_Object *obj;
@@ -37,7 +37,7 @@ _delay_del(void *data)
e_object_unref(obj);
}
-EAPI void
+E_API void
e_object_del(E_Object *obj)
{
E_OBJECT_CHECK(obj);
@@ -60,35 +60,35 @@ e_object_del(E_Object *obj)
e_object_unref(obj);
}
-EAPI void
+E_API void
e_object_delay_del_set(E_Object *obj, void *func)
{
E_OBJECT_CHECK(obj);
obj->del_delay_func = func;
}
-EAPI int
+E_API int
e_object_is_del(E_Object *obj)
{
E_OBJECT_CHECK_RETURN(obj, 1);
return obj->deleted;
}
-EAPI void
+E_API void
e_object_del_func_set(E_Object *obj, E_Object_Cleanup_Func del_func)
{
E_OBJECT_CHECK(obj);
obj->del_func = del_func;
}
-EAPI void
+E_API void
e_object_type_set(E_Object *obj, int type)
{
E_OBJECT_CHECK(obj);
obj->type = type;
}
-EAPI void
+E_API void
e_object_free(E_Object *obj)
{
E_OBJECT_CHECK(obj);
@@ -119,7 +119,7 @@ e_object_free(E_Object *obj)
obj->cleanup_func(obj);
}
-EAPI int
+E_API int
e_object_ref(E_Object *obj)
{
E_OBJECT_CHECK_RETURN(obj, -1);
@@ -129,7 +129,7 @@ e_object_ref(E_Object *obj)
return obj->references;
}
-EAPI int
+E_API int
e_object_unref(E_Object *obj)
{
int ref;
@@ -153,7 +153,7 @@ e_object_unref(E_Object *obj)
return ref;
}
-EAPI int
+E_API int
e_object_ref_get(E_Object *obj)
{
E_OBJECT_CHECK_RETURN(obj, 0);
@@ -161,7 +161,7 @@ e_object_ref_get(E_Object *obj)
}
#if 0
-EAPI void
+E_API void
e_bt(void)
{
int i, trace_num;
@@ -185,7 +185,7 @@ e_bt(void)
#endif
-EAPI int
+E_API int
e_object_error(E_Object *obj)
{
#ifdef OBJECT_PARANOIA_CHECK
@@ -302,42 +302,42 @@ e_object_error(E_Object *obj)
#endif
}
-EAPI void
+E_API void
e_object_data_set(E_Object *obj, const void *data)
{
E_OBJECT_CHECK(obj);
obj->data = (void *)data;
}
-EAPI void *
+E_API void *
e_object_data_get(E_Object *obj)
{
E_OBJECT_CHECK_RETURN(obj, NULL);
return obj->data;
}
-EAPI void
+E_API void
e_object_free_attach_func_set(E_Object *obj, E_Object_Cleanup_Func func)
{
E_OBJECT_CHECK(obj);
obj->free_att_func = func;
}
-EAPI void
+E_API void
e_object_del_attach_func_set(E_Object *obj, E_Object_Cleanup_Func func)
{
E_OBJECT_CHECK(obj);
obj->del_att_func = func;
}
-EAPI void
+E_API void
e_object_ref_debug_set(E_Object *obj, Eina_Bool set)
{
E_OBJECT_CHECK(obj);
obj->ref_debug = !!set;
}
-EAPI void
+E_API void
e_object_delfn_clear(E_Object *obj)
{
E_Object_Delfn *dfn;
@@ -360,7 +360,7 @@ e_object_delfn_clear(E_Object *obj)
}
}
-EAPI E_Object_Delfn *
+E_API E_Object_Delfn *
e_object_delfn_add(E_Object *obj, void (*func)(void *data, void *obj), void *data)
{
E_Object_Delfn *dfn;
@@ -373,7 +373,7 @@ e_object_delfn_add(E_Object *obj, void (*func)(void *data, void *obj), void *dat
return dfn;
}
-EAPI void
+E_API void
e_object_delfn_del(E_Object *obj, E_Object_Delfn *dfn)
{
E_OBJECT_CHECK(obj);
diff --git a/src/bin/e_object.h b/src/bin/e_object.h
index 74bb4b5da..423e061f3 100644
--- a/src/bin/e_object.h
+++ b/src/bin/e_object.h
@@ -81,32 +81,32 @@ struct _E_Object_Delfn
Eina_Bool delete_me : 1;
};
-EAPI void *e_object_alloc (int size, int type, E_Object_Cleanup_Func cleanup_func);
-EAPI void e_object_del (E_Object *obj);
-EAPI void e_object_delay_del_set (E_Object *obj, void *func);
-EAPI int e_object_is_del (E_Object *obj);
-EAPI void e_object_del_func_set (E_Object *obj, E_Object_Cleanup_Func del_func);
-EAPI void e_object_type_set (E_Object *obj, int type);
-EAPI void e_object_free (E_Object *obj);
-EAPI int e_object_ref (E_Object *obj);
-EAPI int e_object_unref (E_Object *obj);
-EAPI int e_object_ref_get (E_Object *obj);
-EAPI int e_object_error (E_Object *obj);
-EAPI void e_object_data_set (E_Object *obj, const void *data);
-EAPI void *e_object_data_get (E_Object *obj);
-EAPI void e_object_free_attach_func_set(E_Object *obj, E_Object_Cleanup_Func func);
-EAPI void e_object_del_attach_func_set (E_Object *obj, E_Object_Cleanup_Func func);
+E_API void *e_object_alloc (int size, int type, E_Object_Cleanup_Func cleanup_func);
+E_API void e_object_del (E_Object *obj);
+E_API void e_object_delay_del_set (E_Object *obj, void *func);
+E_API int e_object_is_del (E_Object *obj);
+E_API void e_object_del_func_set (E_Object *obj, E_Object_Cleanup_Func del_func);
+E_API void e_object_type_set (E_Object *obj, int type);
+E_API void e_object_free (E_Object *obj);
+E_API int e_object_ref (E_Object *obj);
+E_API int e_object_unref (E_Object *obj);
+E_API int e_object_ref_get (E_Object *obj);
+E_API int e_object_error (E_Object *obj);
+E_API void e_object_data_set (E_Object *obj, const void *data);
+E_API void *e_object_data_get (E_Object *obj);
+E_API void e_object_free_attach_func_set(E_Object *obj, E_Object_Cleanup_Func func);
+E_API void e_object_del_attach_func_set (E_Object *obj, E_Object_Cleanup_Func func);
-EAPI E_Object_Delfn *e_object_delfn_add (E_Object *obj, void (*func) (void *data, void *obj), void *data);
-EAPI void e_object_delfn_del (E_Object *obj, E_Object_Delfn *dfn);
-EAPI void e_object_delfn_clear(E_Object *obj);
+E_API E_Object_Delfn *e_object_delfn_add (E_Object *obj, void (*func) (void *data, void *obj), void *data);
+E_API void e_object_delfn_del (E_Object *obj, E_Object_Delfn *dfn);
+E_API void e_object_delfn_clear(E_Object *obj);
-EAPI void e_object_ref_debug_set(E_Object *obj, Eina_Bool set);
+E_API void e_object_ref_debug_set(E_Object *obj, Eina_Bool set);
/*
-EAPI void e_object_breadcrumb_add (E_Object *obj, char *crumb);
-EAPI void e_object_breadcrumb_del (E_Object *obj, char *crumb);
-EAPI void e_object_breadcrumb_debug (E_Object *obj);
+E_API void e_object_breadcrumb_add (E_Object *obj, char *crumb);
+E_API void e_object_breadcrumb_del (E_Object *obj, char *crumb);
+E_API void e_object_breadcrumb_debug (E_Object *obj);
*/
#endif
diff --git a/src/bin/e_open.c b/src/bin/e_open.c
index 721f2759d..045fa763c 100644
--- a/src/bin/e_open.c
+++ b/src/bin/e_open.c
@@ -9,6 +9,31 @@
#include <ctype.h>
#include <errno.h>
+# ifdef E_API
+# undef E_API
+# endif
+# ifdef WIN32
+# ifdef BUILDING_DLL
+# define E_API __declspec(dllexport)
+# else
+# define E_API __declspec(dllimport)
+# endif
+# else
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+/* BROKEN in gcc 4 on amd64 */
+# if 0
+# pragma GCC visibility push(hidden)
+# endif
+# define E_API __attribute__ ((visibility("default")))
+# else
+# define E_API
+# endif
+# else
+# define E_API
+# endif
+# endif
+
static const char *
xdg_defaults_get(const char *path, const char *mime)
{
@@ -448,7 +473,7 @@ static const Ecore_Getopt options = {
}
};
-EAPI int
+E_API int
main(int argc, char *argv[])
{
Eina_Bool quit_option = EINA_FALSE;
diff --git a/src/bin/e_order.c b/src/bin/e_order.c
index 1c0fe7b07..6ad33c138 100644
--- a/src/bin/e_order.c
+++ b/src/bin/e_order.c
@@ -58,7 +58,7 @@ e_order_shutdown(void)
return 1;
}
-EAPI E_Order *
+E_API E_Order *
e_order_new(const char *path)
{
E_Order *eo;
@@ -75,7 +75,7 @@ e_order_new(const char *path)
return eo;
}
-EAPI E_Order *
+E_API E_Order *
e_order_clone(const E_Order *eo)
{
E_Order *eoc;
@@ -100,7 +100,7 @@ e_order_clone(const E_Order *eo)
return eoc;
}
-EAPI void
+E_API void
e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), void *data)
{
E_OBJECT_CHECK(eo);
@@ -110,7 +110,7 @@ e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), vo
eo->cb.data = data;
}
-EAPI void
+E_API void
e_order_remove(E_Order *eo, Efreet_Desktop *desktop)
{
Eina_List *tmp;
@@ -125,7 +125,7 @@ e_order_remove(E_Order *eo, Efreet_Desktop *desktop)
_e_order_save(eo);
}
-EAPI void
+E_API void
e_order_append(E_Order *eo, Efreet_Desktop *desktop)
{
E_OBJECT_CHECK(eo);
@@ -137,7 +137,7 @@ e_order_append(E_Order *eo, Efreet_Desktop *desktop)
_e_order_save(eo);
}
-EAPI void
+E_API void
e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *before)
{
E_OBJECT_CHECK(eo);
@@ -149,7 +149,7 @@ e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *b
_e_order_save(eo);
}
-EAPI void
+E_API void
e_order_files_append(E_Order *eo, Eina_List *files)
{
Eina_List *l;
@@ -172,7 +172,7 @@ e_order_files_append(E_Order *eo, Eina_List *files)
_e_order_save(eo);
}
-EAPI void
+E_API void
e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before)
{
Eina_List *l;
@@ -195,7 +195,7 @@ e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *be
_e_order_save(eo);
}
-EAPI void
+E_API void
e_order_clear(E_Order *eo)
{
E_OBJECT_CHECK(eo);
diff --git a/src/bin/e_order.h b/src/bin/e_order.h
index 566e4a05f..4ca93e36c 100644
--- a/src/bin/e_order.h
+++ b/src/bin/e_order.h
@@ -26,16 +26,16 @@ struct _E_Order
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);
-
-EAPI void e_order_remove(E_Order *eo, Efreet_Desktop *desktop);
-EAPI void e_order_append(E_Order *eo, Efreet_Desktop *desktop);
-EAPI void e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *before);
-EAPI void e_order_files_append(E_Order *eo, Eina_List *files);
-EAPI void e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before);
-EAPI void e_order_clear(E_Order *eo);
-EAPI E_Order *e_order_clone(const E_Order *eo);
+E_API E_Order *e_order_new(const char *path);
+E_API void e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), void *data);
+
+E_API void e_order_remove(E_Order *eo, Efreet_Desktop *desktop);
+E_API void e_order_append(E_Order *eo, Efreet_Desktop *desktop);
+E_API void e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *before);
+E_API void e_order_files_append(E_Order *eo, Eina_List *files);
+E_API void e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before);
+E_API void e_order_clear(E_Order *eo);
+E_API E_Order *e_order_clone(const E_Order *eo);
#endif
#endif
diff --git a/src/bin/e_pan.c b/src/bin/e_pan.c
index 5183c4d1e..ac894a3c3 100644
--- a/src/bin/e_pan.c
+++ b/src/bin/e_pan.c
@@ -32,14 +32,14 @@ static void _e_smart_init(void);
static Evas_Smart *_e_smart = NULL;
/* externally accessible functions */
-EAPI Evas_Object *
+E_API Evas_Object *
e_pan_add(Evas *evas)
{
_e_smart_init();
return evas_object_smart_add(evas, _e_smart);
}
-EAPI void
+E_API void
e_pan_child_set(Evas_Object *obj, Evas_Object *child)
{
API_ENTRY return;
@@ -75,14 +75,14 @@ e_pan_child_set(Evas_Object *obj, Evas_Object *child)
evas_object_smart_callback_call(sd->smart_obj, "changed", NULL);
}
-EAPI Evas_Object *
+E_API Evas_Object *
e_pan_child_get(Evas_Object *obj)
{
API_ENTRY return NULL;
return sd->child_obj;
}
-EAPI void
+E_API void
e_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
API_ENTRY return;
@@ -97,7 +97,7 @@ e_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
evas_object_smart_callback_call(sd->smart_obj, "changed", NULL);
}
-EAPI void
+E_API void
e_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
{
API_ENTRY return;
@@ -105,7 +105,7 @@ e_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
if (y) *y = sd->py;
}
-EAPI void
+E_API void
e_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
{
API_ENTRY return;
@@ -121,7 +121,7 @@ e_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
}
}
-EAPI void
+E_API void
e_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{
API_ENTRY return;
diff --git a/src/bin/e_pan.h b/src/bin/e_pan.h
index ddc6aea63..6966bbcd1 100644
--- a/src/bin/e_pan.h
+++ b/src/bin/e_pan.h
@@ -3,13 +3,13 @@
#ifndef E_PAN_H
#define E_PAN_H
-EAPI Evas_Object *e_pan_add (Evas *evas);
-EAPI void e_pan_child_set (Evas_Object *obj, Evas_Object *child);
-EAPI Evas_Object *e_pan_child_get (Evas_Object *obj);
-EAPI void e_pan_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-EAPI void e_pan_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-EAPI void e_pan_max_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-EAPI void e_pan_child_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+E_API Evas_Object *e_pan_add (Evas *evas);
+E_API void e_pan_child_set (Evas_Object *obj, Evas_Object *child);
+E_API Evas_Object *e_pan_child_get (Evas_Object *obj);
+E_API void e_pan_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+E_API void e_pan_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+E_API void e_pan_max_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+E_API void e_pan_child_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
#endif
#endif
diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index f19a53346..b4b54843d 100644
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -6,7 +6,7 @@ static void _e_path_cache_free(E_Path *ep);
static Eina_Bool _e_path_cache_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
/* externally accessible functions */
-EAPI E_Path *
+E_API E_Path *
e_path_new(void)
{
E_Path *ep;
@@ -15,7 +15,7 @@ e_path_new(void)
return ep;
}
-EAPI void
+E_API void
e_path_default_path_append(E_Path *ep, const char *path)
{
E_OBJECT_CHECK(ep);
@@ -58,7 +58,7 @@ e_path_default_path_append(E_Path *ep, const char *path)
_e_path_cache_free(ep);
}
-EAPI void
+E_API void
e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list)
{
E_OBJECT_CHECK(ep);
@@ -68,7 +68,7 @@ e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list)
_e_path_cache_free(ep);
}
-EAPI void
+E_API void
e_path_user_path_append(E_Path *ep, const char *path)
{
E_OBJECT_CHECK(ep);
@@ -111,7 +111,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
_e_path_cache_free(ep);
}
-EAPI void
+E_API void
e_path_user_path_prepend(E_Path *ep, const char *path)
{
E_OBJECT_CHECK(ep);
@@ -154,7 +154,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
_e_path_cache_free(ep);
}
-EAPI void
+E_API void
e_path_user_path_remove(E_Path *ep, const char *path)
{
Eina_List *l;
@@ -214,7 +214,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
}
}
-EAPI void
+E_API void
e_path_user_path_clear(E_Path *ep)
{
E_Path_Dir *epd;
@@ -226,7 +226,7 @@ e_path_user_path_clear(E_Path *ep)
_e_path_cache_free(ep);
}
-EAPI Eina_Stringshare *
+E_API Eina_Stringshare *
e_path_find(E_Path *ep, const char *file)
{
Eina_List *l;
@@ -280,7 +280,7 @@ e_path_find(E_Path *ep, const char *file)
return NULL;
}
-EAPI void
+E_API void
e_path_evas_append(E_Path *ep, Evas *evas)
{
Eina_List *dir_list;
@@ -301,7 +301,7 @@ e_path_evas_append(E_Path *ep, Evas *evas)
}
/* combine default_list and and user_list in and easy to use list */
-EAPI Eina_List *
+E_API Eina_List *
e_path_dir_list_get(E_Path *ep)
{
Eina_List *dir_list;
@@ -331,7 +331,7 @@ e_path_dir_list_get(E_Path *ep)
return dir_list;
}
-EAPI void
+E_API void
e_path_dir_list_free(Eina_List *dir_list)
{
E_Path_Dir *epd;
diff --git a/src/bin/e_path.h b/src/bin/e_path.h
index 421761db3..7bf6e2f87 100644
--- a/src/bin/e_path.h
+++ b/src/bin/e_path.h
@@ -26,20 +26,20 @@ struct _E_Path
};
/* init and setup */
-EAPI E_Path *e_path_new(void);
-EAPI void e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list);
-EAPI void e_path_inherit_path_set(E_Path *ep, E_Path *path_inherit);
+E_API E_Path *e_path_new(void);
+E_API void e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list);
+E_API void e_path_inherit_path_set(E_Path *ep, E_Path *path_inherit);
/* append a hardcoded path */
-EAPI void e_path_default_path_append(E_Path *ep, const char *path);
+E_API void e_path_default_path_append(E_Path *ep, const char *path);
/* e_config path manipulation */
-EAPI void e_path_user_path_append(E_Path *ep, const char *path);
-EAPI void e_path_user_path_prepend(E_Path *ep, const char *path);
-EAPI void e_path_user_path_remove(E_Path *ep, const char *path);
-EAPI void e_path_user_path_clear(E_Path *ep);
-EAPI Eina_Stringshare *e_path_find(E_Path *ep, const char *file);
-EAPI void e_path_evas_append(E_Path *ep, Evas *evas);
-EAPI Eina_List *e_path_dir_list_get(E_Path *ep);
-EAPI void e_path_dir_list_free(Eina_List *dir_list);
+E_API void e_path_user_path_append(E_Path *ep, const char *path);
+E_API void e_path_user_path_prepend(E_Path *ep, const char *path);
+E_API void e_path_user_path_remove(E_Path *ep, const char *path);
+E_API void e_path_user_path_clear(E_Path *ep);
+E_API Eina_Stringshare *e_path_find(E_Path *ep, const char *file);
+E_API void e_path_evas_append(E_Path *ep, Evas *evas);
+E_API Eina_List *e_path_dir_list_get(E_Path *ep);
+E_API void e_path_dir_list_free(Eina_List *dir_list);
#endif
#endif
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index eff888753..fe6be072a 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -173,7 +173,7 @@ _e_pixmap_find(E_Pixmap_Type type, va_list *l)
return NULL;
}
-EAPI int
+E_API int
e_pixmap_free(E_Pixmap *cp)
{
if (!cp) return 0;
@@ -183,7 +183,7 @@ e_pixmap_free(E_Pixmap *cp)
return 0;
}
-EAPI E_Pixmap *
+E_API E_Pixmap *
e_pixmap_ref(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL);
@@ -191,7 +191,7 @@ e_pixmap_ref(E_Pixmap *cp)
return cp;
}
-EAPI E_Pixmap *
+E_API E_Pixmap *
e_pixmap_new(E_Pixmap_Type type, ...)
{
E_Pixmap *cp = NULL;
@@ -251,14 +251,14 @@ e_pixmap_new(E_Pixmap_Type type, ...)
return cp;
}
-EAPI E_Pixmap_Type
+E_API E_Pixmap_Type
e_pixmap_type_get(const E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 9999);
return cp->type;
}
-EAPI void
+E_API void
e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
@@ -270,7 +270,7 @@ e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win)
cp->parent = win;
}
-EAPI void
+E_API void
e_pixmap_visual_cmap_set(E_Pixmap *cp, void *visual, unsigned int cmap)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
@@ -284,7 +284,7 @@ e_pixmap_visual_cmap_set(E_Pixmap *cp, void *visual, unsigned int cmap)
#endif
}
-EAPI void *
+E_API void *
e_pixmap_visual_get(const E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL);
@@ -295,28 +295,28 @@ e_pixmap_visual_get(const E_Pixmap *cp)
return NULL;
}
-EAPI void
+E_API void
e_pixmap_usable_set(E_Pixmap *cp, Eina_Bool set)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
cp->usable = !!set;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_usable_get(const E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
return cp->usable;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_dirty_get(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
return cp->dirty;
}
-EAPI void
+E_API void
e_pixmap_clear(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
@@ -324,14 +324,14 @@ e_pixmap_clear(E_Pixmap *cp)
cp->dirty = EINA_TRUE;
}
-EAPI void
+E_API void
e_pixmap_dirty(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
cp->dirty = 1;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_refresh(E_Pixmap *cp)
{
Eina_Bool success = EINA_FALSE;
@@ -405,7 +405,7 @@ e_pixmap_refresh(E_Pixmap *cp)
return success;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_size_changed(E_Pixmap *cp, int w, int h)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
@@ -413,7 +413,7 @@ e_pixmap_size_changed(E_Pixmap *cp, int w, int h)
return (w != cp->w) || (h != cp->h);
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_size_get(E_Pixmap *cp, int *w, int *h)
{
if (w) *w = 0;
@@ -424,14 +424,14 @@ e_pixmap_size_get(E_Pixmap *cp, int *w, int *h)
return (cp->w > 0) && (cp->h > 0);
}
-EAPI unsigned int
+E_API unsigned int
e_pixmap_failures_get(const E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 0);
return cp->failures;
}
-EAPI void
+E_API void
e_pixmap_client_set(E_Pixmap *cp, E_Client *ec)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
@@ -439,14 +439,14 @@ e_pixmap_client_set(E_Pixmap *cp, E_Client *ec)
cp->client = ec;
}
-EAPI E_Client *
+E_API E_Client *
e_pixmap_client_get(E_Pixmap *cp)
{
if (!cp) return NULL;
return cp->client;
}
-EAPI E_Pixmap *
+E_API E_Pixmap *
e_pixmap_find(E_Pixmap_Type type, ...)
{
va_list l;
@@ -458,7 +458,7 @@ e_pixmap_find(E_Pixmap_Type type, ...)
return cp;
}
-EAPI E_Client *
+E_API E_Client *
e_pixmap_find_client(E_Pixmap_Type type, ...)
{
va_list l;
@@ -470,14 +470,14 @@ e_pixmap_find_client(E_Pixmap_Type type, ...)
return (!cp) ? NULL : cp->client;
}
-EAPI uint64_t
+E_API uint64_t
e_pixmap_window_get(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 0);
return cp->win;
}
-EAPI void *
+E_API void *
e_pixmap_resource_get(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL);
@@ -492,7 +492,7 @@ e_pixmap_resource_get(E_Pixmap *cp)
return NULL;
}
-EAPI void
+E_API void
e_pixmap_resource_set(E_Pixmap *cp, void *resource)
{
if ((!cp) || (cp->type != E_PIXMAP_TYPE_WL)) return;
@@ -548,14 +548,14 @@ e_pixmap_resource_set(E_Pixmap *cp, void *resource)
#endif
}
-EAPI Ecore_Window
+E_API Ecore_Window
e_pixmap_parent_window_get(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 0);
return cp->parent;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns)
{
Eina_Bool ret = EINA_FALSE;
@@ -594,7 +594,7 @@ e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns)
return ret;
}
-EAPI void
+E_API void
e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
@@ -652,7 +652,7 @@ e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache)
}
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_image_refresh(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
@@ -692,7 +692,7 @@ e_pixmap_image_refresh(E_Pixmap *cp)
return EINA_FALSE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_image_exists(const E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
@@ -708,7 +708,7 @@ e_pixmap_image_exists(const E_Pixmap *cp)
return EINA_FALSE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_image_is_argb(const E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
@@ -728,7 +728,7 @@ e_pixmap_image_is_argb(const E_Pixmap *cp)
return EINA_FALSE;
}
-EAPI void *
+E_API void *
e_pixmap_image_data_get(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL);
@@ -752,7 +752,7 @@ e_pixmap_image_data_get(E_Pixmap *cp)
return NULL;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Rectangle *r, int stride)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
@@ -808,7 +808,7 @@ e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Recta
return EINA_FALSE;
}
-EAPI Eina_Bool
+E_API Eina_Bool
e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE);
@@ -832,7 +832,7 @@ e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r)
return EINA_FALSE;
}
-EAPI void
+E_API void
e_pixmap_image_draw_done(E_Pixmap *cp)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
@@ -847,7 +847,7 @@ e_pixmap_image_draw_done(E_Pixmap *cp)
#endif
}
-EAPI void
+E_API void
e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
@@ -861,7 +861,7 @@ e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h)
#endif
}
-EAPI void
+E_API void
e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h)
{
EINA_SAFETY_ON_NULL_RETURN(cp);
diff --git a/src/bin/e_pixmap.h b/src/bin/e_pixmap.h
index 3ee277eab..98ffe4a6b 100644
--- a/src/bin/e_pixmap.h
+++ b/src/bin/e_pixmap.h
@@ -13,41 +13,41 @@ typedef enum
# ifndef E_PIXMAP_H
# define E_PIXMAP_H
-EAPI int e_pixmap_free(E_Pixmap *cp);
-EAPI E_Pixmap *e_pixmap_ref(E_Pixmap *cp);
-EAPI E_Pixmap *e_pixmap_new(E_Pixmap_Type type, ...);
-EAPI E_Pixmap_Type e_pixmap_type_get(const E_Pixmap *cp);
-EAPI void *e_pixmap_resource_get(E_Pixmap *cp);
-EAPI void e_pixmap_resource_set(E_Pixmap *cp, void *resource);
-EAPI void e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win);
-EAPI void e_pixmap_visual_cmap_set(E_Pixmap *cp, void *visual, unsigned int cmap);
-EAPI unsigned int e_pixmap_failures_get(const E_Pixmap *cp);
-EAPI void *e_pixmap_visual_get(const E_Pixmap *cp);
-EAPI Eina_Bool e_pixmap_dirty_get(E_Pixmap *cp);
-EAPI void e_pixmap_clear(E_Pixmap *cp);
-EAPI void e_pixmap_usable_set(E_Pixmap *cp, Eina_Bool set);
-EAPI Eina_Bool e_pixmap_usable_get(const E_Pixmap *cp);
-EAPI void e_pixmap_dirty(E_Pixmap *cp);
-EAPI Eina_Bool e_pixmap_refresh(E_Pixmap *cp);
-EAPI Eina_Bool e_pixmap_size_changed(E_Pixmap *cp, int w, int h);
-EAPI Eina_Bool e_pixmap_size_get(E_Pixmap *cp, int *w, int *h);
-EAPI void e_pixmap_client_set(E_Pixmap *cp, E_Client *ec);
-EAPI E_Client *e_pixmap_client_get(E_Pixmap *cp);
-EAPI E_Pixmap *e_pixmap_find(E_Pixmap_Type type, ...);
-EAPI E_Client *e_pixmap_find_client(E_Pixmap_Type type, ...);
-EAPI uint64_t e_pixmap_window_get(E_Pixmap *cp);
-EAPI Ecore_Window e_pixmap_parent_window_get(E_Pixmap *cp);
-EAPI Eina_Bool e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns);
-EAPI void e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache);
-EAPI Eina_Bool e_pixmap_image_refresh(E_Pixmap *cp);
-EAPI Eina_Bool e_pixmap_image_exists(const E_Pixmap *cp);
-EAPI Eina_Bool e_pixmap_image_is_argb(const E_Pixmap *cp);
-EAPI void *e_pixmap_image_data_get(E_Pixmap *cp);
-EAPI Eina_Bool e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Rectangle *r, int stride);
-EAPI Eina_Bool e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r);
-
-EAPI void e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h);
-EAPI void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h);
+E_API int e_pixmap_free(E_Pixmap *cp);
+E_API E_Pixmap *e_pixmap_ref(E_Pixmap *cp);
+E_API E_Pixmap *e_pixmap_new(E_Pixmap_Type type, ...);
+E_API E_Pixmap_Type e_pixmap_type_get(const E_Pixmap *cp);
+E_API void *e_pixmap_resource_get(E_Pixmap *cp);
+E_API void e_pixmap_resource_set(E_Pixmap *cp, void *resource);
+E_API void e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win);
+E_API void e_pixmap_visual_cmap_set(E_Pixmap *cp, void *visual, unsigned int cmap);
+E_API unsigned int e_pixmap_failures_get(const E_Pixmap *cp);
+E_API void *e_pixmap_visual_get(const E_Pixmap *cp);
+E_API Eina_Bool e_pixmap_dirty_get(E_Pixmap *cp);
+E_API void e_pixmap_clear(E_Pixmap *cp);
+E_API void e_pixmap_usable_set(E_Pixmap *cp, Eina_Bool set);
+E_API Eina_Bool e_pixmap_usable_get(const E_Pixmap *cp);
+E_API void e_pixmap_dirty(E_Pixmap *cp);
+E_API Eina_Bool e_pixmap_refresh(E_Pixmap *cp);
+E_API Eina_Bool e_pixmap_size_changed(E_Pixmap *cp, int w, int h);
+E_API Eina_Bool e_pixmap_size_get(E_Pixmap *cp, int *w, int *h);
+E_API void e_pixmap_client_set(E_Pixmap *cp, E_Client *ec);
+E_API E_Client *e_pixmap_client_get(E_Pixmap *cp);
+E_API E_Pixmap *e_pixmap_find(E_Pixmap_Type type, ...);
+E_API E_Client *e_pixmap_find_client(E_Pixmap_Type type, ...);
+E_API uint64_t e_pixmap_window_get(E_Pixmap *cp);
+E_API Ecore_Window e_pixmap_parent_window_get(E_Pixmap *cp);
+E_API Eina_Bool e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns);
+E_API void e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache);
+E_API Eina_Bool e_pixmap_image_refresh(E_Pixmap *cp);
+E_API Eina_Bool e_pixmap_image_exists(const E_Pixmap *cp);
+E_API Eina_Bool e_pixmap_image_is_argb(const E_Pixmap *cp);
+E_API void *e_pixmap_image_data_get(E_Pixmap *cp);
+E_API Eina_Bool e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Rectangle *r, int stride);
+E_API Eina_Bool e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r);
+
+E_API void e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h);
+E_API void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h);
static inline Eina_Bool
e_pixmap_is_x(const E_Pixmap *cp)
diff --git a/src/bin/e_place.c b/src/bin/e_place.c
index e35496f59..628c0000f 100644
--- a/src/bin/e_place.c
+++ b/src/bin/e_place.c
@@ -1,6 +1,6 @@
#include "e.h"
-EAPI void
+E_API void
e_place_zone_region_smart_cleanup(E_Zone *zone)
{
E_Desk *desk;
@@ -122,7 +122,7 @@ _e_place_coverage_shelf_add(E_Desk *desk, int ar, int x, int y, int w, int h)
return ar;
}
-EAPI int
+E_API int
e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry)
{
int a_w = 0, a_h = 0, a_alloc_w = 0, a_alloc_h = 0;
@@ -433,14 +433,14 @@ done:
return 1;
}
-EAPI int
+E_API int
e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry)
{
return e_place_desk_region_smart(e_desk_current_get(zone), skiplist,
x, y, w, h, rx, ry);
}
-EAPI int
+E_API int
e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, int h, int it, int *rx, int *ry)
{
int cursor_x = 0, cursor_y = 0;
@@ -470,7 +470,7 @@ e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, i
return 1;
}
-EAPI int
+E_API int
e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry)
{
int cursor_x = 0, cursor_y = 0;
diff --git a/src/bin/e_place.h b/src/bin/e_place.h
index 478744681..bb5be25cb 100644
--- a/src/bin/e_place.h
+++ b/src/bin/e_place.h
@@ -3,11 +3,11 @@
#ifndef E_PLACE_H
#define E_PLACE_H
-EAPI void e_place_zone_region_smart_cleanup(E_Zone *zone);
-EAPI int e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
-EAPI int e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
-EAPI int e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, int *ry);
-EAPI int e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry);
+E_API void e_place_zone_region_smart_cleanup(E_Zone *zone);
+E_API int e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
+E_API int e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
+E_API int e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, int *ry);
+E_API int e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry);
#endif
#endif
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index a36d1e08b..696658a2e 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -463,7 +463,7 @@ e_pointer_shutdown(void)
return 1;
}
-EAPI E_Pointer *
+E_API E_Pointer *
e_pointer_window_new(Ecore_Window win, Eina_Bool filled)
{
E_Pointer *ptr = NULL;
@@ -491,7 +491,7 @@ e_pointer_window_new(Ecore_Window win, Eina_Bool filled)
return ptr;
}
-EAPI E_Pointer *
+E_API E_Pointer *
e_pointer_canvas_new(Ecore_Evas *ee, Eina_Bool filled)
{
E_Pointer *ptr = NULL;
@@ -534,7 +534,7 @@ e_pointer_canvas_new(Ecore_Evas *ee, Eina_Bool filled)
return ptr;
}
-EAPI void
+E_API void
e_pointers_size_set(int size)
{
Eina_List *l;
@@ -560,7 +560,7 @@ e_pointers_size_set(int size)
}
}
-EAPI void
+E_API void
e_pointer_hide(E_Pointer *ptr)
{
if ((ptr->evas) && (!ptr->canvas))
@@ -572,7 +572,7 @@ e_pointer_hide(E_Pointer *ptr)
#endif
}
-EAPI void
+E_API void
e_pointer_type_push(E_Pointer *ptr, void *obj, const char *type)
{
E_Pointer_Stack *stack;
@@ -587,7 +587,7 @@ e_pointer_type_push(E_Pointer *ptr, void *obj, const char *type)
ptr->stack = eina_list_prepend(ptr->stack, stack);
}
-EAPI void
+E_API void
e_pointer_type_pop(E_Pointer *ptr, void *obj, const char *type)
{
Eina_List *l, *ll;
@@ -620,7 +620,7 @@ e_pointer_type_pop(E_Pointer *ptr, void *obj, const char *type)
eina_stringshare_refplace(&ptr->type, stack->type);
}
-EAPI void
+E_API void
e_pointer_mode_push(void *obj, E_Pointer_Mode m