giant header overhaul which removes all the stupid one line function prototype header...
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Fri, 30 Nov 2012 14:38:34 +0000 (14:38 +0000)
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Fri, 30 Nov 2012 14:38:34 +0000 (14:38 +0000)
SVN revision: 79908

228 files changed:
src/bin/e_includes.h
src/modules/Makefile_backlight.am
src/modules/Makefile_conf.am
src/modules/Makefile_conf_applications.am
src/modules/Makefile_conf_dialogs.am
src/modules/Makefile_conf_display.am
src/modules/Makefile_conf_edgebindings.am
src/modules/Makefile_conf_interaction.am
src/modules/Makefile_conf_intl.am
src/modules/Makefile_conf_keybindings.am
src/modules/Makefile_conf_menus.am
src/modules/Makefile_conf_paths.am
src/modules/Makefile_conf_performance.am
src/modules/Makefile_conf_randr.am
src/modules/Makefile_conf_theme.am
src/modules/Makefile_conf_wallpaper2.am
src/modules/Makefile_conf_window_manipulation.am
src/modules/Makefile_conf_window_remembers.am
src/modules/Makefile_connman.am
src/modules/Makefile_dropshadow.am
src/modules/Makefile_fileman.am
src/modules/Makefile_fileman_opinfo.am
src/modules/Makefile_gadman.am
src/modules/Makefile_illume-bluetooth.am
src/modules/Makefile_illume-home-toggle.am
src/modules/Makefile_illume-kbd-toggle.am
src/modules/Makefile_illume-mode-toggle.am
src/modules/Makefile_illume2.am
src/modules/Makefile_physics.am
src/modules/Makefile_shot.am
src/modules/Makefile_start.am
src/modules/Makefile_syscon.am
src/modules/Makefile_systray.am
src/modules/Makefile_temperature.am
src/modules/Makefile_winlist.am
src/modules/Makefile_wizard.am
src/modules/access/e_mod_main.h
src/modules/backlight/e_mod_main.c
src/modules/backlight/e_mod_main.h [deleted file]
src/modules/conf/e_conf.h [deleted file]
src/modules/conf/e_mod_main.h
src/modules/conf_applications/e_int_config_apps.h [deleted file]
src/modules/conf_applications/e_int_config_apps_personal.h [deleted file]
src/modules/conf_applications/e_int_config_defapps.h [deleted file]
src/modules/conf_applications/e_int_config_deskenv.h [deleted file]
src/modules/conf_applications/e_mod_main.h
src/modules/conf_dialogs/e_int_config_dialogs.h [deleted file]
src/modules/conf_dialogs/e_int_config_profiles.h [deleted file]
src/modules/conf_dialogs/e_mod_main.h
src/modules/conf_display/e_int_config_desk.h [deleted file]
src/modules/conf_display/e_int_config_desklock.h [deleted file]
src/modules/conf_display/e_int_config_desklock_fsel.h [deleted file]
src/modules/conf_display/e_int_config_desks.h [deleted file]
src/modules/conf_display/e_int_config_display.h [deleted file]
src/modules/conf_display/e_int_config_dpms.h [deleted file]
src/modules/conf_display/e_int_config_screensaver.h [deleted file]
src/modules/conf_display/e_mod_main.h
src/modules/conf_edgebindings/e_int_config_edgebindings.h [deleted file]
src/modules/conf_edgebindings/e_mod_main.h
src/modules/conf_interaction/e_int_config_interaction.h [deleted file]
src/modules/conf_interaction/e_int_config_mouse.h [deleted file]
src/modules/conf_interaction/e_mod_main.h
src/modules/conf_intl/e_int_config_imc.c
src/modules/conf_intl/e_int_config_imc.h [deleted file]
src/modules/conf_intl/e_int_config_imc_import.c
src/modules/conf_intl/e_int_config_imc_import.h [deleted file]
src/modules/conf_intl/e_int_config_intl.h [deleted file]
src/modules/conf_intl/e_mod_main.h
src/modules/conf_keybindings/e_int_config_acpibindings.h [deleted file]
src/modules/conf_keybindings/e_int_config_keybindings.h [deleted file]
src/modules/conf_keybindings/e_int_config_mousebindings.h [deleted file]
src/modules/conf_keybindings/e_mod_main.h
src/modules/conf_menus/e_int_config_menus.h [deleted file]
src/modules/conf_menus/e_mod_main.h
src/modules/conf_paths/e_int_config_env.h [deleted file]
src/modules/conf_paths/e_int_config_paths.h [deleted file]
src/modules/conf_paths/e_mod_main.h
src/modules/conf_performance/e_int_config_engine.h [deleted file]
src/modules/conf_performance/e_int_config_performance.h [deleted file]
src/modules/conf_performance/e_int_config_powermanagement.h [deleted file]
src/modules/conf_performance/e_mod_main.h
src/modules/conf_randr/e_int_config_randr.c
src/modules/conf_randr/e_int_config_randr.h [deleted file]
src/modules/conf_randr/e_mod_main.c
src/modules/conf_randr/e_mod_main.h
src/modules/conf_shelves/e_mod_main.h
src/modules/conf_theme/e_int_config_borders.h [deleted file]
src/modules/conf_theme/e_int_config_color_classes.h [deleted file]
src/modules/conf_theme/e_int_config_fonts.h [deleted file]
src/modules/conf_theme/e_int_config_scale.h [deleted file]
src/modules/conf_theme/e_int_config_startup.h [deleted file]
src/modules/conf_theme/e_int_config_theme.c
src/modules/conf_theme/e_int_config_theme.h [deleted file]
src/modules/conf_theme/e_int_config_theme_import.c
src/modules/conf_theme/e_int_config_theme_import.h [deleted file]
src/modules/conf_theme/e_int_config_transitions.h [deleted file]
src/modules/conf_theme/e_int_config_wallpaper.h [deleted file]
src/modules/conf_theme/e_mod_main.h
src/modules/conf_wallpaper2/e_int_config_wallpaper.h [deleted file]
src/modules/conf_wallpaper2/e_mod_main.h
src/modules/conf_window_manipulation/e_int_config_clientlist.h [deleted file]
src/modules/conf_window_manipulation/e_int_config_focus.h [deleted file]
src/modules/conf_window_manipulation/e_int_config_window_display.h [deleted file]
src/modules/conf_window_manipulation/e_int_config_window_manip.h [deleted file]
src/modules/conf_window_manipulation/e_mod_main.h
src/modules/conf_window_remembers/e_int_config_remembers.h [deleted file]
src/modules/conf_window_remembers/e_mod_main.h
src/modules/connman/E_Connman.h
src/modules/connman/agent.c
src/modules/connman/agent.h [deleted file]
src/modules/connman/e_connman.c
src/modules/connman/e_mod_main.h
src/modules/connman/log.h [deleted file]
src/modules/dropshadow/e_mod_config.c
src/modules/dropshadow/e_mod_config.h [deleted file]
src/modules/dropshadow/e_mod_main.c
src/modules/dropshadow/e_mod_main.h
src/modules/fileman/e_fwin.c
src/modules/fileman/e_fwin.h [deleted file]
src/modules/fileman/e_fwin_nav.c
src/modules/fileman/e_int_config_mime.c
src/modules/fileman/e_int_config_mime.h [deleted file]
src/modules/fileman/e_int_config_mime_edit.c
src/modules/fileman/e_int_config_mime_edit.h [deleted file]
src/modules/fileman/e_mod_config.c
src/modules/fileman/e_mod_dbus.c
src/modules/fileman/e_mod_dbus.h [deleted file]
src/modules/fileman/e_mod_main.c
src/modules/fileman/e_mod_main.h
src/modules/fileman/e_mod_menu.c
src/modules/fileman_opinfo/e_mod_main.c
src/modules/fileman_opinfo/e_mod_main.h [deleted file]
src/modules/gadman/e_mod_config.c
src/modules/gadman/e_mod_config.h [deleted file]
src/modules/gadman/e_mod_gadman.c
src/modules/gadman/e_mod_gadman.h
src/modules/gadman/e_mod_main.c
src/modules/gadman/e_mod_main.h [deleted file]
src/modules/illume-bluetooth/e_mod_main.c
src/modules/illume-bluetooth/e_mod_main.h [deleted file]
src/modules/illume-home-toggle/e_mod_main.c
src/modules/illume-home-toggle/e_mod_main.h [deleted file]
src/modules/illume-home/e_mod_main.h
src/modules/illume-indicator/e_mod_main.h
src/modules/illume-kbd-toggle/e_mod_main.c
src/modules/illume-kbd-toggle/e_mod_main.h [deleted file]
src/modules/illume-keyboard/e_mod_main.h
src/modules/illume-mode-toggle/e_mod_main.c
src/modules/illume-mode-toggle/e_mod_main.h [deleted file]
src/modules/illume-softkey/e_mod_main.h
src/modules/illume2/e_illume.c
src/modules/illume2/e_mod_config.c
src/modules/illume2/e_mod_config.h [deleted file]
src/modules/illume2/e_mod_config_animation.c
src/modules/illume2/e_mod_config_animation.h [deleted file]
src/modules/illume2/e_mod_config_policy.c
src/modules/illume2/e_mod_config_policy.h [deleted file]
src/modules/illume2/e_mod_config_windows.c
src/modules/illume2/e_mod_config_windows.h [deleted file]
src/modules/illume2/e_mod_kbd.c
src/modules/illume2/e_mod_kbd.h [deleted file]
src/modules/illume2/e_mod_kbd_device.c
src/modules/illume2/e_mod_kbd_device.h [deleted file]
src/modules/illume2/e_mod_main.c
src/modules/illume2/e_mod_main.h
src/modules/illume2/e_mod_policy.c
src/modules/illume2/e_mod_policy.h [deleted file]
src/modules/illume2/e_mod_quickpanel.c
src/modules/illume2/e_mod_quickpanel.h [deleted file]
src/modules/illume2/e_mod_select_window.c
src/modules/illume2/e_mod_select_window.h [deleted file]
src/modules/layout/e_mod_main.c
src/modules/layout/e_mod_main.h [deleted file]
src/modules/mixer/e_mod_main.c
src/modules/mixer/e_mod_main.h
src/modules/mixer/e_mod_system.h
src/modules/mixer/sys_alsa.c
src/modules/mixer/sys_pulse.c
src/modules/msgbus/e_mod_main.h
src/modules/physics/e_mod_config.c
src/modules/physics/e_mod_config.h [deleted file]
src/modules/physics/e_mod_main.c
src/modules/physics/e_mod_main.h
src/modules/shot/e_mod_main.c
src/modules/shot/e_mod_main.h [deleted file]
src/modules/start/e_mod_main.c
src/modules/start/e_mod_main.h [deleted file]
src/modules/syscon/e_int_config_syscon.h [deleted file]
src/modules/syscon/e_mod_main.h
src/modules/syscon/e_syscon.h [deleted file]
src/modules/systray/e_mod_main.c
src/modules/systray/e_mod_main.h [deleted file]
src/modules/temperature/e_mod_main.h
src/modules/temperature/e_mod_main_private.h [deleted file]
src/modules/temperature/tempget.c
src/modules/winlist/e_int_config_winlist.h [deleted file]
src/modules/winlist/e_mod_main.h
src/modules/winlist/e_winlist.c
src/modules/winlist/e_winlist.h
src/modules/wizard/e_mod_main.c
src/modules/wizard/e_mod_main.h [deleted file]
src/modules/wizard/e_wizard.c
src/modules/wizard/e_wizard.h
src/modules/wizard/page_000.c
src/modules/wizard/page_010.c
src/modules/wizard/page_011.c
src/modules/wizard/page_020.c
src/modules/wizard/page_030.c
src/modules/wizard/page_040.c
src/modules/wizard/page_050.c
src/modules/wizard/page_060.c
src/modules/wizard/page_070.c
src/modules/wizard/page_080.c
src/modules/wizard/page_090.c
src/modules/wizard/page_100.c
src/modules/wizard/page_110.c
src/modules/wizard/page_120.c
src/modules/wizard/page_130.c
src/modules/wizard/page_140.c
src/modules/wizard/page_150.c
src/modules/wizard/page_160.c
src/modules/wizard/page_170.c
src/modules/wizard/page_180.c
src/modules/wizard/page_200.c
src/modules/wl_screenshot/e_mod_main.c
src/modules/wl_screenshot/e_mod_main.h [deleted file]
src/modules/wl_shell/e_mod_main.h
src/modules/xkbswitch/e_mod_main.h

index eb4367d..1faabbf 100644 (file)
 #include "e_import_dialog.h"
 #include "e_import_config_dialog.h"
 #include "e_grab_dialog.h"
+#include "e_widget_filepreview.h"
index dcbfcb1..443fc5d 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(backlight_DATA)
 backlightpkgdir = $(MDIR)/backlight/$(MODULE_ARCH)
 backlightpkg_LTLIBRARIES = backlight/module.la
 
-backlight_module_la_SOURCES = backlight/e_mod_main.c \
-                             backlight/e_mod_main.h
+backlight_module_la_SOURCES = backlight/e_mod_main.c
 
 .PHONY: backlight install-backlight
 backlight: $(backlightpkg_LTLIBRARIES) $(backlight_DATA)
index 2c52a15..e514802 100644 (file)
@@ -10,7 +10,6 @@ confpkg_LTLIBRARIES = conf/module.la
 conf_module_la_SOURCES = conf/e_mod_main.c \
                         conf/e_mod_main.h \
                         conf/e_conf.c \
-                        conf/e_conf.h \
                         conf/e_mod_config.c
 
 .PHONY: conf install-conf
index b5da347..3c5f380 100644 (file)
@@ -10,13 +10,9 @@ conf_applicationspkg_LTLIBRARIES = conf_applications/module.la
 conf_applications_module_la_SOURCES = conf_applications/e_mod_main.c \
                              conf_applications/e_mod_main.h \
                              conf_applications/e_int_config_apps.c \
-                             conf_applications/e_int_config_apps.h \
                              conf_applications/e_int_config_defapps.c \
