diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index eb4367d18..1faabbf96 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -146,3 +146,4 @@ #include "e_import_dialog.h" #include "e_import_config_dialog.h" #include "e_grab_dialog.h" +#include "e_widget_filepreview.h" diff --git a/src/modules/Makefile_backlight.am b/src/modules/Makefile_backlight.am index dcbfcb1c5..443fc5dc5 100644 --- a/src/modules/Makefile_backlight.am +++ b/src/modules/Makefile_backlight.am @@ -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) diff --git a/src/modules/Makefile_conf.am b/src/modules/Makefile_conf.am index 2c52a15f6..e51480218 100644 --- a/src/modules/Makefile_conf.am +++ b/src/modules/Makefile_conf.am @@ -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 diff --git a/src/modules/Makefile_conf_applications.am b/src/modules/Makefile_conf_applications.am index b5da34748..3c5f38093 100644 --- a/src/modules/Makefile_conf_applications.am +++ b/src/modules/Makefile_conf_applications.am @@ -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) diff --git a/src/modules/Makefile_conf_dialogs.am b/src/modules/Makefile_conf_dialogs.am index bc1539b81..61f5e11ec 100644 --- a/src/modules/Makefile_conf_dialogs.am +++ b/src/modules/Makefile_conf_dialogs.am @@ -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) diff --git a/src/modules/Makefile_conf_display.am b/src/modules/Makefile_conf_display.am index 5b2b62239..24db929b6 100644 --- a/src/modules/Makefile_conf_display.am +++ b/src/modules/Makefile_conf_display.am @@ -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) diff --git a/src/modules/Makefile_conf_edgebindings.am b/src/modules/Makefile_conf_edgebindings.am index b52bcf7dc..628acd4de 100644 --- a/src/modules/Makefile_conf_edgebindings.am +++ b/src/modules/Makefile_conf_edgebindings.am @@ -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) diff --git a/src/modules/Makefile_conf_interaction.am b/src/modules/Makefile_conf_interaction.am index 676ad0816..120a7205c 100644 --- a/src/modules/Makefile_conf_interaction.am +++ b/src/modules/Makefile_conf_interaction.am @@ -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) diff --git a/src/modules/Makefile_conf_intl.am b/src/modules/Makefile_conf_intl.am index bf405ac72..d260a2b3b 100644 --- a/src/modules/Makefile_conf_intl.am +++ b/src/modules/Makefile_conf_intl.am @@ -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) diff --git a/src/modules/Makefile_conf_keybindings.am b/src/modules/Makefile_conf_keybindings.am index 9cb9eaaaa..473ec0b65 100644 --- a/src/modules/Makefile_conf_keybindings.am +++ b/src/modules/Makefile_conf_keybindings.am @@ -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) diff --git a/src/modules/Makefile_conf_menus.am b/src/modules/Makefile_conf_menus.am index a244b6bab..2f41c6a30 100644 --- a/src/modules/Makefile_conf_menus.am +++ b/src/modules/Makefile_conf_menus.am @@ -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) diff --git a/src/modules/Makefile_conf_paths.am b/src/modules/Makefile_conf_paths.am index 224d8f6f0..47bd3ae61 100644 --- a/src/modules/Makefile_conf_paths.am +++ b/src/modules/Makefile_conf_paths.am @@ -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) diff --git a/src/modules/Makefile_conf_performance.am b/src/modules/Makefile_conf_performance.am index a189410db..e9e09c1fa 100644 --- a/src/modules/Makefile_conf_performance.am +++ b/src/modules/Makefile_conf_performance.am @@ -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) diff --git a/src/modules/Makefile_conf_randr.am b/src/modules/Makefile_conf_randr.am index d36d49d67..422703156 100644 --- a/src/modules/Makefile_conf_randr.am +++ b/src/modules/Makefile_conf_randr.am @@ -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 \ diff --git a/src/modules/Makefile_conf_theme.am b/src/modules/Makefile_conf_theme.am index 60a860f9b..29cc21650 100644 --- a/src/modules/Makefile_conf_theme.am +++ b/src/modules/Makefile_conf_theme.am @@ -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 diff --git a/src/modules/Makefile_conf_wallpaper2.am b/src/modules/Makefile_conf_wallpaper2.am index baf5ad728..03fc2fbf7 100644 --- a/src/modules/Makefile_conf_wallpaper2.am +++ b/src/modules/Makefile_conf_wallpaper2.am @@ -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) diff --git a/src/modules/Makefile_conf_window_manipulation.am b/src/modules/Makefile_conf_window_manipulation.am index da93a9ff6..4af0864c0 100644 --- a/src/modules/Makefile_conf_window_manipulation.am +++ b/src/modules/Makefile_conf_window_manipulation.am @@ -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) diff --git a/src/modules/Makefile_conf_window_remembers.am b/src/modules/Makefile_conf_window_remembers.am index e2179539b..25e8184ad 100644 --- a/src/modules/Makefile_conf_window_remembers.am +++ b/src/modules/Makefile_conf_window_remembers.am @@ -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) diff --git a/src/modules/Makefile_connman.am b/src/modules/Makefile_connman.am index f9ed97e43..8ea73265d 100644 --- a/src/modules/Makefile_connman.am +++ b/src/modules/Makefile_connman.am @@ -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 diff --git a/src/modules/Makefile_dropshadow.am b/src/modules/Makefile_dropshadow.am index 912f97341..0cbe0598d 100644 --- a/src/modules/Makefile_dropshadow.am +++ b/src/modules/Makefile_dropshadow.am @@ -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 diff --git a/src/modules/Makefile_fileman.am b/src/modules/Makefile_fileman.am index cc77fb7f3..445acaf3e 100644 --- a/src/modules/Makefile_fileman.am +++ b/src/modules/Makefile_fileman.am @@ -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 diff --git a/src/modules/Makefile_fileman_opinfo.am b/src/modules/Makefile_fileman_opinfo.am index 13b747df8..edc333528 100644 --- a/src/modules/Makefile_fileman_opinfo.am +++ b/src/modules/Makefile_fileman_opinfo.am @@ -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) diff --git a/src/modules/Makefile_gadman.am b/src/modules/Makefile_gadman.am index 8ab3d4bae..ecbea4eaa 100644 --- a/src/modules/Makefile_gadman.am +++ b/src/modules/Makefile_gadman.am @@ -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 diff --git a/src/modules/Makefile_illume-bluetooth.am b/src/modules/Makefile_illume-bluetooth.am index 69d363f3f..e82589157 100644 --- a/src/modules/Makefile_illume-bluetooth.am +++ b/src/modules/Makefile_illume-bluetooth.am @@ -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) diff --git a/src/modules/Makefile_illume-home-toggle.am b/src/modules/Makefile_illume-home-toggle.am index a6add4220..f214a2f12 100644 --- a/src/modules/Makefile_illume-home-toggle.am +++ b/src/modules/Makefile_illume-home-toggle.am @@ -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) diff --git a/src/modules/Makefile_illume-kbd-toggle.am b/src/modules/Makefile_illume-kbd-toggle.am index b4613afbb..5b95c75ce 100644 --- a/src/modules/Makefile_illume-kbd-toggle.am +++ b/src/modules/Makefile_illume-kbd-toggle.am @@ -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) diff --git a/src/modules/Makefile_illume-mode-toggle.am b/src/modules/Makefile_illume-mode-toggle.am index 2b50438a8..71498e030 100644 --- a/src/modules/Makefile_illume-mode-toggle.am +++ b/src/modules/Makefile_illume-mode-toggle.am @@ -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) diff --git a/src/modules/Makefile_illume2.am b/src/modules/Makefile_illume2.am index 48b767232..4887bc5f7 100644 --- a/src/modules/Makefile_illume2.am +++ b/src/modules/Makefile_illume2.am @@ -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 diff --git a/src/modules/Makefile_physics.am b/src/modules/Makefile_physics.am index ddd707f6f..9873442c6 100644 --- a/src/modules/Makefile_physics.am +++ b/src/modules/Makefile_physics.am @@ -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 \ diff --git a/src/modules/Makefile_shot.am b/src/modules/Makefile_shot.am index 1844f9459..3ca467daf 100644 --- a/src/modules/Makefile_shot.am +++ b/src/modules/Makefile_shot.am @@ -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) diff --git a/src/modules/Makefile_start.am b/src/modules/Makefile_start.am index 37cf713ef..f63726b1d 100644 --- a/src/modules/Makefile_start.am +++ b/src/modules/Makefile_start.am @@ -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) diff --git a/src/modules/Makefile_syscon.am b/src/modules/Makefile_syscon.am index 7346ecb14..411a217e4 100644 --- a/src/modules/Makefile_syscon.am +++ b/src/modules/Makefile_syscon.am @@ -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 diff --git a/src/modules/Makefile_systray.am b/src/modules/Makefile_systray.am index 527fa1e03..0fd0ce6e7 100644 --- a/src/modules/Makefile_systray.am +++ b/src/modules/Makefile_systray.am @@ -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) diff --git a/src/modules/Makefile_temperature.am b/src/modules/Makefile_temperature.am index eac7adb13..4100747c6 100644 --- a/src/modules/Makefile_temperature.am +++ b/src/modules/Makefile_temperature.am @@ -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 diff --git a/src/modules/Makefile_winlist.am b/src/modules/Makefile_winlist.am index d4721f6b2..4b702dffb 100644 --- a/src/modules/Makefile_winlist.am +++ b/src/modules/Makefile_winlist.am @@ -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 diff --git a/src/modules/Makefile_wizard.am b/src/modules/Makefile_wizard.am index 579cb873e..b3e3a1af5 100644 --- a/src/modules/Makefile_wizard.am +++ b/src/modules/Makefile_wizard.am @@ -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 diff --git a/src/modules/access/e_mod_main.h b/src/modules/access/e_mod_main.h index 91d22f14f..443730504 100644 --- a/src/modules/access/e_mod_main.h +++ b/src/modules/access/e_mod_main.h @@ -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 diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c index 976286bd7..6e61f09a5 100644 --- a/src/modules/backlight/e_mod_main.c +++ b/src/modules/backlight/e_mod_main.c @@ -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 index caf1daae2..000000000 --- a/src/modules/backlight/e_mod_main.h +++ /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 index 03bebe3ba..000000000 --- a/src/modules/conf/e_conf.h +++ /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 diff --git a/src/modules/conf/e_mod_main.h b/src/modules/conf/e_mod_main.h index 57a2c7d1a..85ccec277 100644 --- a/src/modules/conf/e_mod_main.h +++ b/src/modules/conf/e_mod_main.h @@ -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 index 63b5c3722..000000000 --- a/src/modules/conf_applications/e_int_config_apps.h +++ /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 index 4c23f26ad..000000000 --- a/src/modules/conf_applications/e_int_config_apps_personal.h +++ /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 index 4ede68db2..000000000 --- a/src/modules/conf_applications/e_int_config_defapps.h +++ /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 index 981d756ee..000000000 --- a/src/modules/conf_applications/e_int_config_deskenv.h +++ /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 diff --git a/src/modules/conf_applications/e_mod_main.h b/src/modules/conf_applications/e_mod_main.h index 976fdb39a..df851fdca 100644 --- a/src/modules/conf_applications/e_mod_main.h +++ b/src/modules/conf_applications/e_mod_main.h @@ -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 index 273df2f0f..000000000 --- a/src/modules/conf_dialogs/e_int_config_dialogs.h +++ /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 index ff18335f8..000000000 --- a/src/modules/conf_dialogs/e_int_config_profiles.h +++ /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 diff --git a/src/modules/conf_dialogs/e_mod_main.h b/src/modules/conf_dialogs/e_mod_main.h index 3a37dcad8..8265b5484 100644 --- a/src/modules/conf_dialogs/e_mod_main.h +++ b/src/modules/conf_dialogs/e_mod_main.h @@ -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 index d81092307..000000000 --- a/src/modules/conf_display/e_int_config_desk.h +++ /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 index 2e96817a9..000000000 --- a/src/modules/conf_display/e_int_config_desklock.h +++ /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 index 836aba718..000000000 --- a/src/modules/conf_display/e_int_config_desklock_fsel.h +++ /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 index 4c5d6c20f..000000000 --- a/src/modules/conf_display/e_int_config_desks.h +++ /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 index 9e31f328a..000000000 --- a/src/modules/conf_display/e_int_config_display.h +++ /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 index 5d3a0b790..000000000 --- a/src/modules/conf_display/e_int_config_dpms.h +++ /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 index 2f0ec8040..000000000 --- a/src/modules/conf_display/e_int_config_screensaver.h +++ /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 diff --git a/src/modules/conf_display/e_mod_main.h b/src/modules/conf_display/e_mod_main.h index 1069f0e1f..8e7fd01e5 100644 --- a/src/modules/conf_display/e_mod_main.h +++ b/src/modules/conf_display/e_mod_main.h @@ -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 index 56bd55980..000000000 --- a/src/modules/conf_edgebindings/e_int_config_edgebindings.h +++ /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 diff --git a/src/modules/conf_edgebindings/e_mod_main.h b/src/modules/conf_edgebindings/e_mod_main.h index 4a2fbe410..ffb2908e9 100644 --- a/src/modules/conf_edgebindings/e_mod_main.h +++ b/src/modules/conf_edgebindings/e_mod_main.h @@ -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 index 698afb076..000000000 --- a/src/modules/conf_interaction/e_int_config_interaction.h +++ /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 index 64dda048d..000000000 --- a/src/modules/conf_interaction/e_int_config_mouse.h +++ /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 diff --git a/src/modules/conf_interaction/e_mod_main.h b/src/modules/conf_interaction/e_mod_main.h index 2cf513a19..3851f50f9 100644 --- a/src/modules/conf_interaction/e_mod_main.h +++ b/src/modules/conf_interaction/e_mod_main.h @@ -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 diff --git a/src/modules/conf_intl/e_int_config_imc.c b/src/modules/conf_intl/e_int_config_imc.c index 5b8d60181..7949a87f0 100644 --- a/src/modules/conf_intl/e_int_config_imc.c +++ b/src/modules/conf_intl/e_int_config_imc.c @@ -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 index c05403794..000000000 --- a/src/modules/conf_intl/e_int_config_imc.h +++ /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 diff --git a/src/modules/conf_intl/e_int_config_imc_import.c b/src/modules/conf_intl/e_int_config_imc_import.c index a18074c1b..fa8d4ef98 100644 --- a/src/modules/conf_intl/e_int_config_imc_import.c +++ b/src/modules/conf_intl/e_int_config_imc_import.c @@ -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 index 975173449..000000000 --- a/src/modules/conf_intl/e_int_config_imc_import.h +++ /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 index f8b48fbb9..000000000 --- a/src/modules/conf_intl/e_int_config_intl.h +++ /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 diff --git a/src/modules/conf_intl/e_mod_main.h b/src/modules/conf_intl/e_mod_main.h index fd9c40f78..fa8657dc8 100644 --- a/src/modules/conf_intl/e_mod_main.h +++ b/src/modules/conf_intl/e_mod_main.h @@ -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 index 2760c2c95..000000000 --- a/src/modules/conf_keybindings/e_int_config_acpibindings.h +++ /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 index 0af90e27c..000000000 --- a/src/modules/conf_keybindings/e_int_config_keybindings.h +++ /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 index 1593a1bd0..000000000 --- a/src/modules/conf_keybindings/e_int_config_mousebindings.h +++ /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 diff --git a/src/modules/conf_keybindings/e_mod_main.h b/src/modules/conf_keybindings/e_mod_main.h index f8d981e6f..cd9ac918b 100644 --- a/src/modules/conf_keybindings/e_mod_main.h +++ b/src/modules/conf_keybindings/e_mod_main.h @@ -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 index 1951ece58..000000000 --- a/src/modules/conf_menus/e_int_config_menus.h +++ /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 diff --git a/src/modules/conf_menus/e_mod_main.h b/src/modules/conf_menus/e_mod_main.h index 00e29695a..fd261160d 100644 --- a/src/modules/conf_menus/e_mod_main.h +++ b/src/modules/conf_menus/e_mod_main.h @@ -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 index 8b4f859f6..000000000 --- a/src/modules/conf_paths/e_int_config_env.h +++ /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 index ae25a919a..000000000 --- a/src/modules/conf_paths/e_int_config_paths.h +++ /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 diff --git a/src/modules/conf_paths/e_mod_main.h b/src/modules/conf_paths/e_mod_main.h index 69e45edec..3d2c518b3 100644 --- a/src/modules/conf_paths/e_mod_main.h +++ b/src/modules/conf_paths/e_mod_main.h @@ -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 index 2d9181ed5..000000000 --- a/src/modules/conf_performance/e_int_config_engine.h +++ /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 index 2efbe47e1..000000000 --- a/src/modules/conf_performance/e_int_config_performance.h +++ /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 index 1733a833d..000000000 --- a/src/modules/conf_performance/e_int_config_powermanagement.h +++ /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 diff --git a/src/modules/conf_performance/e_mod_main.h b/src/modules/conf_performance/e_mod_main.h index 76d7d1f2e..6394e39ae 100644 --- a/src/modules/conf_performance/e_mod_main.h +++ b/src/modules/conf_performance/e_mod_main.h @@ -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 diff --git a/src/modules/conf_randr/e_int_config_randr.c b/src/modules/conf_randr/e_int_config_randr.c index 39d8fdf9d..eb90877e3 100644 --- a/src/modules/conf_randr/e_int_config_randr.c +++ b/src/modules/conf_randr/e_int_config_randr.c @@ -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 index f7760c8a3..000000000 --- a/src/modules/conf_randr/e_int_config_randr.h +++ /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 diff --git a/src/modules/conf_randr/e_mod_main.c b/src/modules/conf_randr/e_mod_main.c index f1f70cec5..35ef94ad1 100644 --- a/src/modules/conf_randr/e_mod_main.c +++ b/src/modules/conf_randr/e_mod_main.c @@ -1,6 +1,5 @@ #include "e.h" #include "e_mod_main.h" -#include "e_int_config_randr.h" const char *mod_dir = NULL; diff --git a/src/modules/conf_randr/e_mod_main.h b/src/modules/conf_randr/e_mod_main.h index 14c9f519c..e52877796 100644 --- a/src/modules/conf_randr/e_mod_main.h +++ b/src/modules/conf_randr/e_mod_main.h @@ -13,12 +13,7 @@ # 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; /** diff --git a/src/modules/conf_shelves/e_mod_main.h b/src/modules/conf_shelves/e_mod_main.h index 39ae28c0d..a97598a43 100644 --- a/src/modules/conf_shelves/e_mod_main.h +++ b/src/modules/conf_shelves/e_mod_main.h @@ -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 index 85499984f..000000000 --- a/src/modules/conf_theme/e_int_config_borders.h +++ /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 index 549e84125..000000000 --- a/src/modules/conf_theme/e_int_config_color_classes.h +++ /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 index 76eab7605..000000000 --- a/src/modules/conf_theme/e_int_config_fonts.h +++ /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 index 3393afa65..000000000 --- a/src/modules/conf_theme/e_int_config_scale.h +++ /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 index 429edecbb..000000000 --- a/src/modules/conf_theme/e_int_config_startup.h +++ /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 diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index a74990cd3..eb91658c3 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -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 index d38f9bcc7..000000000 --- a/src/modules/conf_theme/e_int_config_theme.h +++ /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 diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c index d97362f96..0b5544f50 100644 --- a/src/modules/conf_theme/e_int_config_theme_import.c +++ b/src/modules/conf_theme/e_int_config_theme_import.c @@ -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 index 84ff8c2f5..000000000 --- a/src/modules/conf_theme/e_int_config_theme_import.h +++ /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 index 6fbac25d6..000000000 --- a/src/modules/conf_theme/e_int_config_transitions.h +++ /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 index 3ec4a5710..000000000 --- a/src/modules/conf_theme/e_int_config_wallpaper.h +++ /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 diff --git a/src/modules/conf_theme/e_mod_main.h b/src/modules/conf_theme/e_mod_main.h index f3c9917fa..8b6990a33 100644 --- a/src/modules/conf_theme/e_mod_main.h +++ b/src/modules/conf_theme/e_mod_main.h @@ -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 index 7786f7793..000000000 --- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.h +++ /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 diff --git a/src/modules/conf_wallpaper2/e_mod_main.h b/src/modules/conf_wallpaper2/e_mod_main.h index 8eff7539d..87abfb1fe 100644 --- a/src/modules/conf_wallpaper2/e_mod_main.h +++ b/src/modules/conf_wallpaper2/e_mod_main.h @@ -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 index ae2339886..000000000 --- a/src/modules/conf_window_manipulation/e_int_config_clientlist.h +++ /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 index 53d455305..000000000 --- a/src/modules/conf_window_manipulation/e_int_config_focus.h +++ /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 index 070348f2e..000000000 --- a/src/modules/conf_window_manipulation/e_int_config_window_display.h +++ /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 index 7fdc80122..000000000 --- a/src/modules/conf_window_manipulation/e_int_config_window_manip.h +++ /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 diff --git a/src/modules/conf_window_manipulation/e_mod_main.h b/src/modules/conf_window_manipulation/e_mod_main.h index 3dccdbe8e..3a80c3151 100644 --- a/src/modules/conf_window_manipulation/e_mod_main.h +++ b/src/modules/conf_window_manipulation/e_mod_main.h @@ -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 index 244c73442..000000000 --- a/src/modules/conf_window_remembers/e_int_config_remembers.h +++ /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 diff --git a/src/modules/conf_window_remembers/e_mod_main.h b/src/modules/conf_window_remembers/e_mod_main.h index bbf6d7910..5d04cb1d3 100644 --- a/src/modules/conf_window_remembers/e_mod_main.h +++ b/src/modules/conf_window_remembers/e_mod_main.h @@ -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 * @{ diff --git a/src/modules/connman/E_Connman.h b/src/modules/connman/E_Connman.h index a57c17691..452bfe327 100644 --- a/src/modules/connman/E_Connman.h +++ b/src/modules/connman/E_Connman.h @@ -1,15 +1,8 @@ #ifndef E_CONNMAN_H #define E_CONNMAN_H +#include "e.h" #include -#include -#include - -#include -#include -#include - -#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 */ diff --git a/src/modules/connman/agent.c b/src/modules/connman/agent.c index dadff7c1c..5ef27b8f1 100644 --- a/src/modules/connman/agent.c +++ b/src/modules/connman/agent.c @@ -7,7 +7,6 @@ #include #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 index 17d388950..000000000 --- a/src/modules/connman/agent.h +++ /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 */ diff --git a/src/modules/connman/e_connman.c b/src/modules/connman/e_connman.c index 591e84ee1..5feaa3282 100644 --- a/src/modules/connman/e_connman.c +++ b/src/modules/connman/e_connman.c @@ -1,13 +1,4 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -#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" diff --git a/src/modules/connman/e_mod_main.h b/src/modules/connman/e_mod_main.h index 75cd6e257..5c5e427c5 100644 --- a/src/modules/connman/e_mod_main.h +++ b/src/modules/connman/e_mod_main.h @@ -1,12 +1,12 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -#include "config.h" #include -#include #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 index f2044c848..000000000 --- a/src/modules/connman/log.h +++ /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 diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c index 014e6a435..2d3fd1ad3 100644 --- a/src/modules/dropshadow/e_mod_config.c +++ b/src/modules/dropshadow/e_mod_config.c @@ -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 index 74d2cfc9b..000000000 --- a/src/modules/dropshadow/e_mod_config.h +++ /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 diff --git a/src/modules/dropshadow/e_mod_main.c b/src/modules/dropshadow/e_mod_main.c index 4615a2758..d5396dc03 100644 --- a/src/modules/dropshadow/e_mod_main.c +++ b/src/modules/dropshadow/e_mod_main.c @@ -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 diff --git a/src/modules/dropshadow/e_mod_main.h b/src/modules/dropshadow/e_mod_main.h index 893477233..9c4e547bd 100644 --- a/src/modules/dropshadow/e_mod_main.h +++ b/src/modules/dropshadow/e_mod_main.h @@ -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 * @{ diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index c67714b1a..6f4de89e3 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -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 index 4b4518ef0..000000000 --- a/src/modules/fileman/e_fwin.h +++ /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 diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c index a6c9f4adb..028d78823 100644 --- a/src/modules/fileman/e_fwin_nav.c +++ b/src/modules/fileman/e_fwin_nav.c @@ -1,4 +1,3 @@ -#include #include "e_mod_main.h" typedef struct _Instance Instance; diff --git a/src/modules/fileman/e_int_config_mime.c b/src/modules/fileman/e_int_config_mime.c index 68155986d..ae5266bd2 100644 --- a/src/modules/fileman/e_int_config_mime.c +++ b/src/modules/fileman/e_int_config_mime.c @@ -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 index e97c51874..000000000 --- a/src/modules/fileman/e_int_config_mime.h +++ /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 diff --git a/src/modules/fileman/e_int_config_mime_edit.c b/src/modules/fileman/e_int_config_mime_edit.c index bda57f4aa..caf55bfbe 100644 --- a/src/modules/fileman/e_int_config_mime_edit.c +++ b/src/modules/fileman/e_int_config_mime_edit.c @@ -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 index 5d7e30082..000000000 --- a/src/modules/fileman/e_int_config_mime_edit.h +++ /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 diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c index 23a95c42a..46c6bfe44 100644 --- a/src/modules/fileman/e_mod_config.c +++ b/src/modules/fileman/e_mod_config.c @@ -1,4 +1,3 @@ -#include "e.h" #include "e_mod_main.h" #include "e_fm_device.h" diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c index 75eafab10..6fbbe092b 100644 --- a/src/modules/fileman/e_mod_dbus.c +++ b/src/modules/fileman/e_mod_dbus.c @@ -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 index 4db0e40c5..000000000 --- a/src/modules/fileman/e_mod_dbus.h +++ /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 diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index 069f86f42..885d371b3 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -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, diff --git a/src/modules/fileman/e_mod_main.h b/src/modules/fileman/e_mod_main.h index 6706fd7d9..31930be53 100644 --- a/src/modules/fileman/e_mod_main.h +++ b/src/modules/fileman/e_mod_main.h @@ -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 diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c index 0e362a3d4..10d049fab 100644 --- a/src/modules/fileman/e_mod_menu.c +++ b/src/modules/fileman/e_mod_menu.c @@ -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); diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c index f45e19021..4288ef31d 100644 --- a/src/modules/fileman_opinfo/e_mod_main.c +++ b/src/modules/fileman_opinfo/e_mod_main.c @@ -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 index e495d8b7b..000000000 --- a/src/modules/fileman_opinfo/e_mod_main.h +++ /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 diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c index 18409cd75..3fba7f0f6 100644 --- a/src/modules/gadman/e_mod_config.c +++ b/src/modules/gadman/e_mod_config.c @@ -1,7 +1,4 @@ -#include -#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 index efa97a845..000000000 --- a/src/modules/gadman/e_mod_config.h +++ /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 diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index b734dfbec..ce63a5ba4 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -1,7 +1,4 @@ -#include -#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); diff --git a/src/modules/gadman/e_mod_gadman.h b/src/modules/gadman/e_mod_gadman.h index 5c2d2848f..01af70507 100644 --- a/src/modules/gadman/e_mod_gadman.h +++ b/src/modules/gadman/e_mod_gadman.h @@ -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 diff --git a/src/modules/gadman/e_mod_main.c b/src/modules/gadman/e_mod_main.c index 7d015ba22..fd4403e38 100644 --- a/src/modules/gadman/e_mod_main.c +++ b/src/modules/gadman/e_mod_main.c @@ -1,7 +1,4 @@ -#include -#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 index cffb61416..000000000 --- a/src/modules/gadman/e_mod_main.h +++ /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 diff --git a/src/modules/illume-bluetooth/e_mod_main.c b/src/modules/illume-bluetooth/e_mod_main.c index 455b91b28..ad4b80f5e 100644 --- a/src/modules/illume-bluetooth/e_mod_main.c +++ b/src/modules/illume-bluetooth/e_mod_main.c @@ -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 index f415823c6..000000000 --- a/src/modules/illume-bluetooth/e_mod_main.h +++ /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 diff --git a/src/modules/illume-home-toggle/e_mod_main.c b/src/modules/illume-home-toggle/e_mod_main.c index 4885db107..602d3ffaa 100644 --- a/src/modules/illume-home-toggle/e_mod_main.c +++ b/src/modules/illume-home-toggle/e_mod_main.c @@ -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 index f884cc0aa..000000000 --- a/src/modules/illume-home-toggle/e_mod_main.h +++ /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 diff --git a/src/modules/illume-home/e_mod_main.h b/src/modules/illume-home/e_mod_main.h index 04c4f9724..8951e4248 100644 --- a/src/modules/illume-home/e_mod_main.h +++ b/src/modules/illume-home/e_mod_main.h @@ -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 diff --git a/src/modules/illume-indicator/e_mod_main.h b/src/modules/illume-indicator/e_mod_main.h index 596892698..61cdabb76 100644 --- a/src/modules/illume-indicator/e_mod_main.h +++ b/src/modules/illume-indicator/e_mod_main.h @@ -5,12 +5,6 @@ # include # 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 diff --git a/src/modules/illume-kbd-toggle/e_mod_main.c b/src/modules/illume-kbd-toggle/e_mod_main.c index b2d6611c3..ee5accd51 100644 --- a/src/modules/illume-kbd-toggle/e_mod_main.c +++ b/src/modules/illume-kbd-toggle/e_mod_main.c @@ -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 index f884cc0aa..000000000 --- a/src/modules/illume-kbd-toggle/e_mod_main.h +++ /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 diff --git a/src/modules/illume-keyboard/e_mod_main.h b/src/modules/illume-keyboard/e_mod_main.h index fa2561413..cb214b625 100644 --- a/src/modules/illume-keyboard/e_mod_main.h +++ b/src/modules/illume-keyboard/e_mod_main.h @@ -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 diff --git a/src/modules/illume-mode-toggle/e_mod_main.c b/src/modules/illume-mode-toggle/e_mod_main.c index b026965b5..575a43549 100644 --- a/src/modules/illume-mode-toggle/e_mod_main.c +++ b/src/modules/illume-mode-toggle/e_mod_main.c @@ -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 index f884cc0aa..000000000 --- a/src/modules/illume-mode-toggle/e_mod_main.h +++ /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 diff --git a/src/modules/illume-softkey/e_mod_main.h b/src/modules/illume-softkey/e_mod_main.h index 78ba22502..c35ff2ca6 100644 --- a/src/modules/illume-softkey/e_mod_main.h +++ b/src/modules/illume-softkey/e_mod_main.h @@ -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 diff --git a/src/modules/illume2/e_illume.c b/src/modules/illume2/e_illume.c index d284eb5b9..96d21a667 100644 --- a/src/modules/illume2/e_illume.c +++ b/src/modules/illume2/e_illume.c @@ -1,5 +1,5 @@ #include "e_illume_private.h" -#include "e_mod_config.h" +#include "e_mod_main.h" /** * @addtogroup Module_Illume2 diff --git a/src/modules/illume2/e_mod_config.c b/src/modules/illume2/e_mod_config.c index b73e61618..25623168b 100644 --- a/src/modules/illume2/e_mod_config.c +++ b/src/modules/illume2/e_mod_config.c @@ -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 index b88886d00..000000000 --- a/src/modules/illume2/e_mod_config.h +++ /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 diff --git a/src/modules/illume2/e_mod_config_animation.c b/src/modules/illume2/e_mod_config_animation.c index 95c0be723..b911e27a5 100644 --- a/src/modules/illume2/e_mod_config_animation.c +++ b/src/modules/illume2/e_mod_config_animation.c @@ -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 index c8d6d230c..000000000 --- a/src/modules/illume2/e_mod_config_animation.h +++ /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 diff --git a/src/modules/illume2/e_mod_config_policy.c b/src/modules/illume2/e_mod_config_policy.c index 53b611c7b..0332e59ce 100644 --- a/src/modules/illume2/e_mod_config_policy.c +++ b/src/modules/illume2/e_mod_config_policy.c @@ -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 index 46a4310da..000000000 --- a/src/modules/illume2/e_mod_config_policy.h +++ /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 diff --git a/src/modules/illume2/e_mod_config_windows.c b/src/modules/illume2/e_mod_config_windows.c index 1d266bc9b..e72458832 100644 --- a/src/modules/illume2/e_mod_config_windows.c +++ b/src/modules/illume2/e_mod_config_windows.c @@ -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 index 1d251ad8c..000000000 --- a/src/modules/illume2/e_mod_config_windows.h +++ /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 diff --git a/src/modules/illume2/e_mod_kbd.c b/src/modules/illume2/e_mod_kbd.c index a01b574e8..8791f4546 100644 --- a/src/modules/illume2/e_mod_kbd.c +++ b/src/modules/illume2/e_mod_kbd.c @@ -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 index 252f01522..000000000 --- a/src/modules/illume2/e_mod_kbd.h +++ /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 diff --git a/src/modules/illume2/e_mod_kbd_device.c b/src/modules/illume2/e_mod_kbd_device.c index e4638aa9e..a0f556528 100644 --- a/src/modules/illume2/e_mod_kbd_device.c +++ b/src/modules/illume2/e_mod_kbd_device.c @@ -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 index 050603e36..000000000 --- a/src/modules/illume2/e_mod_kbd_device.h +++ /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 diff --git a/src/modules/illume2/e_mod_main.c b/src/modules/illume2/e_mod_main.c index fc1d0161a..52e4f805e 100644 --- a/src/modules/illume2/e_mod_main.c +++ b/src/modules/illume2/e_mod_main.c @@ -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 diff --git a/src/modules/illume2/e_mod_main.h b/src/modules/illume2/e_mod_main.h index 50f271ec1..fd4580ce9 100644 --- a/src/modules/illume2/e_mod_main.h +++ b/src/modules/illume2/e_mod_main.h @@ -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 diff --git a/src/modules/illume2/e_mod_policy.c b/src/modules/illume2/e_mod_policy.c index c25301c73..2e8e6cc96 100644 --- a/src/modules/illume2/e_mod_policy.c +++ b/src/modules/illume2/e_mod_policy.c @@ -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 index 29b61e5b3..000000000 --- a/src/modules/illume2/e_mod_policy.h +++ /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 diff --git a/src/modules/illume2/e_mod_quickpanel.c b/src/modules/illume2/e_mod_quickpanel.c index 63169817a..0458eabf4 100644 --- a/src/modules/illume2/e_mod_quickpanel.c +++ b/src/modules/illume2/e_mod_quickpanel.c @@ -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 index b3eb3f15c..000000000 --- a/src/modules/illume2/e_mod_quickpanel.h +++ /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 diff --git a/src/modules/illume2/e_mod_select_window.c b/src/modules/illume2/e_mod_select_window.c index b06bf2266..569518113 100644 --- a/src/modules/illume2/e_mod_select_window.c +++ b/src/modules/illume2/e_mod_select_window.c @@ -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 index 4d5579705..000000000 --- a/src/modules/illume2/e_mod_select_window.h +++ /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 diff --git a/src/modules/layout/e_mod_main.c b/src/modules/layout/e_mod_main.c index ca74b3396..d5320a28a 100644 --- a/src/modules/layout/e_mod_main.c +++ b/src/modules/layout/e_mod_main.c @@ -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 index 7496e1722..000000000 --- a/src/modules/layout/e_mod_main.h +++ /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 diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index c2f70e71a..797ef004b 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -1,5 +1,4 @@ #include "e_mod_main.h" -#include "e_mod_system.h" #ifdef HAVE_ENOTIFY #include #endif diff --git a/src/modules/mixer/e_mod_main.h b/src/modules/mixer/e_mod_main.h index 09120b782..8320366ec 100644 --- a/src/modules/mixer/e_mod_main.h +++ b/src/modules/mixer/e_mod_main.h @@ -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 #define MOD_CONFIG_FILE_EPOCH 0x0000 #define MOD_CONFIG_FILE_GENERATION 0x0004 diff --git a/src/modules/mixer/e_mod_system.h b/src/modules/mixer/e_mod_system.h index 9d7585ab2..7a401c4c3 100644 --- a/src/modules/mixer/e_mod_system.h +++ b/src/modules/mixer/e_mod_system.h @@ -1,10 +1,7 @@ #ifndef E_MOD_SYSTEM_H #define E_MOD_SYSTEM_H -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include +#include "e.h" typedef void E_Mixer_System; typedef void E_Mixer_Channel; diff --git a/src/modules/mixer/sys_alsa.c b/src/modules/mixer/sys_alsa.c index 38d6cfe16..ba916f335 100644 --- a/src/modules/mixer/sys_alsa.c +++ b/src/modules/mixer/sys_alsa.c @@ -1,7 +1,6 @@ +#include "e_mod_system.h" #include #include -#include "e_mod_system.h" -#include "e.h" struct e_mixer_callback_desc { diff --git a/src/modules/mixer/sys_pulse.c b/src/modules/mixer/sys_pulse.c index 6fdb4d7f0..b77603806 100644 --- a/src/modules/mixer/sys_pulse.c +++ b/src/modules/mixer/sys_pulse.c @@ -1,9 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include "e_mod_system.h" #include "e_mod_main.h" -#include #include "Pulse.h" //#define BAD_CH_MAPPING 1 diff --git a/src/modules/msgbus/e_mod_main.h b/src/modules/msgbus/e_mod_main.h index c64864e07..7faa8750f 100644 --- a/src/modules/msgbus/e_mod_main.h +++ b/src/modules/msgbus/e_mod_main.h @@ -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); diff --git a/src/modules/physics/e_mod_config.c b/src/modules/physics/e_mod_config.c index dea9bd84d..1a3ff19d7 100644 --- a/src/modules/physics/e_mod_config.c +++ b/src/modules/physics/e_mod_config.c @@ -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 index 248d3c67e..000000000 --- a/src/modules/physics/e_mod_config.h +++ /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 diff --git a/src/modules/physics/e_mod_main.c b/src/modules/physics/e_mod_main.c index 99501d552..72f234eaf 100644 --- a/src/modules/physics/e_mod_main.c +++ b/src/modules/physics/e_mod_main.c @@ -1,7 +1,6 @@ #include "e.h" #include "e_mod_main.h" #include "e_mod_physics.h" -#include "e_mod_config.h" #include /* module private routines */ diff --git a/src/modules/physics/e_mod_main.h b/src/modules/physics/e_mod_main.h index 7558e3028..e2aaa0723 100644 --- a/src/modules/physics/e_mod_main.h +++ b/src/modules/physics/e_mod_main.h @@ -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 diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index 142babc91..513d1acbe 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -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 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 index fd7b153cd..000000000 --- a/src/modules/shot/e_mod_main.h +++ /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 diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c index 367ad32ce..5847f9695 100644 --- a/src/modules/start/e_mod_main.c +++ b/src/modules/start/e_mod_main.c @@ -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 index 617f7a425..000000000 --- a/src/modules/start/e_mod_main.h +++ /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 index d022cddb9..000000000 --- a/src/modules/syscon/e_int_config_syscon.h +++ /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 diff --git a/src/modules/syscon/e_mod_main.h b/src/modules/syscon/e_mod_main.h index 96c05aa09..eadbf1f64 100644 --- a/src/modules/syscon/e_mod_main.h +++ b/src/modules/syscon/e_mod_main.h @@ -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 index 6fe4237b9..000000000 --- a/src/modules/syscon/e_syscon.h +++ /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 diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c index fa89f57ab..da493ee01 100644 --- a/src/modules/systray/e_mod_main.c +++ b/src/modules/systray/e_mod_main.c @@ -1,3 +1,16 @@ +/** + * @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. * @@ -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 index 490eb2eb2..000000000 --- a/src/modules/systray/e_mod_main.h +++ /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 diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h index c3ea6049a..bdff1a2a2 100644 --- a/src/modules/temperature/e_mod_main.h +++ b/src/modules/temperature/e_mod_main.h @@ -1,13 +1,30 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#include "e.h" + #ifdef HAVE_EEZE # include #else # include #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 index 232859a9d..000000000 --- a/src/modules/temperature/e_mod_main_private.h +++ /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 diff --git a/src/modules/temperature/tempget.c b/src/modules/temperature/tempget.c index 7a9d00c21..5ec638bc3 100644 --- a/src/modules/temperature/tempget.c +++ b/src/modules/temperature/tempget.c @@ -1,6 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include #include #include @@ -22,8 +19,7 @@ #include #include #include - -#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 index 5461e57c6..000000000 --- a/src/modules/winlist/e_int_config_winlist.h +++ /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 diff --git a/src/modules/winlist/e_mod_main.h b/src/modules/winlist/e_mod_main.h index d1920c23e..f5c259288 100644 --- a/src/modules/winlist/e_mod_main.h +++ b/src/modules/winlist/e_mod_main.h @@ -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 * @{ diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c index 34f137287..44dee5567 100644 --- a/src/modules/winlist/e_winlist.c +++ b/src/modules/winlist/e_winlist.c @@ -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; diff --git a/src/modules/winlist/e_winlist.h b/src/modules/winlist/e_winlist.h index ae7b614e4..a7f634447 100644 --- a/src/modules/winlist/e_winlist.h +++ b/src/modules/winlist/e_winlist.h @@ -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 diff --git a/src/modules/wizard/e_mod_main.c b/src/modules/wizard/e_mod_main.c index f3a607c43..7c5a5ad17 100644 --- a/src/modules/wizard/e_mod_main.c +++ b/src/modules/wizard/e_mod_main.c @@ -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 index 32c4f3a1b..000000000 --- a/src/modules/wizard/e_mod_main.h +++ /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 diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c index 48061c664..73b9e84e4 100644 --- a/src/modules/wizard/e_wizard.c +++ b/src/modules/wizard/e_wizard.c @@ -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); diff --git a/src/modules/wizard/e_wizard.h b/src/modules/wizard/e_wizard.h index 276f372e2..c2f01d7a9 100644 --- a/src/modules/wizard/e_wizard.h +++ b/src/modules/wizard/e_wizard.h @@ -1,11 +1,11 @@ -#ifdef E_TYPEDEFS +#ifndef E_WIZARD_H + +#include "e.h" + +extern E_Module *wiz_module; typedef struct _E_Wizard_Page E_Wizard_Page; -#else -#ifndef E_WIZARD_H -#define E_WIZARD_H - typedef enum { E_WIZARD_PAGE_STATE_INIT, @@ -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 diff --git a/src/modules/wizard/page_000.c b/src/modules/wizard/page_000.c index c7113f9a1..4727c2078 100644 --- a/src/modules/wizard/page_000.c +++ b/src/modules/wizard/page_000.c @@ -1,7 +1,6 @@ /* Splash Screen */ -#include "e.h" -#include "e_mod_main.h" +#include "e_wizard.h" static Ecore_Timer *_next_timer = NULL; diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index b26025d3d..07cb754d0 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -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; diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c index 51301f21e..33ef9aa00 100644 --- a/src/modules/wizard/page_011.c +++ b/src/modules/wizard/page_011.c @@ -1,6 +1,5 @@ /* Language chooser */ -#include "e.h" -#include "e_mod_main.h" +#include "e_wizard.h" typedef struct _Layout Layout; diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c index d0aeba82a..9a6f47046 100644 --- a/src/modules/wizard/page_020.c +++ b/src/modules/wizard/page_020.c @@ -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; diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c index 55f5c68a2..7346f8b2d 100644 --- a/src/modules/wizard/page_030.c +++ b/src/modules/wizard/page_030.c @@ -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__) diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c index b3163c118..71dd1fdee 100644 --- a/src/modules/wizard/page_040.c +++ b/src/modules/wizard/page_040.c @@ -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; diff --git a/src/modules/wizard/page_050.c b/src/modules/wizard/page_050.c index 1bc5027ba..bbe38d17b 100644 --- a/src/modules/wizard/page_050.c +++ b/src/modules/wizard/page_050.c @@ -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; diff --git a/src/modules/wizard/page_060.c b/src/modules/wizard/page_060.c index 6577c988f..be8836199 100644 --- a/src/modules/wizard/page_060.c +++ b/src/modules/wizard/page_060.c @@ -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; /* diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c index 3c4279594..a10f14238 100644 --- a/src/modules/wizard/page_070.c +++ b/src/modules/wizard/page_070.c @@ -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) diff --git a/src/modules/wizard/page_080.c b/src/modules/wizard/page_080.c index 00c4230cf..efb9ae2f7 100644 --- a/src/modules/wizard/page_080.c +++ b/src/modules/wizard/page_080.c @@ -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__) diff --git a/src/modules/wizard/page_090.c b/src/modules/wizard/page_090.c index 133b59970..343ef2e02 100644 --- a/src/modules/wizard/page_090.c +++ b/src/modules/wizard/page_090.c @@ -1,6 +1,5 @@ /* Setup if we need battery? */ -#include "e.h" -#include "e_mod_main.h" +#include "e_wizard.h" #ifdef __FreeBSD__ # include diff --git a/src/modules/wizard/page_100.c b/src/modules/wizard/page_100.c index ecef00c60..61dbe553a 100644 --- a/src/modules/wizard/page_100.c +++ b/src/modules/wizard/page_100.c @@ -1,6 +1,5 @@ /* Setup if we need cpufreq? */ -#include "e.h" -#include "e_mod_main.h" +#include "e_wizard.h" #ifdef __FreeBSD__ #include diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c index fc7599ab1..44cef8c7a 100644 --- a/src/modules/wizard/page_110.c +++ b/src/modules/wizard/page_110.c @@ -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 #endif diff --git a/src/modules/wizard/page_120.c b/src/modules/wizard/page_120.c index 69e737912..c26dfc50f 100644 --- a/src/modules/wizard/page_120.c +++ b/src/modules/wizard/page_120.c @@ -1,6 +1,5 @@ /* Setup if we need temperature? */ -#include "e.h" -#include "e_mod_main.h" +#include "e_wizard.h" #ifdef __FreeBSD__ # include diff --git a/src/modules/wizard/page_130.c b/src/modules/wizard/page_130.c index 71a16b2a5..a37b82d40 100644 --- a/src/modules/wizard/page_130.c +++ b/src/modules/wizard/page_130.c @@ -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__) diff --git a/src/modules/wizard/page_140.c b/src/modules/wizard/page_140.c index c0d7de55e..fc3f3ad57 100644 --- a/src/modules/wizard/page_140.c +++ b/src/modules/wizard/page_140.c @@ -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__) diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c index cbc68c118..937eb3f3b 100644 --- a/src/modules/wizard/page_150.c +++ b/src/modules/wizard/page_150.c @@ -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 diff --git a/src/modules/wizard/page_160.c b/src/modules/wizard/page_160.c index e67f39287..2f202f440 100644 --- a/src/modules/wizard/page_160.c +++ b/src/modules/wizard/page_160.c @@ -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__) diff --git a/src/modules/wizard/page_170.c b/src/modules/wizard/page_170.c index c73f78b79..8d15dee1f 100644 --- a/src/modules/wizard/page_170.c +++ b/src/modules/wizard/page_170.c @@ -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; /* diff --git a/src/modules/wizard/page_180.c b/src/modules/wizard/page_180.c index b081ff9ca..ac057897a 100644 --- a/src/modules/wizard/page_180.c +++ b/src/modules/wizard/page_180.c @@ -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; /* diff --git a/src/modules/wizard/page_200.c b/src/modules/wizard/page_200.c index ddabaf374..cdfbd52f9 100644 --- a/src/modules/wizard/page_200.c +++ b/src/modules/wizard/page_200.c @@ -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 diff --git a/src/modules/wl_screenshot/e_mod_main.c b/src/modules/wl_screenshot/e_mod_main.c index 4b5785a32..602c46cb8 100644 --- a/src/modules/wl_screenshot/e_mod_main.c +++ b/src/modules/wl_screenshot/e_mod_main.c @@ -1,5 +1,6 @@ #include "e.h" -#include "e_mod_main.h" +#include +#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 index a3979968e..000000000 --- a/src/modules/wl_screenshot/e_mod_main.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef E_MOD_MAIN_H -# define E_MOD_MAIN_H - -# include -# 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 diff --git a/src/modules/wl_shell/e_mod_main.h b/src/modules/wl_shell/e_mod_main.h index b43cbdc62..ea5ff0c2c 100644 --- a/src/modules/wl_shell/e_mod_main.h +++ b/src/modules/wl_shell/e_mod_main.h @@ -12,10 +12,4 @@ # include -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 diff --git a/src/modules/xkbswitch/e_mod_main.h b/src/modules/xkbswitch/e_mod_main.h index a211e2267..bfeefd1a3 100644 --- a/src/modules/xkbswitch/e_mod_main.h +++ b/src/modules/xkbswitch/e_mod_main.h @@ -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);