-                             conf_applications/e_int_config_defapps.h \
                              conf_applications/e_int_config_deskenv.c \
-                             conf_applications/e_int_config_deskenv.h \
-                             conf_applications/e_int_config_apps_personal.c \
-                             conf_applications/e_int_config_apps_personal.h
+                             conf_applications/e_int_config_apps_personal.c
 
 .PHONY: conf_applications install-conf_applications
 conf_applications: $(conf_applicationspkg_LTLIBRARIES) $(conf_applications_DATA)
index bc1539b..61f5e11 100644 (file)
@@ -10,9 +10,7 @@ conf_dialogspkg_LTLIBRARIES = conf_dialogs/module.la
 conf_dialogs_module_la_SOURCES = conf_dialogs/e_mod_main.c \
                                 conf_dialogs/e_mod_main.h \
                                 conf_dialogs/e_int_config_dialogs.c \
-                                conf_dialogs/e_int_config_dialogs.h \
-                                conf_dialogs/e_int_config_profiles.c \
-                                conf_dialogs/e_int_config_profiles.h
+                                conf_dialogs/e_int_config_profiles.c
 
 .PHONY: conf_dialogs install-conf_dialogs
 conf_dialogs: $(conf_dialogspkg_LTLIBRARIES) $(conf_dialogs_DATA)
index 5b2b622..24db929 100644 (file)
@@ -9,19 +9,12 @@ conf_displaypkg_LTLIBRARIES = conf_display/module.la
 conf_display_module_la_SOURCES = conf_display/e_mod_main.c \
                                 conf_display/e_mod_main.h \
                                 conf_display/e_int_config_display.c \
-                                conf_display/e_int_config_display.h \
                                 conf_display/e_int_config_screensaver.c \
-                                conf_display/e_int_config_screensaver.h \
                                 conf_display/e_int_config_dpms.c \
-                                conf_display/e_int_config_dpms.h \
                                 conf_display/e_int_config_desklock.c \
-                                conf_display/e_int_config_desklock.h \
                                 conf_display/e_int_config_desklock_fsel.c \
-                                conf_display/e_int_config_desklock_fsel.h \
                                 conf_display/e_int_config_desks.c \
-                                conf_display/e_int_config_desks.h \
-                                conf_display/e_int_config_desk.c \
-                                conf_display/e_int_config_desk.h
+                                conf_display/e_int_config_desk.c
 
 .PHONY: conf_display install-conf_display
 conf_display: $(conf_displaypkg_LTLIBRARIES) $(conf_display_DATA)
index b52bcf7..628acd4 100644 (file)
@@ -10,8 +10,7 @@ conf_edgebindingspkg_LTLIBRARIES = conf_edgebindings/module.la
 conf_edgebindings_module_la_SOURCES = conf_edgebindings/e_mod_main.c \
                              conf_edgebindings/e_mod_main.h \
                              conf_edgebindings/e_int_config_edgebindings.c \
-                             conf_edgebindings/e_int_config_signalbindings.c \
-                             conf_edgebindings/e_int_config_edgebindings.h
+                             conf_edgebindings/e_int_config_signalbindings.c
 
 .PHONY: conf_edgebindings install-conf_edgebindings
 conf_edgebindings: $(conf_edgebindingspkg_LTLIBRARIES) $(conf_edgebindings_DATA)
index 676ad08..120a720 100644 (file)
@@ -10,9 +10,7 @@ conf_interactionpkg_LTLIBRARIES = conf_interaction/module.la
 conf_interaction_module_la_SOURCES = conf_interaction/e_mod_main.c \
                             conf_interaction/e_mod_main.h \
                             conf_interaction/e_int_config_interaction.c \
-                            conf_interaction/e_int_config_interaction.h \
-                            conf_interaction/e_int_config_mouse.c \
-                            conf_interaction/e_int_config_mouse.h
+                            conf_interaction/e_int_config_mouse.c
 
 .PHONY: conf_interaction install-conf_interaction
 conf_interaction: $(conf_interactionpkg_LTLIBRARIES) $(conf_interaction_DATA)
index bf405ac..d260a2b 100644 (file)
@@ -9,11 +9,8 @@ conf_intlpkg_LTLIBRARIES = conf_intl/module.la
 conf_intl_module_la_SOURCES = conf_intl/e_mod_main.c \
                              conf_intl/e_mod_main.h \
                              conf_intl/e_int_config_intl.c \
-                             conf_intl/e_int_config_intl.h \
                              conf_intl/e_int_config_imc_import.c \
-                             conf_intl/e_int_config_imc_import.h \
-                             conf_intl/e_int_config_imc.c \
-                             conf_intl/e_int_config_imc.h
+                             conf_intl/e_int_config_imc.c
 
 .PHONY: conf_intl install-conf_intl
 conf_intl: $(conf_intlpkg_LTLIBRARIES) $(conf_intl_DATA)
index 9cb9eaa..473ec0b 100644 (file)
@@ -9,11 +9,8 @@ conf_keybindingspkg_LTLIBRARIES = conf_keybindings/module.la
 conf_keybindings_module_la_SOURCES = conf_keybindings/e_mod_main.c \
                             conf_keybindings/e_mod_main.h \
                             conf_keybindings/e_int_config_keybindings.c \
-                            conf_keybindings/e_int_config_keybindings.h \
                             conf_keybindings/e_int_config_mousebindings.c \
-                            conf_keybindings/e_int_config_mousebindings.h \
-                            conf_keybindings/e_int_config_acpibindings.c \
-                            conf_keybindings/e_int_config_acpibindings.h
+                            conf_keybindings/e_int_config_acpibindings.c
 
 .PHONY: conf_keybindings install-conf_keybindings
 conf_keybindings: $(conf_keybindingspkg_LTLIBRARIES) $(conf_keybindings_DATA)
index a244b6b..2f41c6a 100644 (file)
@@ -9,8 +9,7 @@ conf_menuspkg_LTLIBRARIES = conf_menus/module.la
 
 conf_menus_module_la_SOURCES = conf_menus/e_mod_main.c \
                               conf_menus/e_mod_main.h \
-                              conf_menus/e_int_config_menus.c \
-                              conf_menus/e_int_config_menus.h
+                              conf_menus/e_int_config_menus.c
 
 .PHONY: conf_menus install-conf_menus
 conf_menus: $(conf_menuspkg_LTLIBRARIES) $(conf_menus_DATA)
index 224d8f6..47bd3ae 100644 (file)
@@ -10,9 +10,7 @@ conf_pathspkg_LTLIBRARIES = conf_paths/module.la
 conf_paths_module_la_SOURCES = conf_paths/e_mod_main.c \
                               conf_paths/e_mod_main.h \
                               conf_paths/e_int_config_paths.c \
-                              conf_paths/e_int_config_paths.h \
-                              conf_paths/e_int_config_env.c \
-                              conf_paths/e_int_config_env.h
+                              conf_paths/e_int_config_env.c
 
 .PHONY: conf_paths install-conf_paths
 conf_paths: $(conf_pathspkg_LTLIBRARIES) $(conf_paths_DATA)
index a189410..e9e09c1 100644 (file)
@@ -10,11 +10,8 @@ conf_performancepkg_LTLIBRARIES = conf_performance/module.la
 conf_performance_module_la_SOURCES = conf_performance/e_mod_main.c \
                             conf_performance/e_mod_main.h \
                             conf_performance/e_int_config_performance.c \
-                            conf_performance/e_int_config_performance.h \
                             conf_performance/e_int_config_engine.c \
-                            conf_performance/e_int_config_engine.h \
-                            conf_performance/e_int_config_powermanagement.c \
-                            conf_performance/e_int_config_powermanagement.h
+                            conf_performance/e_int_config_powermanagement.c
 
 .PHONY: conf_performance install-conf_performance
 conf_performance: $(conf_performancepkg_LTLIBRARIES) $(conf_performance_DATA)
index d36d49d..4227031 100644 (file)
@@ -9,7 +9,6 @@ conf_randrpkg_LTLIBRARIES = conf_randr/module.la
 
 conf_randr_module_la_SOURCES = conf_randr/e_mod_main.c \
                               conf_randr/e_mod_main.h \
-                              conf_randr/e_int_config_randr.h \
                               conf_randr/e_int_config_randr.c \
                               conf_randr/e_smart_randr.h \
                               conf_randr/e_smart_randr.c \
index 60a860f..29cc216 100644 (file)
@@ -9,23 +9,14 @@ conf_themepkg_LTLIBRARIES = conf_theme/module.la
 conf_theme_module_la_SOURCES = conf_theme/e_mod_main.c \
                               conf_theme/e_mod_main.h \
                               conf_theme/e_int_config_borders.c \
-                              conf_theme/e_int_config_borders.h \
                               conf_theme/e_int_config_color_classes.c \
-                              conf_theme/e_int_config_color_classes.h \
                               conf_theme/e_int_config_fonts.c \
-                              conf_theme/e_int_config_fonts.h \
                               conf_theme/e_int_config_scale.c \
-                              conf_theme/e_int_config_scale.h \
                               conf_theme/e_int_config_startup.c \
-                              conf_theme/e_int_config_startup.h \
                               conf_theme/e_int_config_theme.c \
-                              conf_theme/e_int_config_theme.h \
                               conf_theme/e_int_config_theme_import.c \
-                              conf_theme/e_int_config_theme_import.h \
                               conf_theme/e_int_config_transitions.c \
-                              conf_theme/e_int_config_transitions.h \
                               conf_theme/e_int_config_wallpaper.c \
-                              conf_theme/e_int_config_wallpaper.h \
                               conf_theme/e_int_config_xsettings.c
 
 .PHONY: conf_theme install-conf_theme
index baf5ad7..03fc2fb 100644 (file)
@@ -8,8 +8,7 @@ conf_wallpaper2pkg_LTLIBRARIES = conf_wallpaper2/module.la
 
 conf_wallpaper2_module_la_SOURCES = conf_wallpaper2/e_mod_main.c \
                                    conf_wallpaper2/e_mod_main.h \
-                                   conf_wallpaper2/e_int_config_wallpaper.c \
-                                   conf_wallpaper2/e_int_config_wallpaper.h
+                                   conf_wallpaper2/e_int_config_wallpaper.c
 
 .PHONY: conf_wallpaper2 install-conf_wallpaper2
 conf_wallpaper2: $(conf_wallpaper2pkg_LTLIBRARIES) $(conf_wallpaper2_DATA)
index da93a9f..4af0864 100644 (file)
@@ -8,15 +8,11 @@ conf_window_manipulationpkg_LTLIBRARIES = conf_window_manipulation/module.la
 
 conf_window_manipulation_module_la_SOURCES = conf_window_manipulation/e_mod_main.c \
                      conf_window_manipulation/e_mod_main.h \
-                     conf_window_manipulation/e_int_config_window_manip.h \
                      conf_window_manipulation/e_int_config_window_geometry.c \
                      conf_window_manipulation/e_int_config_window_process.c \
                      conf_window_manipulation/e_int_config_window_display.c \
-                     conf_window_manipulation/e_int_config_window_display.h \
                      conf_window_manipulation/e_int_config_focus.c \
-                     conf_window_manipulation/e_int_config_focus.h \
-                     conf_window_manipulation/e_int_config_clientlist.c \
-                     conf_window_manipulation/e_int_config_clientlist.h
+                     conf_window_manipulation/e_int_config_clientlist.c
 
 .PHONY: conf_window_manipulation install-conf_window_manipulation
 conf_window_manipulation: $(conf_window_manipulationpkg_LTLIBRARIES) $(conf_window_manipulation_DATA)
index e217953..25e8184 100644 (file)
@@ -9,8 +9,7 @@ conf_window_rememberspkg_LTLIBRARIES = conf_window_remembers/module.la
 
 conf_window_remembers_module_la_SOURCES = conf_window_remembers/e_mod_main.c \
                              conf_window_remembers/e_mod_main.h \
-                             conf_window_remembers/e_int_config_remembers.c \
-                             conf_window_remembers/e_int_config_remembers.h
+                             conf_window_remembers/e_int_config_remembers.c
 
 .PHONY: conf_window_remembers install-conf_window_remembers
 conf_window_remembers: $(conf_window_rememberspkg_LTLIBRARIES) $(conf_window_remembers_DATA)
index f9ed97e..8ea7326 100644 (file)
@@ -12,8 +12,6 @@ connman_module_la_SOURCES = connman/e_mod_main.h \
                            connman/e_mod_config.c \
                            connman/e_connman.c \
                            connman/agent.c \
-                           connman/agent.h \
-                           connman/log.h \
                            connman/E_Connman.h
 
 connman_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter
index 912f973..0cbe059 100644 (file)
@@ -9,7 +9,6 @@ dropshadowpkg_LTLIBRARIES = dropshadow/module.la
 
 dropshadow_module_la_SOURCES = dropshadow/e_mod_main.h \
                               dropshadow/e_mod_main.c \
-                              dropshadow/e_mod_config.h \
                               dropshadow/e_mod_config.c
 
 .PHONY: dropshadow install-dropshadow
index cc77fb7..445acaf 100644 (file)
@@ -10,15 +10,11 @@ filemanpkg_LTLIBRARIES = fileman/module.la
 fileman_module_la_SOURCES = fileman/e_mod_main.c \
                            fileman/e_mod_main.h \
                            fileman/e_fwin.c \
-                           fileman/e_fwin.h \
                            fileman/e_fwin_nav.c \
                            fileman/e_mod_config.c \
                            fileman/e_int_config_mime.c \
-                           fileman/e_int_config_mime.h \
                            fileman/e_int_config_mime_edit.c \
-                           fileman/e_int_config_mime_edit.h \
                            fileman/e_mod_dbus.c \
-                           fileman/e_mod_dbus.h \
                            fileman/e_mod_menu.c
 
 .PHONY: fileman install-fileman
index 13b747d..edc3335 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(fileman_opinfo_DATA)
 fileman_opinfopkgdir = $(MDIR)/fileman_opinfo/$(MODULE_ARCH)
 fileman_opinfopkg_LTLIBRARIES = fileman_opinfo/module.la
 
-fileman_opinfo_module_la_SOURCES = fileman_opinfo/e_mod_main.c \
-                                  fileman_opinfo/e_mod_main.h
+fileman_opinfo_module_la_SOURCES = fileman_opinfo/e_mod_main.c
 
 .PHONY: fileman_opinfo install-fileman_opinfo
 fileman_opinfo: $(fileman_opinfopkg_LTLIBRARIES) $(fileman_opinfo_DATA)
index 8ab3d4b..ecbea4e 100644 (file)
@@ -8,9 +8,7 @@ gadmanpkgdir = $(MDIR)/gadman/$(MODULE_ARCH)
 gadmanpkg_LTLIBRARIES = gadman/module.la
 
 gadman_module_la_SOURCES = gadman/e_mod_main.c \
-                          gadman/e_mod_main.h \
                           gadman/e_mod_config.c \
-                          gadman/e_mod_config.h \
                           gadman/e_mod_gadman.c \
                           gadman/e_mod_gadman.h
 
index 69d363f..e825891 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(illume_bluetooth_DATA)
 illume_bluetoothpkgdir = $(MDIR)/illume-bluetooth/$(MODULE_ARCH)
 illume_bluetoothpkg_LTLIBRARIES = illume-bluetooth/module.la
 
-illume_bluetooth_module_la_SOURCES = illume-bluetooth/e_mod_main.c \
-                                    illume-bluetooth/e_mod_main.h
+illume_bluetooth_module_la_SOURCES = illume-bluetooth/e_mod_main.c
 
 .PHONY: illume_bluetooth install-illume_bluetooth
 illume_bluetooth: $(illume_bluetoothpkg_LTLIBRARIES) $(illume_bluetooth_DATA)
index a6add42..f214a2f 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(illume_home_toggle_DATA)
 illume_home_togglepkgdir = $(MDIR)/illume-home-toggle/$(MODULE_ARCH)
 illume_home_togglepkg_LTLIBRARIES = illume-home-toggle/module.la
 
-illume_home_toggle_module_la_SOURCES = illume-home-toggle/e_mod_main.c \
-                                      illume-home-toggle/e_mod_main.h
+illume_home_toggle_module_la_SOURCES = illume-home-toggle/e_mod_main.c
 
 .PHONY: illume_home_toggle install-illume_home_toggle
 illume_home_toggle: $(illume_home_togglepkg_LTLIBRARIES) $(illume_home_toggle_DATA)
index b4613af..5b95c75 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(illume_kbd_toggle_DATA)
 illume_kbd_togglepkgdir = $(MDIR)/illume-kbd-toggle/$(MODULE_ARCH)
 illume_kbd_togglepkg_LTLIBRARIES = illume-kbd-toggle/module.la
 
-illume_kbd_toggle_module_la_SOURCES = illume-kbd-toggle/e_mod_main.c \
-                                     illume-kbd-toggle/e_mod_main.h
+illume_kbd_toggle_module_la_SOURCES = illume-kbd-toggle/e_mod_main.c
 
 .PHONY: illume_kbd_toggle install-illume_kbd_toggle
 illume_kbd_toggle: $(illume_kbd_togglepkg_LTLIBRARIES) $(illume_kbd_toggle_DATA)
index 2b50438..71498e0 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(illume_mode_toggle_DATA)
 illume_mode_togglepkgdir = $(MDIR)/illume-mode-toggle/$(MODULE_ARCH)
 illume_mode_togglepkg_LTLIBRARIES = illume-mode-toggle/module.la
 
-illume_mode_toggle_module_la_SOURCES = illume-mode-toggle/e_mod_main.c \
-                                     illume-mode-toggle/e_mod_main.h
+illume_mode_toggle_module_la_SOURCES = illume-mode-toggle/e_mod_main.c
 
 .PHONY: illume_mode_toggle install-illume_mode_toggle
 illume_mode_toggle: $(illume_mode_togglepkg_LTLIBRARIES) $(illume_mode_toggle_DATA)
index 48b7672..4887bc5 100644 (file)
@@ -51,23 +51,14 @@ illume2_module_la_SOURCES = illume2/e_mod_main.c \
                            illume2/e_illume.h \
                            illume2/e_illume.c \
                            illume2/e_illume_private.h \
-                           illume2/e_mod_config_policy.h \
                            illume2/e_mod_config_policy.c \
-                           illume2/e_mod_select_window.h \
                            illume2/e_mod_select_window.c \
-                           illume2/e_mod_config_windows.h \
                            illume2/e_mod_config_windows.c \
-                           illume2/e_mod_config_animation.h \
                            illume2/e_mod_config_animation.c \
-                           illume2/e_mod_quickpanel.h \
                            illume2/e_mod_quickpanel.c \
-                           illume2/e_mod_kbd_device.h \
                            illume2/e_mod_kbd_device.c \
-                           illume2/e_mod_kbd.h \
                            illume2/e_mod_kbd.c \
-                           illume2/e_mod_policy.h \
                            illume2/e_mod_policy.c \
-                           illume2/e_mod_config.h \
                            illume2/e_mod_config.c
 
 # TODO: incomplete
index ddd707f..9873442 100644 (file)
@@ -10,7 +10,6 @@ physicspkg_LTLIBRARIES = physics/module.la
 physics_module_la_SOURCES = physics/e_mod_main.c \
                            physics/e_mod_main.h \
                            physics/e_mod_config.c \
-                           physics/e_mod_config.h \
                            physics/e_mod_physics_cfdata.c \
                            physics/e_mod_physics_cfdata.h \
                            physics/e_mod_physics.c \
index 1844f94..3ca467d 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(shot_DATA)
 shotpkgdir = $(MDIR)/shot/$(MODULE_ARCH)
 shotpkg_LTLIBRARIES = shot/module.la
 
-shot_module_la_SOURCES = shot/e_mod_main.c \
-                        shot/e_mod_main.h
+shot_module_la_SOURCES = shot/e_mod_main.c
 
 .PHONY: shot install-shot
 shot: $(shotpkg_LTLIBRARIES) $(shot_DATA)
index 37cf713..f63726b 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(start_DATA)
 startpkgdir = $(MDIR)/start/$(MODULE_ARCH)
 startpkg_LTLIBRARIES = start/module.la
 
-start_module_la_SOURCES = start/e_mod_main.h \
-                         start/e_mod_main.c
+start_module_la_SOURCES = start/e_mod_main.c
 
 .PHONY: start install-start
 start: $(startpkg_LTLIBRARIES) $(start_DATA)
index 7346ecb..411a217 100644 (file)
@@ -10,9 +10,7 @@ sysconpkg_LTLIBRARIES = syscon/module.la
 syscon_module_la_SOURCES = syscon/e_mod_main.c \
                           syscon/e_mod_main.h \
                           syscon/e_int_config_syscon.c \
-                          syscon/e_int_config_syscon.h \
                           syscon/e_syscon.c \
-                          syscon/e_syscon.h \
                           syscon/e_syscon_gadget.c
 
 .PHONY: syscon install-syscon
index 527fa1e..0fd0ce6 100644 (file)
@@ -7,8 +7,7 @@ EXTRA_DIST += $(systray_DATA)
 systraypkgdir = $(MDIR)/systray/$(MODULE_ARCH)
 systraypkg_LTLIBRARIES = systray/module.la
 
-systray_module_la_SOURCES = systray/e_mod_main.h \
-                           systray/e_mod_main.c
+systray_module_la_SOURCES = systray/e_mod_main.c
 
 .PHONY: systray install-systray
 systray: $(systraypkg_LTLIBRARIES) $(systray_DATA)
index eac7adb..4100747 100644 (file)
@@ -10,7 +10,6 @@ temperaturepkg_LTLIBRARIES = temperature/module.la
 temperature_module_la_SOURCES  = temperature/e_mod_main.c \
                                 temperature/e_mod_main.h \
                                 temperature/e_mod_config.c \
-                                temperature/e_mod_main_private.h \
                                 temperature/e_mod_tempget.c
 
 if HAVE_EEZE
index d4721f6..4b702df 100644 (file)
@@ -9,7 +9,6 @@ winlistpkg_LTLIBRARIES = winlist/module.la
 
 winlist_module_la_SOURCES = winlist/e_mod_main.h \
                            winlist/e_mod_main.c \
-                           winlist/e_int_config_winlist.h \
                            winlist/e_int_config_winlist.c \
                            winlist/e_winlist.h \
                            winlist/e_winlist.c
index 579cb87..b3e3a1a 100644 (file)
@@ -40,8 +40,7 @@ wizardpkg_LTLIBRARIES  = wizard/module.la \
                         wizard/page_180.la \
                         wizard/page_200.la
 
-wizard_module_la_SOURCES = wizard/e_mod_main.h \
-                          wizard/e_mod_main.c \
+wizard_module_la_SOURCES = wizard/e_mod_main.c \
                           wizard/e_wizard.c \
                           wizard/e_wizard.h
 
index 91d22f1..4437305 100644 (file)
@@ -9,10 +9,4 @@ struct _Config
    Eina_Bool            window;
 };
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
 #endif
index 976286b..6e61f09 100644 (file)
@@ -1,5 +1,15 @@
+/**
+ * @addtogroup Optional_Devices
+ * @{
+ *
+ * @defgroup Module_Backlight Backlight
+ *
+ * Controls backlights such as laptop LCD.
+ *
+ * @}
+ */
+
 #include "e.h"
-#include "e_mod_main.h"
 
 /* gadcon requirements */
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
diff --git a/src/modules/backlight/e_mod_main.h b/src/modules/backlight/e_mod_main.h
deleted file mode 100644 (file)
index caf1daa..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-/**
- * @addtogroup Optional_Devices
- * @{
- *
- * @defgroup Module_Backlight Backlight
- *
- * Controls backlights such as laptop LCD.
- *
- * @}
- */
-
-#endif
diff --git a/src/modules/conf/e_conf.h b/src/modules/conf/e_conf.h
deleted file mode 100644 (file)
index 03bebe3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifdef E_TYPEDEFS
-
-#else
-#ifndef E_CONF_H
-#define E_CONF_H
-
-void e_configure_show(E_Container *con, const char *params);
-void e_configure_del(void);
-
-#endif
-#endif
index 57a2c7d..85ccec2 100644 (file)
@@ -1,12 +1,6 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_conf.h"
-
-#undef E_TYPEDEFS
-#include "e_conf.h"
-
 #define MOD_CONFIG_FILE_EPOCH 0x0001
 #define MOD_CONFIG_FILE_GENERATION 0x008d
 #define MOD_CONFIG_FILE_VERSION \
@@ -22,11 +16,8 @@ struct _Config
    int menu_augmentation;
 };
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+void e_configure_show(E_Container *con, const char *params);
+void e_configure_del(void);
 
 E_Config_Dialog *e_int_config_conf_module(E_Container *con, const char *params);
 void e_mod_config_menu_add(void *data, E_Menu *m);
diff --git a/src/modules/conf_applications/e_int_config_apps.h b/src/modules/conf_applications/e_int_config_apps.h
deleted file mode 100644 (file)
index 63b5c37..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_APPS_H
-#define E_INT_CONFIG_APPS_H
-
-E_Config_Dialog *e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_apps_add(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_apps_ibar_other(E_Container *con, const char *path);
-E_Config_Dialog *e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_apps_desk_lock(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_apps_desk_unlock(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_applications/e_int_config_apps_personal.h b/src/modules/conf_applications/e_int_config_apps_personal.h
deleted file mode 100644 (file)
index 4c23f26..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_APPS_PERSONAL_H
-#define E_INT_CONFIG_APPS_PERSONAL_H
-
-E_Config_Dialog *e_int_config_apps_personal(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_applications/e_int_config_defapps.h b/src/modules/conf_applications/e_int_config_defapps.h
deleted file mode 100644 (file)
index 4ede68d..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_DEFAPPS_H
-#define E_INT_CONFIG_DEFAPPS_H
-
-E_Config_Dialog *e_int_config_defapps(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_applications/e_int_config_deskenv.h b/src/modules/conf_applications/e_int_config_deskenv.h
deleted file mode 100644 (file)
index 981d756..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_DESKENV_H
-#define E_INT_CONFIG_DESKENV_H
-
-E_Config_Dialog *e_int_config_deskenv(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 976fdb3..df851fd 100644 (file)
@@ -1,23 +1,20 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_apps.h"
-#include "e_int_config_defapps.h"
-#include "e_int_config_deskenv.h"
-#include "e_int_config_apps_personal.h"
+E_Config_Dialog *e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_add(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_ibar_other(E_Container *con, const char *path);
+E_Config_Dialog *e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_desk_lock(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_apps_desk_unlock(E_Container *con, const char *params __UNUSED__);
 
-#undef E_TYPEDEFS
-#include "e_int_config_apps.h"
-#include "e_int_config_defapps.h"
-#include "e_int_config_deskenv.h"
-#include "e_int_config_apps_personal.h"
+E_Config_Dialog *e_int_config_defapps(E_Container *con, const char *params __UNUSED__);
 
-EAPI extern E_Module_Api e_modapi;
+E_Config_Dialog *e_int_config_apps_personal(E_Container *con, const char *params __UNUSED__);
 
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_deskenv(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_dialogs/e_int_config_dialogs.h b/src/modules/conf_dialogs/e_int_config_dialogs.h
deleted file mode 100644 (file)
index 273df2f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_DIALOGS_H
-#define E_INT_CONFIG_DIALOGS_H
-
-E_Config_Dialog *e_int_config_dialogs(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
-
diff --git a/src/modules/conf_dialogs/e_int_config_profiles.h b/src/modules/conf_dialogs/e_int_config_profiles.h
deleted file mode 100644 (file)
index ff18335..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_PROFILES_H
-#define E_INT_CONFIG_PROFILES_H
-
-E_Config_Dialog *e_int_config_profiles(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 3a37dca..8265b54 100644 (file)
@@ -1,19 +1,8 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_dialogs.h"
-#include "e_int_config_profiles.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_dialogs.h"
-#include "e_int_config_profiles.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_profiles(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_dialogs(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_display/e_int_config_desk.h b/src/modules/conf_display/e_int_config_desk.h
deleted file mode 100644 (file)
index d810923..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_DESK_H
-#define E_INT_CONFIG_DESK_H
-
-E_Config_Dialog *e_int_config_desk(E_Container *con, const char *params);
-
-#endif
-#endif
diff --git a/src/modules/conf_display/e_int_config_desklock.h b/src/modules/conf_display/e_int_config_desklock.h
deleted file mode 100644 (file)
index 2e96817..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_DESKLOCK_H
-#define E_INT_CONFIG_DESKLOCK_H
-
-E_Config_Dialog *e_int_config_desklock(E_Container *con, const char *params __UNUSED__);
-void e_int_config_desklock_fsel_done(E_Config_Dialog *cfd, Evas_Object *bg, const char *bg_file);
-
-#endif
-#endif
diff --git a/src/modules/conf_display/e_int_config_desklock_fsel.h b/src/modules/conf_display/e_int_config_desklock_fsel.h
deleted file mode 100644 (file)
index 836aba7..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-# ifndef E_INT_CONFIG_DESKLOCK_FSEL_H
-#  define E_INT_CONFIG_DESKLOCK_FSEL_H
-
-E_Config_Dialog *e_int_config_desklock_fsel(E_Config_Dialog *parent, Evas_Object *bg);
-void e_int_config_desklock_fsel_del(E_Config_Dialog *cfd);
-
-# endif
-#endif
diff --git a/src/modules/conf_display/e_int_config_desks.h b/src/modules/conf_display/e_int_config_desks.h
deleted file mode 100644 (file)
index 4c5d6c2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_DESKS_H
-#define E_INT_CONFIG_DESKS_H
-
-E_Config_Dialog *e_int_config_desks(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_display/e_int_config_display.h b/src/modules/conf_display/e_int_config_display.h
deleted file mode 100644 (file)
index 9e31f32..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_DISPLAY_H
-#define E_INT_CONFIG_DISPLAY_H
-
-E_Config_Dialog *e_int_config_display(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_display/e_int_config_dpms.h b/src/modules/conf_display/e_int_config_dpms.h
deleted file mode 100644 (file)
index 5d3a0b7..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_DPMS_H
-#define E_INT_CONFIG_DPMS_H
-
-E_Config_Dialog *e_int_config_dpms(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_display/e_int_config_screensaver.h b/src/modules/conf_display/e_int_config_screensaver.h
deleted file mode 100644 (file)
index 2f0ec80..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_SCREENSAVER_H
-#define E_INT_CONFIG_SCREENSAVER_H
-
-E_Config_Dialog *e_int_config_screensaver(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 1069f0e..8e7fd01 100644 (file)
@@ -1,29 +1,15 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_display.h"
-#include "e_int_config_screensaver.h"
-#include "e_int_config_dpms.h"
-#include "e_int_config_desklock.h"
-#include "e_int_config_desklock_fsel.h"
-#include "e_int_config_desks.h"
-#include "e_int_config_desk.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_display.h"
-#include "e_int_config_screensaver.h"
-#include "e_int_config_dpms.h"
-#include "e_int_config_desklock.h"
-#include "e_int_config_desklock_fsel.h"
-#include "e_int_config_desks.h"
-#include "e_int_config_desk.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_desk(E_Container *con, const char *params);
+E_Config_Dialog *e_int_config_screensaver(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_dpms(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_display(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_desks(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_desklock(E_Container *con, const char *params __UNUSED__);
+void e_int_config_desklock_fsel_done(E_Config_Dialog *cfd, Evas_Object *bg, const char *bg_file);
+E_Config_Dialog *e_int_config_desklock_fsel(E_Config_Dialog *parent, Evas_Object *bg);
+void e_int_config_desklock_fsel_del(E_Config_Dialog *cfd);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.h b/src/modules/conf_edgebindings/e_int_config_edgebindings.h
deleted file mode 100644 (file)
index 56bd559..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_EDGEBINDINGS_H
-#define E_INT_CONFIG_EDGEBINDINGS_H
-
-E_Config_Dialog *e_int_config_edgebindings(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 4a2fbe4..ffb2908 100644 (file)
@@ -1,18 +1,7 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_edgebindings.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_edgebindings.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
+E_Config_Dialog *e_int_config_edgebindings(E_Container *con, const char *params __UNUSED__);
 E_Config_Dialog *e_int_config_signalbindings(E_Container *con, const char *params);
 
 
diff --git a/src/modules/conf_interaction/e_int_config_interaction.h b/src/modules/conf_interaction/e_int_config_interaction.h
deleted file mode 100644 (file)
index 698afb0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_INTERACTION_H
-#define E_INT_CONFIG_INTERACTION_H
-
-E_Config_Dialog *e_int_config_interaction(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
-
diff --git a/src/modules/conf_interaction/e_int_config_mouse.h b/src/modules/conf_interaction/e_int_config_mouse.h
deleted file mode 100644 (file)
index 64dda04..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_MOUSE_H
-#define E_INT_CONFIG_MOUSE_H
-
-E_Config_Dialog *e_int_config_mouse(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 2cf513a..3851f50 100644 (file)
@@ -1,19 +1,8 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_interaction.h"
-#include "e_int_config_mouse.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_interaction.h"
-#include "e_int_config_mouse.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_interaction(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_mouse(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
index 5b8d601..7949a87 100644 (file)
@@ -1,6 +1,5 @@
 #include "e.h"
-#include "e_int_config_imc.h"
-#include "e_int_config_imc_import.h"
+#include "e_mod_main.h"
 
 typedef struct _E_Imc_Update_Data E_Imc_Update_Data;
 
diff --git a/src/modules/conf_intl/e_int_config_imc.h b/src/modules/conf_intl/e_int_config_imc.h
deleted file mode 100644 (file)
index c054037..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_IMC_H
-#define E_INT_CONFIG_IMC_H
-
-E_Config_Dialog *e_int_config_imc(E_Container *con, const char *params __UNUSED__);
-void e_int_config_imc_import_done(E_Config_Dialog *dia);
-void e_int_config_imc_update(E_Config_Dialog *dia, const char *file);
-
-#endif
-#endif
index a18074c..fa8d4ef 100644 (file)
@@ -1,5 +1,5 @@
 #include "e.h"
-#include "e_int_config_imc.h"
+#include "e_mod_main.h"
 
 typedef struct _Import Import;
 
diff --git a/src/modules/conf_intl/e_int_config_imc_import.h b/src/modules/conf_intl/e_int_config_imc_import.h
deleted file mode 100644 (file)
index 9751734..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_IMC_IMPORT_H
-#define E_INT_CONFIG_IMC_IMPORT_H
-
-E_Win *e_int_config_imc_import(E_Config_Dialog *parent);
-void e_int_config_imc_import_del(E_Win *win);
-    
-#endif
-#endif
diff --git a/src/modules/conf_intl/e_int_config_intl.h b/src/modules/conf_intl/e_int_config_intl.h
deleted file mode 100644 (file)
index f8b48fb..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_INTL_H
-#define E_INT_CONFIG_INTL_H
-
-E_Config_Dialog *e_int_config_intl(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_desklock_intl(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index fd9c40f..fa8657d 100644 (file)
@@ -1,19 +1,15 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_intl.h"
-#include "e_int_config_imc.h"
+E_Config_Dialog *e_int_config_imc(E_Container *con, const char *params __UNUSED__);
+void e_int_config_imc_import_done(E_Config_Dialog *dia);
+void e_int_config_imc_update(E_Config_Dialog *dia, const char *file);
 
-#undef E_TYPEDEFS
-#include "e_int_config_intl.h"
-#include "e_int_config_imc.h"
+E_Win *e_int_config_imc_import(E_Config_Dialog *parent);
+void e_int_config_imc_import_del(E_Win *win);
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_intl(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_desklock_intl(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_keybindings/e_int_config_acpibindings.h b/src/modules/conf_keybindings/e_int_config_acpibindings.h
deleted file mode 100644 (file)
index 2760c2c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-
-#else
-#ifndef E_INT_CONFIG_ACPIBINDINGS_H
-#define E_INT_CONFIG_ACPIBINDINGS_H
-
-E_Config_Dialog *e_int_config_acpibindings(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.h b/src/modules/conf_keybindings/e_int_config_keybindings.h
deleted file mode 100644 (file)
index 0af90e2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_KEYBINDINGS_H
-#define E_INT_CONFIG_KEYBINDINGS_H
-
-E_Config_Dialog *e_int_config_keybindings(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_keybindings/e_int_config_mousebindings.h b/src/modules/conf_keybindings/e_int_config_mousebindings.h
deleted file mode 100644 (file)
index 1593a1b..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_MOUSEBINDINGS_H
-#define E_INT_CONFIG_MOUSEBINDINGS_H
-
-E_Config_Dialog *e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index f8d981e..cd9ac91 100644 (file)
@@ -1,21 +1,9 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_keybindings.h"
-#include "e_int_config_mousebindings.h"
-#include "e_int_config_acpibindings.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_keybindings.h"
-#include "e_int_config_mousebindings.h"
-#include "e_int_config_acpibindings.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_acpibindings(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_keybindings(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_menus/e_int_config_menus.h b/src/modules/conf_menus/e_int_config_menus.h
deleted file mode 100644 (file)
index 1951ece..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_MENUS_H
-#define E_INT_CONFIG_MENUS_H
-
-E_Config_Dialog *e_int_config_menus(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 00e2969..fd26116 100644 (file)
@@ -1,17 +1,7 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_menus.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_menus.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_menus(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_paths/e_int_config_env.h b/src/modules/conf_paths/e_int_config_env.h
deleted file mode 100644 (file)
index 8b4f859..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_ENV_H
-#define E_INT_CONFIG_ENV_H
-
-E_Config_Dialog *e_int_config_env(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_paths/e_int_config_paths.h b/src/modules/conf_paths/e_int_config_paths.h
deleted file mode 100644 (file)
index ae25a91..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_PATHS_H
-#define E_INT_CONFIG_PATHS_H
-
-E_Config_Dialog *e_int_config_paths(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 69e45ed..3d2c518 100644 (file)
@@ -1,19 +1,8 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_paths.h"
-#include "e_int_config_env.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_paths.h"
-#include "e_int_config_env.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_env(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_paths(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_performance/e_int_config_engine.h b/src/modules/conf_performance/e_int_config_engine.h
deleted file mode 100644 (file)
index 2d9181e..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_ENGINE_H
-#define E_INT_CONFIG_ENGINE_H
-
-E_Config_Dialog *e_int_config_engine(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_performance/e_int_config_performance.h b/src/modules/conf_performance/e_int_config_performance.h
deleted file mode 100644 (file)
index 2efbe47..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_PERFORMANCE_H
-#define E_INT_CONFIG_PERFORMANCE_H
-
-E_Config_Dialog *e_int_config_performance(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_performance/e_int_config_powermanagement.h b/src/modules/conf_performance/e_int_config_powermanagement.h
deleted file mode 100644 (file)
index 1733a83..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_POWERMANAGEMENT_H
-#define E_INT_CONFIG_POWERMANAGEMENT_H
-
-E_Config_Dialog *e_int_config_powermanagement(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 76d7d1f..6394e39 100644 (file)
@@ -1,20 +1,9 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_performance.h"
-#include "e_int_config_engine.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_performance.h"
-#include "e_int_config_engine.h"
-#include "e_int_config_powermanagement.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_engine(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_performance(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_powermanagement(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
index 39d8fdf..eb90877 100644 (file)
@@ -1,6 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_int_config_randr.h"
 #include "e_smart_randr.h"
 #include "e_smart_monitor.h"
 
diff --git a/src/modules/conf_randr/e_int_config_randr.h b/src/modules/conf_randr/e_int_config_randr.h
deleted file mode 100644 (file)
index f7760c8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-# ifndef E_INT_CONFIG_RANDR_H
-#  define E_INT_CONFIG_RANDR_H
-
-E_Config_Dialog *e_int_config_randr(E_Container *con, const char *params __UNUSED__);
-
-# endif
-#endif
index f1f70ce..35ef94a 100644 (file)
@@ -1,6 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_int_config_randr.h"
 
 const char *mod_dir = NULL;
 
index 14c9f51..e528777 100644 (file)
 # define E_RANDR_12 (e_randr_screen_info.rrvd_info.randr_info_12)
 #endif
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
+E_Config_Dialog *e_int_config_randr(E_Container *con, const char *params __UNUSED__);
 extern const char *mod_dir;
 
 /**
index 39ae28c..a97598a 100644 (file)
@@ -1,17 +1,7 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_shelf.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_shelf.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_shelf(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_theme/e_int_config_borders.h b/src/modules/conf_theme/e_int_config_borders.h
deleted file mode 100644 (file)
index 8549998..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_BORDERS_H
-#define E_INT_CONFIG_BORDERS_H
-
-E_Config_Dialog *e_int_config_borders(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_borders_border(E_Container *con, const char *params);
-
-#endif
-#endif
diff --git a/src/modules/conf_theme/e_int_config_color_classes.h b/src/modules/conf_theme/e_int_config_color_classes.h
deleted file mode 100644 (file)
index 549e841..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_COLOR_CLASSES_H
-#define E_INT_CONFIG_COLOR_CLASSES_H
-
-E_Config_Dialog *e_int_config_color_classes(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_theme/e_int_config_fonts.h b/src/modules/conf_theme/e_int_config_fonts.h
deleted file mode 100644 (file)
index 76eab76..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_FONTS_H
-#define E_INT_CONFIG_FONTS_H
-
-E_Config_Dialog *e_int_config_fonts(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_theme/e_int_config_scale.h b/src/modules/conf_theme/e_int_config_scale.h
deleted file mode 100644 (file)
index 3393afa..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_SCALE_H
-#define E_INT_CONFIG_SCALE_H
-
-E_Config_Dialog *e_int_config_scale(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_theme/e_int_config_startup.h b/src/modules/conf_theme/e_int_config_startup.h
deleted file mode 100644 (file)
index 429edec..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_STARTUP_H
-#define E_INT_CONFIG_STARTUP_H
-
-E_Config_Dialog *e_int_config_startup(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index a74990c..eb91658 100644 (file)
@@ -1,5 +1,5 @@
 #include "e.h"
-#include "e_int_config_theme_import.h"
+#include "e_mod_main.h"
 
 static void        *_create_data(E_Config_Dialog *cfd);
 static void         _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
diff --git a/src/modules/conf_theme/e_int_config_theme.h b/src/modules/conf_theme/e_int_config_theme.h
deleted file mode 100644 (file)
index d38f9bc..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_THEME_H
-#define E_INT_CONFIG_THEME_H
-
-E_Config_Dialog *e_int_config_theme(E_Container *con, const char *params __UNUSED__);
-
-void             e_int_config_theme_import_done(E_Config_Dialog *dia);
-void             e_int_config_theme_update(E_Config_Dialog *dia, char *file);
-void             e_int_config_theme_web_done(E_Config_Dialog *dia);
-
-#endif
-#endif
index d97362f..0b5544f 100644 (file)
@@ -1,6 +1,5 @@
 #include "e.h"
-#include "e_int_config_theme.h"
-#include "e_int_config_theme_import.h"
+#include "e_mod_main.h"
 
 typedef struct _Import Import;
 
diff --git a/src/modules/conf_theme/e_int_config_theme_import.h b/src/modules/conf_theme/e_int_config_theme_import.h
deleted file mode 100644 (file)
index 84ff8c2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_THEME_IMPORT_H
-#define E_INT_CONFIG_THEME_IMPORT_H
-
-E_Win *e_int_config_theme_import (E_Config_Dialog *parent);
-void   e_int_config_theme_del    (E_Win *win);
-
-#endif
-#endif
diff --git a/src/modules/conf_theme/e_int_config_transitions.h b/src/modules/conf_theme/e_int_config_transitions.h
deleted file mode 100644 (file)
index 6fbac25..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_TRANSITIONS_H
-#define E_INT_CONFIG_TRANSITIONS_H
-
-E_Config_Dialog *e_int_config_transitions(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_theme/e_int_config_wallpaper.h b/src/modules/conf_theme/e_int_config_wallpaper.h
deleted file mode 100644 (file)
index 3ec4a57..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef E_TYPEDEFS
-typedef struct _E_Config_Wallpaper E_Config_Wallpaper;
-#else
-#ifndef E_INT_CONFIG_WALLPAPER_H
-#define E_INT_CONFIG_WALLPAPER_H
-
-E_Config_Dialog *e_int_config_wallpaper(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_wallpaper_desk(E_Container *con, const char *params);
-
-void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file);
-void e_int_config_wallpaper_import_done(E_Config_Dialog *dia);
-void e_int_config_wallpaper_web_done(E_Config_Dialog *dia);
-
-#endif
-#endif
index f3c9917..8b6990a 100644 (file)
@@ -1,33 +1,7 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_borders.h"
-#include "e_int_config_color_classes.h"
-#include "e_int_config_fonts.h"
-#include "e_int_config_scale.h"
-#include "e_int_config_startup.h"
-#include "e_int_config_theme.h"
-#include "e_int_config_theme_import.h"
-#include "e_int_config_transitions.h"
-#include "e_int_config_wallpaper.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_borders.h"
-#include "e_int_config_color_classes.h"
-#include "e_int_config_fonts.h"
-#include "e_int_config_scale.h"
-#include "e_int_config_startup.h"
-#include "e_int_config_theme.h"
-#include "e_int_config_theme_import.h"
-#include "e_int_config_transitions.h"
-#include "e_int_config_wallpaper.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+typedef struct _E_Config_Wallpaper E_Config_Wallpaper;
 
 E_Config_Dialog *e_int_config_xsettings(E_Container *con, const char *params __UNUSED__);
 
@@ -41,4 +15,34 @@ E_Config_Dialog *e_int_config_xsettings(E_Container *con, const char *params __U
  *
  * @}
  */
+
+E_Config_Dialog *e_int_config_borders(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_borders_border(E_Container *con, const char *params);
+
+E_Config_Dialog *e_int_config_color_classes(E_Container *con, const char *params __UNUSED__);
+
+E_Config_Dialog *e_int_config_fonts(E_Container *con, const char *params __UNUSED__);
+
+E_Config_Dialog *e_int_config_scale(E_Container *con, const char *params __UNUSED__);
+
+E_Config_Dialog *e_int_config_startup(E_Container *con, const char *params __UNUSED__);
+
+E_Config_Dialog *e_int_config_theme(E_Container *con, const char *params __UNUSED__);
+
+void             e_int_config_theme_import_done(E_Config_Dialog *dia);
+void             e_int_config_theme_update(E_Config_Dialog *dia, char *file);
+void             e_int_config_theme_web_done(E_Config_Dialog *dia);
+
+E_Win *e_int_config_theme_import (E_Config_Dialog *parent);
+void   e_int_config_theme_del    (E_Win *win);
+
+E_Config_Dialog *e_int_config_transitions(E_Container *con, const char *params __UNUSED__);
+
+E_Config_Dialog *e_int_config_wallpaper(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_wallpaper_desk(E_Container *con, const char *params);
+
+void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file);
+void e_int_config_wallpaper_import_done(E_Config_Dialog *dia);
+void e_int_config_wallpaper_web_done(E_Config_Dialog *dia);
+
 #endif
diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.h b/src/modules/conf_wallpaper2/e_int_config_wallpaper.h
deleted file mode 100644 (file)
index 7786f77..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifdef E_TYPEDEFS
-//typedef struct _E_Config_Wallpaper E_Config_Wallpaper;
-#else
-#ifndef E_INT_CONFIG_WALLPAPER_H
-#define E_INT_CONFIG_WALLPAPER_H
-
-E_Config_Dialog *wp_conf_show(E_Container *con, const char *params);
-void wp_conf_hide(void);
-
-#endif
-#endif
index 8eff753..87abfb1 100644 (file)
@@ -1,16 +1,8 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_wallpaper.h"
-#undef E_TYPEDEFS
-#include "e_int_config_wallpaper.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *wp_conf_show(E_Container *con, const char *params);
+void wp_conf_hide(void);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_window_manipulation/e_int_config_clientlist.h b/src/modules/conf_window_manipulation/e_int_config_clientlist.h
deleted file mode 100644 (file)
index ae23398..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_CLIENTLIST_H
-#define E_INT_CONFIG_CLIENTLIST_H
-
-E_Config_Dialog *e_int_config_clientlist(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.h b/src/modules/conf_window_manipulation/e_int_config_focus.h
deleted file mode 100644 (file)
index 53d4553..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_FOCUS_H
-#define E_INT_CONFIG_FOCUS_H
-
-E_Config_Dialog *e_int_config_focus(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_display.h b/src/modules/conf_window_manipulation/e_int_config_window_display.h
deleted file mode 100644 (file)
index 070348f..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_WINDOW_DISPLAY_H
-#define E_INT_CONFIG_WINDOW_DISPLAY_H
-
-E_Config_Dialog *e_int_config_window_display(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_manip.h b/src/modules/conf_window_manipulation/e_int_config_window_manip.h
deleted file mode 100644 (file)
index 7fdc801..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_WINDOW_MANIPULATION_H
-#define E_INT_CONFIG_WINDOW_MANIPULATION_H
-
-E_Config_Dialog *e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__);
-E_Config_Dialog *e_int_config_window_process(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 3dccdbe..3a80c31 100644 (file)
@@ -1,23 +1,14 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_window_manip.h"
-#include "e_int_config_window_display.h"
-#include "e_int_config_focus.h"
-#include "e_int_config_clientlist.h"
+E_Config_Dialog *e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_window_process(E_Container *con, const char *params __UNUSED__);
 
-#undef E_TYPEDEFS
-#include "e_int_config_window_manip.h"
-#include "e_int_config_window_display.h"
-#include "e_int_config_focus.h"
-#include "e_int_config_clientlist.h"
+E_Config_Dialog *e_int_config_window_display(E_Container *con, const char *params __UNUSED__);
 
-EAPI extern E_Module_Api e_modapi;
+E_Config_Dialog *e_int_config_focus(E_Container *con, const char *params __UNUSED__);
 
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_clientlist(E_Container *con, const char *params __UNUSED__);
 
 /**
  * @addtogroup Optional_Conf
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.h b/src/modules/conf_window_remembers/e_int_config_remembers.h
deleted file mode 100644 (file)
index 244c734..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_REMEMBERS_H
-#define E_INT_CONFIG_REMEMBERS_H
-
-E_Config_Dialog *e_int_config_remembers(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index bbf6d79..5d04cb1 100644 (file)
@@ -1,17 +1,7 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_int_config_remembers.h"
-#undef E_TYPEDEFS
-#include "e_int_config_remembers.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
+E_Config_Dialog *e_int_config_remembers(E_Container *con, const char *params __UNUSED__);
 /**
  * @addtogroup Optional_Conf
  * @{
index a57c176..452bfe3 100644 (file)
@@ -1,15 +1,8 @@
 #ifndef E_CONNMAN_H
 #define E_CONNMAN_H
 
+#include "e.h"
 #include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include <Eina.h>
-#include <Ecore.h>
-#include <E_DBus.h>
-
-#include "log.h"
 
 typedef struct _E_Connman_Agent E_Connman_Agent;
 
@@ -123,4 +116,17 @@ void econnman_mod_services_changed(struct Connman_Manager *cm);
 const char *econnman_state_to_str(enum Connman_State state);
 const char *econnman_service_type_to_str(enum Connman_Service_Type type);
 
+/* Log */
+extern int _e_connman_log_dom;
+
+#undef DBG
+#undef INF
+#undef WRN
+#undef ERR
+
+#define DBG(...) EINA_LOG_DOM_DBG(_e_connman_log_dom, __VA_ARGS__)
+#define INF(...) EINA_LOG_DOM_INFO(_e_connman_log_dom, __VA_ARGS__)
+#define WRN(...) EINA_LOG_DOM_WARN(_e_connman_log_dom, __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(_e_connman_log_dom, __VA_ARGS__)
+
 #endif /* E_CONNMAN_H */
index dadff7c..5ef27b8 100644 (file)
@@ -7,7 +7,6 @@
 #include <string.h>
 
 #include "e.h"
-#include "agent.h"
 #include "E_Connman.h"
 #include "e_mod_main.h"
 #define AGENT_IFACE "net.connman.Agent"
diff --git a/src/modules/connman/agent.h b/src/modules/connman/agent.h
deleted file mode 100644 (file)
index 17d3889..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef E_CONNMAN_AGENT_H
-#define E_CONNMAN_AGENT_H
-
-#include "E_Connman.h"
-
-#define AGENT_PATH "/org/enlightenment/connman/agent"
-
-E_Connman_Agent *econnman_agent_new(E_DBus_Connection *edbus_conn) EINA_ARG_NONNULL(1);
-void econnman_agent_del(E_Connman_Agent *agent);
-
-#endif /* E_CONNMAN_H */
index 591e84e..5feaa32 100644 (file)
@@ -1,13 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "E_Connman.h"
-#include "agent.h"
+#include "e_mod_main.h"
 
 #define CONNMAN_BUS_NAME "net.connman"
 #define CONNMAN_MANAGER_IFACE CONNMAN_BUS_NAME ".Manager"
index 75cd6e2..5c5e427 100644 (file)
@@ -1,12 +1,12 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#include "config.h"
 #include <e.h>
-#include <eina_log.h>
 
 #include "E_Connman.h"
 
+#define AGENT_PATH "/org/enlightenment/connman/agent"
+
 #define MOD_CONF_VERSION 3
 
 extern E_Module *connman_mod;
@@ -68,6 +68,9 @@ const char *e_connman_theme_path(void);
 E_Config_Dialog *e_connman_config_dialog_new(E_Container *con,
                                              E_Connman_Module_Context *ctxt);
 
+E_Connman_Agent *econnman_agent_new(E_DBus_Connection *edbus_conn) EINA_ARG_NONNULL(1);
+void econnman_agent_del(E_Connman_Agent *agent);
+
 /**
  * @addtogroup Optional_Devices
  * @{
diff --git a/src/modules/connman/log.h b/src/modules/connman/log.h
deleted file mode 100644 (file)
index f2044c8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _E_CONNMAN_LOG_H_
-#define _E_CONNMAN_LOG_H_
-
-extern int _e_connman_log_dom;
-
-#undef DBG
-#undef INF
-#undef WRN
-#undef ERR
-
-#define DBG(...) EINA_LOG_DOM_DBG(_e_connman_log_dom, __VA_ARGS__)
-#define INF(...) EINA_LOG_DOM_INFO(_e_connman_log_dom, __VA_ARGS__)
-#define WRN(...) EINA_LOG_DOM_WARN(_e_connman_log_dom, __VA_ARGS__)
-#define ERR(...) EINA_LOG_DOM_ERR(_e_connman_log_dom, __VA_ARGS__)
-
-#endif
index 014e6a4..2d3fd1a 100644 (file)
@@ -1,6 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_mod_config.h"
 
 struct _E_Config_Dialog_Data
 {
diff --git a/src/modules/dropshadow/e_mod_config.h b/src/modules/dropshadow/e_mod_config.h
deleted file mode 100644 (file)
index 74d2cfc..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_MOD_CONFIG_H
-#define E_MOD_CONFIG_H
-#include "e_mod_main.h"
-E_Config_Dialog *e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__);
-#endif
-#endif
index 4615a27..d5396dc 100644 (file)
@@ -1,6 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_mod_config.h"
 
 /* i measure a mere 9% speedup using mmx for simd sums. :(
  * need to detect mmx capbale cpu's to enable this though
index 8934772..9c4e547 100644 (file)
@@ -109,7 +109,7 @@ EAPI int   e_modapi_info     (E_Module *m);
 
 void  _dropshadow_cb_config_updated(void *data);
 
-
+E_Config_Dialog *e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__);
 /**
  * @addtogroup Optional_Look
  * @{
index c67714b..6f4de89 100644 (file)
@@ -1,6 +1,4 @@
-#include "e.h"
 #include "e_mod_main.h"
-#include "e_widget_filepreview.h"
 
 /* FIXME: fwin - the fm2 filemanager wrapped with a window and scrollframe.
  * primitive BUT enough to test generic dnd and fm stuff more easily. don't
diff --git a/src/modules/fileman/e_fwin.h b/src/modules/fileman/e_fwin.h
deleted file mode 100644 (file)
index 4b4518e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef E_TYPEDEFS
-
-#else
-#ifndef E_FWIN_H
-#define E_FWIN_H
-
-int  e_fwin_init          (void);
-int  e_fwin_shutdown      (void);
-void e_fwin_new           (E_Container *con, const char *dev, const char *path);
-void e_fwin_zone_new      (E_Zone *zone, void *path);
-void e_fwin_zone_shutdown (E_Zone *zone);
-void e_fwin_all_unsel     (void *data);
-void e_fwin_reload_all    (void);
-int  e_fwin_zone_find     (E_Zone *zone);
-
-Eina_Bool e_fwin_nav_init(void);
-Eina_Bool e_fwin_nav_shutdown(void);
-
-
-#endif
-#endif
index a6c9f4a..028d788 100644 (file)
@@ -1,4 +1,3 @@
-#include <e.h>
 #include "e_mod_main.h"
 
 typedef struct _Instance Instance;
index 6815598..ae5266b 100644 (file)
@@ -1,5 +1,4 @@
-#include "e.h"
-#include "e_int_config_mime_edit.h"
+#include "e_mod_main.h"
 
 typedef struct _Config_Glob Config_Glob;
 typedef struct _Config_Mime Config_Mime;
diff --git a/src/modules/fileman/e_int_config_mime.h b/src/modules/fileman/e_int_config_mime.h
deleted file mode 100644 (file)
index e97c518..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_MIME_H
-#define E_INT_CONFIG_MIME_H
-
-E_Config_Dialog *e_int_config_mime(E_Container *con, const char *params __UNUSED__);
-void e_int_config_mime_edit_done(void *data);
-
-#endif
-#endif
index bda57f4..caf55bf 100644 (file)
@@ -1,5 +1,4 @@
-#include "e.h"
-#include "e_int_config_mime.h"
+#include "e_mod_main.h"
 
 static void        *_create_data    (E_Config_Dialog *cfd);
 static void         _fill_data      (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
diff --git a/src/modules/fileman/e_int_config_mime_edit.h b/src/modules/fileman/e_int_config_mime_edit.h
deleted file mode 100644 (file)
index 5d7e300..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_MIME_EDIT_H
-#define E_INT_CONFIG_MIME_EDIT_H
-
-E_Config_Dialog *e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2);
-
-#endif
-#endif
index 23a95c4..46c6bfe 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_mod_main.h"
 #include "e_fm_device.h"
 
index 75eafab..6fbbe09 100644 (file)
@@ -1,6 +1,4 @@
-#include "e.h"
 #include "e_mod_main.h"
-#include "e_mod_dbus.h"
 
 static const char E_FILEMAN_BUS_NAME[] = "org.enlightenment.FileManager";
 static const char E_FILEMAN_INTERFACE[] = "org.enlightenment.FileManager";
diff --git a/src/modules/fileman/e_mod_dbus.h b/src/modules/fileman/e_mod_dbus.h
deleted file mode 100644 (file)
index 4db0e40..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef E_MOD_DBUS_H
-#define E_MOD_DBUS_H
-
-void e_fileman_dbus_init(void);
-void e_fileman_dbus_shutdown(void);
-
-#endif
index 069f86f..885d371 100644 (file)
@@ -1,7 +1,4 @@
-#include "e.h"
-#include "e_fm_device.h"
 #include "e_mod_main.h"
-#include "e_mod_dbus.h"
 
 /* actual module specifics */
 static void _e_mod_action_fileman_cb(E_Object   *obj,
index 6706fd7..31930be 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
+#include "e.h"
+
 /* Increment for Major Changes */
 #define MOD_CONFIG_FILE_EPOCH      0x0001
 /* Increment for Minor Changes (ie: user doesn't need a new config) */
@@ -9,16 +11,6 @@
 
 typedef struct _Config Config;
 
-#define E_TYPEDEFS                 1
-#include "e_fwin.h"
-#include "e_int_config_mime_edit.h"
-#include "e_int_config_mime.h"
-
-#undef E_TYPEDEFS
-#include "e_fwin.h"
-#include "e_int_config_mime_edit.h"
-#include "e_int_config_mime.h"
-
 typedef struct Fileman_Path
 {
    const char *dev, *path;
@@ -112,18 +104,30 @@ struct _Config
    Eina_List *paths; // Fileman_Path
 };
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int   e_modapi_shutdown(E_Module *m);
-EAPI int   e_modapi_save(E_Module *m);
-
 extern Config *fileman_config;
 Fileman_Path *e_mod_fileman_path_find(E_Zone *zone);
 
 E_Menu *e_mod_menu_add(E_Menu *m, const char *path);
 
 E_Config_Dialog *e_int_config_fileman(E_Container *con, const char *params __UNUSED__);
+E_Config_Dialog *e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2);
+E_Config_Dialog *e_int_config_mime(E_Container *con, const char *params __UNUSED__);
+void e_int_config_mime_edit_done(void *data);
+
+void e_fileman_dbus_init(void);
+void e_fileman_dbus_shutdown(void);
+
+int  e_fwin_init          (void);
+int  e_fwin_shutdown      (void);
+void e_fwin_new           (E_Container *con, const char *dev, const char *path);
+void e_fwin_zone_new      (E_Zone *zone, void *path);
+void e_fwin_zone_shutdown (E_Zone *zone);
+void e_fwin_all_unsel     (void *data);
+void e_fwin_reload_all    (void);
+int  e_fwin_zone_find     (E_Zone *zone);
+
+Eina_Bool e_fwin_nav_init(void);
+Eina_Bool e_fwin_nav_shutdown(void);
 
 /**
  * @addtogroup Optional_Fileman
index 0e362a3..10d049f 100644 (file)
@@ -1,6 +1,5 @@
-#include "e.h"
-#include "e_fm_device.h"
 #include "e_mod_main.h"
+#include "e_fm_device.h"
 
 static void _e_mod_menu_populate(void *d, E_Menu *m __UNUSED__, E_Menu_Item *mi);
 
index f45e190..4288ef3 100644 (file)
@@ -1,5 +1,16 @@
+/**
+ * @addtogroup Optional_Fileman
+ * @{
+ *
+ * @defgroup Module_Fileman_Opinfo File Manager Operation Information
+ *
+ * Shows information about file manager operations such as copy, move
+ * and delete.
+ *
+ * @}
+ */
+
 #include "e.h"
-#include "e_mod_main.h"
 
 typedef struct _Instance
 {
diff --git a/src/modules/fileman_opinfo/e_mod_main.h b/src/modules/fileman_opinfo/e_mod_main.h
deleted file mode 100644 (file)
index e495d8b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-/**
- * @addtogroup Optional_Fileman
- * @{
- *
- * @defgroup Module_Fileman_Opinfo File Manager Operation Information
- *
- * Shows information about file manager operations such as copy, move
- * and delete.
- *
- * @}
- */
-
-#endif
index 18409cd..3fba7f0 100644 (file)
@@ -1,7 +1,4 @@
-#include <e.h>
-#include "e_mod_main.h"
 #include "e_mod_gadman.h"
-#include "e_mod_config.h"
 
 struct _E_Config_Dialog_Data
 {
diff --git a/src/modules/gadman/e_mod_config.h b/src/modules/gadman/e_mod_config.h
deleted file mode 100644 (file)
index efa97a8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_MOD_CONFIG_H
-#define E_MOD_CONFIG_H
-
-E_Config_Dialog *_config_gadman_module(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index b734dfb..ce63a5b 100644 (file)
@@ -1,7 +1,4 @@
-#include <e.h>
-#include "e_mod_main.h"
 #include "e_mod_gadman.h"
-#include "e_mod_config.h"
 
 /* local protos */
 static Eina_Bool _e_gadman_reset_timer(void *d);
index 5c2d284..01af705 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_MOD_GADMAN_H
 #define E_MOD_GADMAN_H
 
+#include "e.h"
+
 #define DEFAULT_POS_X  0.1
 #define DEFAULT_POS_Y  0.1
 #define DEFAULT_SIZE_W 0.07
@@ -88,4 +90,17 @@ void             gadman_gadget_edit_end(void *data, Evas_Object *obj, const char
 void             gadman_gadgets_toggle(void);
 void             gadman_update_bg(void);
 Eina_Bool gadman_gadget_add_handler(void *d, int type, E_Event_Gadcon_Client_Add *ev);
+
+E_Config_Dialog *_config_gadman_module(E_Container *con, const char *params __UNUSED__);
+
+/**
+ * @addtogroup Optional_Gadgets
+ * @{
+ *
+ * @defgroup Module_Gadman Gadman (Gadget Manager)
+ *
+ * Manages @ref Optional_Gadgets on desktop or overlay.
+ *
+ * @}
+ */
 #endif
index 7d015ba..fd4403e 100644 (file)
@@ -1,7 +1,4 @@
-#include <e.h>
-#include "e_mod_main.h"
 #include "e_mod_gadman.h"
-#include "e_mod_config.h"
 
 /* local protos */
 static void _gadman_maug_cb(void *data, E_Menu *m, E_Menu_Item *mi);
diff --git a/src/modules/gadman/e_mod_main.h b/src/modules/gadman/e_mod_main.h
deleted file mode 100644 (file)
index cffb614..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
-/**
- * @addtogroup Optional_Gadgets
- * @{
- *
- * @defgroup Module_Gadman Gadman (Gadget Manager)
- *
- * Manages @ref Optional_Gadgets on desktop or overlay.
- *
- * @}
- */
-
-#endif
index 455b91b..ad4b80f 100644 (file)
@@ -1,5 +1,4 @@
 #include "e.h"
-#include "e_mod_main.h"
 
 typedef struct _Instance Instance;
 struct _Instance 
diff --git a/src/modules/illume-bluetooth/e_mod_main.h b/src/modules/illume-bluetooth/e_mod_main.h
deleted file mode 100644 (file)
index f415823..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-# define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
-#endif
index 4885db1..602d3ff 100644 (file)
@@ -1,5 +1,4 @@
 #include "e.h"
-#include "e_mod_main.h"
 
 typedef struct _Instance Instance;
 struct _Instance 
diff --git a/src/modules/illume-home-toggle/e_mod_main.h b/src/modules/illume-home-toggle/e_mod_main.h
deleted file mode 100644 (file)
index f884cc0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
-#endif
index 04c4f97..8951e42 100644 (file)
@@ -1,12 +1,6 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
 void il_home_win_cfg_update(void);
 
 #endif
index 5968926..61cdabb 100644 (file)
@@ -5,12 +5,6 @@
 #  include <E_Notification_Daemon.h>
 # endif
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
 extern const char *_ind_mod_dir;
 
 #endif
index b2d6611..ee5accd 100644 (file)
@@ -1,5 +1,4 @@
 #include "e.h"
-#include "e_mod_main.h"
 
 /* local structures */
 typedef struct _Instance Instance;
diff --git a/src/modules/illume-kbd-toggle/e_mod_main.h b/src/modules/illume-kbd-toggle/e_mod_main.h
deleted file mode 100644 (file)
index f884cc0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
-#endif
index fa25614..cb214b6 100644 (file)
@@ -1,12 +1,6 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
 EAPI void il_kbd_cfg_update(void);
 
 #endif
index b026965..575a435 100644 (file)
@@ -1,5 +1,4 @@
 #include "e.h"
-#include "e_mod_main.h"
 
 /* local structures */
 typedef struct _Instance Instance;
diff --git a/src/modules/illume-mode-toggle/e_mod_main.h b/src/modules/illume-mode-toggle/e_mod_main.h
deleted file mode 100644 (file)
index f884cc0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
-#endif
index 78ba225..c35ff2c 100644 (file)
@@ -1,12 +1,6 @@
 #ifndef E_MOD_MAIN_H
 # define E_MOD_MAIN_H
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
 extern const char *_sft_mod_dir;
 
 #endif
index d284eb5..96d21a6 100644 (file)
@@ -1,5 +1,5 @@
 #include "e_illume_private.h"
-#include "e_mod_config.h"
+#include "e_mod_main.h"
 
 /**
  * @addtogroup Module_Illume2
index b73e616..2562316 100644 (file)
@@ -1,8 +1,5 @@
 #include "e_illume_private.h"
-#include "e_mod_config.h"
-#include "e_mod_config_animation.h"
-#include "e_mod_config_windows.h"
-#include "e_mod_config_policy.h"
+#include "e_mod_main.h"
 
 /* local function prototypes */
 static void _e_mod_illume_config_free(void);
diff --git a/src/modules/illume2/e_mod_config.h b/src/modules/illume2/e_mod_config.h
deleted file mode 100644 (file)
index b88886d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef E_MOD_CONFIG_H
-# define E_MOD_CONFIG_H
-
-# define IL_CONFIG_MAJOR 0
-# define IL_CONFIG_MINOR 1
-
-int e_mod_illume_config_init(void);
-int e_mod_illume_config_shutdown(void);
-int e_mod_illume_config_save(void);
-
-#endif
index 95c0be7..b911e27 100644 (file)
@@ -1,5 +1,4 @@
 #include "e_illume_private.h"
-#include "e_mod_config_animation.h"
 
 /* local function prototypes */
 static void *_e_mod_illume_config_animation_create(E_Config_Dialog *cfd);
diff --git a/src/modules/illume2/e_mod_config_animation.h b/src/modules/illume2/e_mod_config_animation.h
deleted file mode 100644 (file)
index c8d6d23..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef E_MOD_CONFIG_ANIMATION_H
-# define E_MOD_CONFIG_ANIMATION_H
-
-void e_mod_illume_config_animation_show(E_Container *con, const char *params __UNUSED__);
-
-#endif
index 53b611c..0332e59 100644 (file)
@@ -1,5 +1,4 @@
 #include "e_illume_private.h"
-#include "e_mod_config_policy.h"
 
 /* local function prototypes */
 static void *_e_mod_illume_config_policy_create(E_Config_Dialog *cfd);
diff --git a/src/modules/illume2/e_mod_config_policy.h b/src/modules/illume2/e_mod_config_policy.h
deleted file mode 100644 (file)
index 46a4310..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef E_MOD_CONFIG_POLICY_H
-# define E_MOD_CONFIG_POLICY_H
-
-void e_mod_illume_config_policy_show(E_Container *con, const char *params __UNUSED__);
-
-#endif
index 1d266bc..e724588 100644 (file)
@@ -1,6 +1,5 @@
 #include "e_illume_private.h"
-#include "e_mod_config_windows.h"
-#include "e_mod_select_window.h"
+#include "e_mod_main.h"
 
 /* local function prototypes */
 static void *_e_mod_illume_config_windows_create(E_Config_Dialog *cfd);
diff --git a/src/modules/illume2/e_mod_config_windows.h b/src/modules/illume2/e_mod_config_windows.h
deleted file mode 100644 (file)
index 1d251ad..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef E_MOD_CONFIG_WINDOWS_H
-# define E_MOD_CONFIG_WINDOWS_H
-
-void e_mod_illume_config_windows_show(E_Container *con, const char *params __UNUSED__);
-
-#endif
index a01b574..8791f45 100644 (file)
@@ -1,6 +1,5 @@
 #include "e_illume_private.h"
-#include "e_mod_kbd.h"
-#include "e_mod_kbd_device.h"
+#include "e_mod_main.h"
 
 /* local function prototypes */
 static Eina_Bool _e_mod_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
diff --git a/src/modules/illume2/e_mod_kbd.h b/src/modules/illume2/e_mod_kbd.h
deleted file mode 100644 (file)
index 252f015..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef E_MOD_KBD_H
-# define E_MOD_KBD_H
-
-/* define keyboard object type */
-# define E_ILLUME_KBD_TYPE 0xE1b0988
-
-int e_mod_kbd_init(void);
-int e_mod_kbd_shutdown(void);
-
-E_Illume_Keyboard *e_mod_kbd_new(void);
-void e_mod_kbd_enable(void);
-void e_mod_kbd_disable(void);
-void e_mod_kbd_show(void);
-void e_mod_kbd_hide(void);
-void e_mod_kbd_toggle(void);
-void e_mod_kbd_fullscreen_set(E_Zone *zone, int fullscreen);
-void e_mod_kbd_layout_set(E_Illume_Keyboard_Layout layout);
-
-#endif
index e4638aa..a0f5565 100644 (file)
@@ -1,5 +1,5 @@
 #include "e_illume_private.h"
-#include "e_mod_kbd_device.h"
+#include "e_mod_main.h"
 
 /* local function prototypes */
 static void _e_mod_kbd_device_ignore_load(void);
diff --git a/src/modules/illume2/e_mod_kbd_device.h b/src/modules/illume2/e_mod_kbd_device.h
deleted file mode 100644 (file)
index 050603e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef E_MOD_KBD_DEVICE_H
-# define E_MOD_KBD_DEVICE_H
-
-void e_mod_kbd_device_init(void);
-void e_mod_kbd_device_shutdown(void);
-
-#endif
index fc1d016..52e4f80 100644 (file)
@@ -1,9 +1,5 @@
 #include "e_illume_private.h"
 #include "e_mod_main.h"
-#include "e_mod_config.h"
-#include "e_mod_policy.h"
-#include "e_mod_kbd.h"
-#include "e_mod_quickpanel.h"
 
 /* NB: Initially I had done this rewrite with eina_logging enabled, but it 
  * degraded performance so much that it was just not worth it. So now this 
index 50f271e..fd4580c 100644 (file)
@@ -1,11 +1,52 @@
 #ifndef E_MOD_MAIN_H
 # define E_MOD_MAIN_H
+# define IL_CONFIG_MAJOR 0
+# define IL_CONFIG_MINOR 1
+/* define keyboard object type */
+# define E_ILLUME_KBD_TYPE 0xE1b0988
+# define E_ILLUME_QP_TYPE 0xE1b0990
 
-EAPI extern E_Module_Api e_modapi;
+typedef enum _E_Illume_Select_Window_Type E_Illume_Select_Window_Type;
+enum _E_Illume_Select_Window_Type 
+{
+   E_ILLUME_SELECT_WINDOW_TYPE_HOME, 
+     E_ILLUME_SELECT_WINDOW_TYPE_VKBD, 
+     E_ILLUME_SELECT_WINDOW_TYPE_SOFTKEY, 
+     E_ILLUME_SELECT_WINDOW_TYPE_INDICATOR
+};
 
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
+void e_mod_illume_config_select_window(E_Illume_Select_Window_Type type);
+
+int e_mod_quickpanel_init(void);
+int e_mod_quickpanel_shutdown(void);
+
+E_Illume_Quickpanel *e_mod_quickpanel_new(E_Zone *zone);
+void e_mod_quickpanel_show(E_Illume_Quickpanel *qp);
+void e_mod_quickpanel_hide(E_Illume_Quickpanel *qp);
+
+int e_mod_kbd_init(void);
+int e_mod_kbd_shutdown(void);
+
+E_Illume_Keyboard *e_mod_kbd_new(void);
+void e_mod_kbd_enable(void);
+void e_mod_kbd_disable(void);
+void e_mod_kbd_show(void);
+void e_mod_kbd_hide(void);
+void e_mod_kbd_toggle(void);
+void e_mod_kbd_fullscreen_set(E_Zone *zone, int fullscreen);
+void e_mod_kbd_layout_set(E_Illume_Keyboard_Layout layout);
+
+int e_mod_illume_config_init(void);
+int e_mod_illume_config_shutdown(void);
+int e_mod_illume_config_save(void);
+
+void e_mod_illume_config_animation_show(E_Container *con, const char *params __UNUSED__);
+void e_mod_illume_config_policy_show(E_Container *con, const char *params __UNUSED__);
+void e_mod_illume_config_windows_show(E_Container *con, const char *params __UNUSED__);
+void e_mod_kbd_device_init(void);
+void e_mod_kbd_device_shutdown(void);
+int e_mod_policy_init(void);
+int e_mod_policy_shutdown(void);
 
 /**
  * @addtogroup Optional_Mobile
index c25301c..2e8e6cc 100644 (file)
@@ -1,5 +1,5 @@
 #include "e_illume_private.h"
-#include "e_mod_policy.h"
+#include "e_mod_main.h"
 
 /* local function prototypes */
 static char *_e_mod_policy_find(void);
diff --git a/src/modules/illume2/e_mod_policy.h b/src/modules/illume2/e_mod_policy.h
deleted file mode 100644 (file)
index 29b61e5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef E_MOD_POLICY_H
-# define E_MOD_POLICY_H
-
-int e_mod_policy_init(void);
-int e_mod_policy_shutdown(void);
-
-#endif
index 6316981..0458eab 100644 (file)
@@ -1,5 +1,5 @@
 #include "e_illume_private.h"
-#include "e_mod_quickpanel.h"
+#include "e_mod_main.h"
 
 /* local function prototypes */
 static Eina_Bool _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
diff --git a/src/modules/illume2/e_mod_quickpanel.h b/src/modules/illume2/e_mod_quickpanel.h
deleted file mode 100644 (file)
index b3eb3f1..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef E_MOD_QUICKPANEL_H
-# define E_MOD_QUICKPANEL_H
-
-# define E_ILLUME_QP_TYPE 0xE1b0990
-
-int e_mod_quickpanel_init(void);
-int e_mod_quickpanel_shutdown(void);
-
-E_Illume_Quickpanel *e_mod_quickpanel_new(E_Zone *zone);
-void e_mod_quickpanel_show(E_Illume_Quickpanel *qp);
-void e_mod_quickpanel_hide(E_Illume_Quickpanel *qp);
-
-#endif
index b06bf22..5695181 100644 (file)
@@ -1,5 +1,5 @@
 #include "e_illume_private.h"
-#include "e_mod_select_window.h"
+#include "e_mod_main.h"
 
 /* local function prototypes */
 static void *_e_mod_illume_config_select_window_create_data(E_Config_Dialog *cfd);
diff --git a/src/modules/illume2/e_mod_select_window.h b/src/modules/illume2/e_mod_select_window.h
deleted file mode 100644 (file)
index 4d55797..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef E_MOD_SELECT_WINDOW_H
-#define E_MOD_SELECT_WINDOW_H
-
-typedef enum _E_Illume_Select_Window_Type E_Illume_Select_Window_Type;
-enum _E_Illume_Select_Window_Type 
-{
-   E_ILLUME_SELECT_WINDOW_TYPE_HOME, 
-     E_ILLUME_SELECT_WINDOW_TYPE_VKBD, 
-     E_ILLUME_SELECT_WINDOW_TYPE_SOFTKEY, 
-     E_ILLUME_SELECT_WINDOW_TYPE_INDICATOR
-};
-
-void e_mod_illume_config_select_window(E_Illume_Select_Window_Type type);
-
-#endif
index ca74b33..d5320a2 100644 (file)
@@ -1,5 +1,14 @@
+/**
+ * @addtogroup Optional_Layouts
+ * @{
+ *
+ * @defgroup Module_Layout Layout Policy Enforcement
+ *
+ * Enforces window layout policies.
+ *
+ * @}
+ */
 #include "e.h"
-#include "e_mod_main.h"
 
 /***************************************************************************/
 /**/
diff --git a/src/modules/layout/e_mod_main.h b/src/modules/layout/e_mod_main.h
deleted file mode 100644 (file)
index 7496e17..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-/**
- * @addtogroup Optional_Layouts
- * @{
- *
- * @defgroup Module_Layout Layout Policy Enforcement
- *
- * Enforces window layout policies.
- *
- * @}
- */
-#endif
index c2f70e7..797ef00 100644 (file)
@@ -1,5 +1,4 @@
 #include "e_mod_main.h"
-#include "e_mod_system.h"
 #ifdef HAVE_ENOTIFY
 #include <E_Notify.h>
 #endif
index 09120b7..8320366 100644 (file)
@@ -1,9 +1,8 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#include "config.h"
+#include "e.h"
 #include "e_mod_system.h"
-#include <e.h>
 
 #define MOD_CONFIG_FILE_EPOCH 0x0000
 #define MOD_CONFIG_FILE_GENERATION 0x0004
index 9d7585a..7a401c4 100644 (file)
@@ -1,10 +1,7 @@
 #ifndef E_MOD_SYSTEM_H
 #define E_MOD_SYSTEM_H
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include <Evas.h>
+#include "e.h"
 
 typedef void E_Mixer_System;
 typedef void E_Mixer_Channel;
index 38d6cfe..ba916f3 100644 (file)
@@ -1,7 +1,6 @@
+#include "e_mod_system.h"
 #include <alsa/asoundlib.h>
 #include <poll.h>
-#include "e_mod_system.h"
-#include "e.h"
 
 struct e_mixer_callback_desc
 {
index 6fdb4d7..b776038 100644 (file)
@@ -1,9 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include "e_mod_system.h"
 #include "e_mod_main.h"
-#include <Ecore.h>
 #include "Pulse.h"
 
 //#define BAD_CH_MAPPING 1
index c64864e..7faa875 100644 (file)
@@ -3,12 +3,6 @@
 
 #include "e.h"
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
 /* sub-module initializers */
 void msgbus_lang_init(Eina_Array *ifaces);
 void msgbus_desktop_init(Eina_Array *ifaces);
index dea9bd8..1a3ff19 100644 (file)
@@ -1,6 +1,5 @@
 #include "e.h"
 #include "e_mod_main.h"
-#include "e_mod_config.h"
 #include "e_mod_physics.h"
 
 struct _E_Config_Dialog_Data
diff --git a/src/modules/physics/e_mod_config.h b/src/modules/physics/e_mod_config.h
deleted file mode 100644 (file)
index 248d3c6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_MOD_CONFIG_H
-#define E_MOD_CONFIG_H
-E_Config_Dialog *e_int_config_physics_module(E_Container       *con,
-                                          const char *params __UNUSED__);
-#endif
-#endif
index 99501d5..72f234e 100644 (file)
@@ -1,7 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
 #include "e_mod_physics.h"
-#include "e_mod_config.h"
 #include <EPhysics.h>
 
 /* module private routines */
index 7558e30..e2aaa07 100644 (file)
@@ -28,4 +28,6 @@ EAPI int   e_modapi_info(E_Module *m);
 void       _e_mod_config_new(E_Module *m);
 void       _e_mod_config_free(E_Module *m);
 
+E_Config_Dialog *e_int_config_physics_module(E_Container *con, const char *params __UNUSED__);
+
 #endif
index 142babc..513d1ac 100644 (file)
@@ -1,5 +1,14 @@
+/**
+ * @addtogroup Optional_Look
+ * @{
+ *
+ * @defgroup Module_Shot Screenshot
+ *
+ * Takes screen shots and can submit them to http://enlightenment.org
+ *
+ * @}
+ */
 #include "e.h"
-#include "e_mod_main.h"
 #include <time.h>
 
 static E_Module *shot_module = NULL;
diff --git a/src/modules/shot/e_mod_main.h b/src/modules/shot/e_mod_main.h
deleted file mode 100644 (file)
index fd7b153..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-/**
- * @addtogroup Optional_Look
- * @{
- *
- * @defgroup Module_Shot Screenshot
- *
- * Takes screen shots and can submit them to http://enlightenment.org
- *
- * @}
- */
-
-#endif
index 367ad32..5847f96 100644 (file)
@@ -1,5 +1,15 @@
+/**
+ * @addtogroup Optional_Gadgets
+ * @{
+ *
+ * @defgroup Module_Start Start Button
+ *
+ * Shows a "start here" button or icon.
+ *
+ * @}
+ */
+
 #include "e.h"
-#include "e_mod_main.h"
 
 /* gadcon requirements */
 static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
diff --git a/src/modules/start/e_mod_main.h b/src/modules/start/e_mod_main.h
deleted file mode 100644 (file)
index 617f7a4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-/**
- * @addtogroup Optional_Gadgets
- * @{
- *
- * @defgroup Module_Start Start Button
- *
- * Shows a "start here" button or icon.
- *
- * @}
- */
-#endif
diff --git a/src/modules/syscon/e_int_config_syscon.h b/src/modules/syscon/e_int_config_syscon.h
deleted file mode 100644 (file)
index d022cdd..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_SYSCON_H
-#define E_INT_CONFIG_SYSCON_H
-
-E_Config_Dialog *e_int_config_syscon(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index 96c05aa..eadbf1f 100644 (file)
@@ -1,17 +1,13 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-#include "e_syscon.h"
-#include "e_int_config_syscon.h"
+int e_syscon_init(void);
+int e_syscon_shutdown(void);
 
-#undef E_TYPEDEFS
-#include "e_syscon.h"
-#include "e_int_config_syscon.h"
+int  e_syscon_show(E_Zone *zone, const char *defact);
+void e_syscon_hide(void);
 
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
+E_Config_Dialog *e_int_config_syscon(E_Container *con, const char *params __UNUSED__);
 
 void e_syscon_gadget_init(E_Module *m);
 void e_syscon_gadget_shutdown(void);
diff --git a/src/modules/syscon/e_syscon.h b/src/modules/syscon/e_syscon.h
deleted file mode 100644 (file)
index 6fe4237..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef E_TYPEDEFS
-
-#else
-#ifndef E_SYSCON_H
-#define E_SYSCON_H
-
-int e_syscon_init(void);
-int e_syscon_shutdown(void);
-
-int  e_syscon_show(E_Zone *zone, const char *defact);
-void e_syscon_hide(void);
-
-#endif
-#endif
index fa89f57..da493ee 100644 (file)
@@ -1,4 +1,17 @@
 /**
+ * @addtogroup Optional_Gadgets
+ * @{
+ *
+ * @defgroup Module_Systray Systray (System Icons Tray)
+ *
+ * Shows system icons in a box.
+ *
+ * The icons come from the FreeDesktop.Org systray specification.
+ *
+ * @see http://standards.freedesktop.org/systemtray-spec/systemtray-spec-latest.html
+ * @}
+ */
+/**
  * systray implementation following freedesktop.org specification.
  *
  * @see: http://standards.freedesktop.org/systemtray-spec/latest/
@@ -10,7 +23,6 @@
  */
 
 #include "e.h"
-#include "e_mod_main.h"
 
 #define RETRY_TIMEOUT                     2.0
 
diff --git a/src/modules/systray/e_mod_main.h b/src/modules/systray/e_mod_main.h
deleted file mode 100644 (file)
index 490eb2e..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int   e_modapi_shutdown(E_Module *m);
-EAPI int   e_modapi_save(E_Module *m);
-
-/**
- * @addtogroup Optional_Gadgets
- * @{
- *
- * @defgroup Module_Systray Systray (System Icons Tray)
- *
- * Shows system icons in a box.
- *
- * The icons come from the FreeDesktop.Org systray specification.
- *
- * @see http://standards.freedesktop.org/systemtray-spec/systemtray-spec-latest.html
- * @}
- */
-#endif
index c3ea604..bdff1a2 100644 (file)
@@ -1,13 +1,30 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
+#include "e.h"
+
 #ifdef HAVE_EEZE
 # include <Eeze.h>
 #else
 # include <E_Hal.h>
 #endif
 
-#include "e_mod_main_private.h"
+
+typedef enum _Sensor_Type
+{
+   SENSOR_TYPE_NONE,
+   SENSOR_TYPE_FREEBSD,
+   SENSOR_TYPE_OPENBSD,
+   SENSOR_TYPE_OMNIBOOK,
+   SENSOR_TYPE_LINUX_MACMINI,
+   SENSOR_TYPE_LINUX_I2C,
+   SENSOR_TYPE_LINUX_ACPI,
+   SENSOR_TYPE_LINUX_PCI,
+   SENSOR_TYPE_LINUX_PBOOK,
+   SENSOR_TYPE_LINUX_INTELCORETEMP,
+   SENSOR_TYPE_LINUX_THINKPAD,
+   SENSOR_TYPE_LINUX_SYS
+} Sensor_Type;
 
 typedef struct _Config Config;
 typedef struct _Config_Face Config_Face;
diff --git a/src/modules/temperature/e_mod_main_private.h b/src/modules/temperature/e_mod_main_private.h
deleted file mode 100644 (file)
index 232859a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef E_MOD_MAIN_PRIVATE_H
-#define E_MOD_MAIN_PRIVATE_H
-
-typedef enum _Sensor_Type
-{
-   SENSOR_TYPE_NONE,
-   SENSOR_TYPE_FREEBSD,
-   SENSOR_TYPE_OPENBSD,
-   SENSOR_TYPE_OMNIBOOK,
-   SENSOR_TYPE_LINUX_MACMINI,
-   SENSOR_TYPE_LINUX_I2C,
-   SENSOR_TYPE_LINUX_ACPI,
-   SENSOR_TYPE_LINUX_PCI,
-   SENSOR_TYPE_LINUX_PBOOK,
-   SENSOR_TYPE_LINUX_INTELCORETEMP,
-   SENSOR_TYPE_LINUX_THINKPAD,
-   SENSOR_TYPE_LINUX_SYS
-} Sensor_Type;
-
-#endif
index 7a9d00c..5ec638b 100644 (file)
@@ -1,6 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -22,8 +19,7 @@
 #include <Eina.h>
 #include <Ecore.h>
 #include <Ecore_File.h>
-
-#include "e_mod_main_private.h"
+#include "e_mod_main.h"
 
 static int sensor_type = SENSOR_TYPE_NONE;
 static char *sensor_name = NULL;
diff --git a/src/modules/winlist/e_int_config_winlist.h b/src/modules/winlist/e_int_config_winlist.h
deleted file mode 100644 (file)
index 5461e57..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_WINLIST_H
-#define E_INT_CONFIG_WINLIST_H
-
-E_Config_Dialog *e_int_config_winlist(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
index d1920c2..f5c2592 100644 (file)
@@ -1,22 +1,11 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
 #include "e_winlist.h"
-#include "e_int_config_winlist.h"
-
-#undef E_TYPEDEFS
-#include "e_winlist.h"
-#include "e_int_config_winlist.h"
 
 extern const char *_winlist_act;
 extern E_Action *_act_winlist;
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
+E_Config_Dialog *e_int_config_winlist(E_Container *con, const char *params __UNUSED__);
 /**
  * @addtogroup Optional_Control
  * @{
index 34f1372..44dee55 100644 (file)
@@ -1,5 +1,5 @@
 #include "e.h"
-#include "e_winlist.h"
+#include "e_mod_main.h"
 
 /* local subsystem functions */
 typedef struct _E_Winlist_Win E_Winlist_Win;
index ae7b614..a7f6344 100644 (file)
@@ -1,11 +1,6 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_WINLIST_H
 #define E_WINLIST_H
 
-#include "e_mod_main.h"
-
 int e_winlist_init(void);
 int e_winlist_shutdown(void);
 
@@ -26,4 +21,3 @@ void e_winlist_up(E_Zone *zone);
 void e_winlist_modifiers_set(int mod);
 
 #endif
-#endif
index f3a607c..7c5a5ad 100644 (file)
@@ -1,5 +1,4 @@
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 /* actual module specifics */
 E_Module *wiz_module = NULL;
diff --git a/src/modules/wizard/e_mod_main.h b/src/modules/wizard/e_mod_main.h
deleted file mode 100644 (file)
index 32c4f3a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_wizard.h"
-
-#undef E_TYPEDEFS
-#include "e_wizard.h"
-
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-extern E_Module *wiz_module;
-
-/**
- * @addtogroup Optional_Conf
- * @{
- *
- * @defgroup Module_Wizard Wizard
- *
- * Configures the whole Enlightenment in a nice walk-through wizard.
- *
- * Usually is presented on the first run of Enlightenment. The wizard
- * pages are configurable and should be extended by distributions that
- * want to ship Enlightenment as the default window manager.
- *
- * @}
- */
-#endif
index 48061c6..73b9e84 100644 (file)
@@ -1,5 +1,4 @@
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 static void     _e_wizard_next_eval(void);
 static E_Popup *_e_wizard_main_new(E_Zone *zone);
index 276f372..c2f01d7 100644 (file)
@@ -1,10 +1,10 @@
-#ifdef E_TYPEDEFS
+#ifndef E_WIZARD_H
 
-typedef struct _E_Wizard_Page E_Wizard_Page;
+#include "e.h"
 
-#else
-#ifndef E_WIZARD_H
-#define E_WIZARD_H
+extern E_Module *wiz_module;
+
+typedef struct _E_Wizard_Page E_Wizard_Page;
 
 typedef enum
 {
@@ -46,5 +46,18 @@ EAPI void e_wizard_labels_update(void);
 EAPI const char *e_wizard_dir_get(void);
 EAPI void e_wizard_xdg_desktops_reset(void);
 
-#endif
+/**
+ * @addtogroup Optional_Conf
+ * @{
+ *
+ * @defgroup Module_Wizard Wizard
+ *
+ * Configures the whole Enlightenment in a nice walk-through wizard.
+ *
+ * Usually is presented on the first run of Enlightenment. The wizard
+ * pages are configurable and should be extended by distributions that
+ * want to ship Enlightenment as the default window manager.
+ *
+ * @}
+ */
 #endif
index c7113f9..4727c20 100644 (file)
@@ -1,7 +1,6 @@
 /* Splash Screen */
 
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 static Ecore_Timer *_next_timer = NULL;
 
index b26025d..07cb754 100644 (file)
@@ -1,6 +1,5 @@
 /* Language chooser */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 typedef struct _E_Intl_Pair E_Intl_Pair;
 
index 51301f2..33ef9aa 100644 (file)
@@ -1,6 +1,5 @@
 /* Language chooser */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 typedef struct _Layout Layout;
 
index d0aeba8..9a6f470 100644 (file)
@@ -1,6 +1,5 @@
 /* Profile chooser */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 static const char *profile = NULL;
 static Evas_Object *textblock = NULL;
index 55f5c68..7346f8b 100644 (file)
@@ -1,6 +1,5 @@
 /* Menu setup */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 /*
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
index b3163c1..71dd1fd 100644 (file)
@@ -1,6 +1,5 @@
 /* Extra desktop files setup */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 static Ecore_Timer *_next_timer = NULL;
 
index 1bc5027..bbe38d1 100644 (file)
@@ -1,6 +1,5 @@
 /* Ask about Scaling */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 static double scale = 1.0;
 static Eina_List *obs = NULL;
index 6577c98..be88361 100644 (file)
@@ -1,6 +1,5 @@
 /* Ask about focus mode */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 static int focus_mode = 1;
 /*
index 3c42795..a10f142 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup of default icon theme */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons)
index 00c4230..efb9ae2 100644 (file)
@@ -1,6 +1,5 @@
 /* Ibar setup */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons __UNUSED__)
index 133b599..343ef2e 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup if we need battery? */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 #ifdef __FreeBSD__
 # include <sys/ioctl.h>
index ecef00c..61dbe55 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup if we need cpufreq? */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 #ifdef __FreeBSD__
 #include <sys/types.h>
index fc7599a..44cef8c 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup if we need connman? */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 #ifdef HAVE_ECONNMAN
 #include <E_DBus.h>
 #endif
index 69e7379..c26dfc5 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup if we need temperature? */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 #ifdef __FreeBSD__
 # include <sys/types.h>
index 71a16b2..a37b82d 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup if we need backlight? */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 /*
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
index c0d7de5..fc3f3ad 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup if we need mixer? */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 /*
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
index cbc68c1..937eb3f 100644 (file)
@@ -1,6 +1,5 @@
 /* Ask about compositing */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 #include "e_mod_comp_cfdata.h"
 
 #define ENGINE_SW 1
index e67f392..2f202f4 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup favorites and desktop links */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 /*
 EAPI int
 wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
index c73f78b..8d15dee 100644 (file)
@@ -1,6 +1,5 @@
 /* Ask about updates checking */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 static int do_up = 1;
 /*
index b081ff9..ac05789 100644 (file)
@@ -1,6 +1,5 @@
 /* Setup if we need connman? */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 static int do_tasks = 1;
 /*
index ddabaf3..cdfbd52 100644 (file)
@@ -1,6 +1,5 @@
 /* Delete previous copy of config profile and save new one */
-#include "e.h"
-#include "e_mod_main.h"
+#include "e_wizard.h"
 
 #if 0
 EAPI int
index 4b5785a..602c46c 100644 (file)
@@ -1,5 +1,6 @@
 #include "e.h"
-#include "e_mod_main.h"
+#include <wayland-client.h>
+#include "e_screenshooter_client_protocol.h"
 
 typedef struct _Instance Instance;
 struct _Instance
diff --git a/src/modules/wl_screenshot/e_mod_main.h b/src/modules/wl_screenshot/e_mod_main.h
deleted file mode 100644 (file)
index a397996..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef E_MOD_MAIN_H
-# define E_MOD_MAIN_H
-
-# include <wayland-client.h>
-# include "e_screenshooter_client_protocol.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
-#endif
index b43cbdc..ea5ff0c 100644 (file)
 
 # include <wayland-server.h>
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init(E_Module *m);
-EAPI int e_modapi_shutdown(E_Module *m);
-EAPI int e_modapi_save(E_Module *m);
-
 #endif
index a211e22..bfeefd1 100644 (file)
@@ -16,12 +16,6 @@ typedef struct _Xkb
 
 /* Prototypes */
 
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void       *e_modapi_init(E_Module *m);
-EAPI int         e_modapi_shutdown(E_Module *m);
-EAPI int         e_modapi_save(E_Module *m);
-
 void             _xkb_update_icon(int);
 E_Config_Dialog *_xkb_cfg_dialog(E_Container *con, const char *params);