diff options
Diffstat (limited to 'src')
25 files changed, 11 insertions, 504 deletions
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index aed8c81114..fb2c937374 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -159,15 +159,6 @@ if USE_MODULE_EVERYTHING SUBDIRS += everything endif -if USE_MODULE_EVERYTHING_AS_MODULES -SUBDIRS += \ - everything-files \ - everything-apps \ - everything-settings \ - everything-calc \ - everything-windows -endif - if USE_MODULE_SYSTRAY SUBDIRS += systray endif diff --git a/src/modules/everything-apps/Makefile.am b/src/modules/everything-apps/Makefile.am deleted file mode 100644 index 500c0f3bfd..0000000000 --- a/src/modules/everything-apps/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = everything-apps - -# data files for the module -filesdir = $(libdir)/enlightenment/modules/$(MODULE) -files_DATA = \ -e-module.edj module.desktop - -EXTRA_DIST = $(files_DATA) - -# the module .so file -INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/modules/$(MODULE) \ - -I$(top_srcdir)/src/bin \ - -I$(top_builddir)/src/bin \ - -I$(top_srcdir)/src/modules \ - -I$(top_srcdir)/src/modules/everything \ - @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = e_mod_main.c \ - e_mod_main.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - -uninstall: - rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) diff --git a/src/modules/everything-apps/e-module.edj b/src/modules/everything-apps/e-module.edj Binary files differdeleted file mode 100644 index 57abea3523..0000000000 --- a/src/modules/everything-apps/e-module.edj +++ /dev/null diff --git a/src/modules/everything-apps/e_mod_main.h b/src/modules/everything-apps/e_mod_main.h deleted file mode 100644 index 4adf2f1fbe..0000000000 --- a/src/modules/everything-apps/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/everything-apps/module.desktop.in b/src/modules/everything-apps/module.desktop.in deleted file mode 100644 index 4856322120..0000000000 --- a/src/modules/everything-apps/module.desktop.in +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Everything Applications -Name[ru]=Всё - Приложения -Name[de]=Everything - Anwendungen -Name[fr]=Omni - Applications -Name[it]=Everything - Applicazioni -Name[pt]=Everything - Aplicações -Name[tr]=Everything - Uygulamalar -Icon=e-module -Comment=Actions for your applications. -Comment[de]=Aktionen für Ihre Anwendungen. -Comment[ru]=Действия для приложений. -Comment[fr]=Actions sur les applications. -Comment[it]=Azioni con le applicazioni. -Comment[tr]=Uygulamalar için eylemler. -X-Enlightenment-ModuleType=launcher diff --git a/src/modules/everything-calc/Makefile.am b/src/modules/everything-calc/Makefile.am deleted file mode 100644 index 96a622c2f0..0000000000 --- a/src/modules/everything-calc/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = everything-calc - -# data files for the module -filesdir = $(libdir)/enlightenment/modules/$(MODULE) -files_DATA = \ -module.desktop - -EXTRA_DIST = $(files_DATA) - -# the module .so file -INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/modules/$(MODULE) \ - -I$(top_srcdir)/src/bin \ - -I$(top_builddir)/src/bin \ - -I$(top_srcdir)/src/modules \ - -I$(top_srcdir)/src/modules/everything \ - @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = evry_plug_calc.c \ - e_mod_main.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - -uninstall: - rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) diff --git a/src/modules/everything-calc/e_mod_main.h b/src/modules/everything-calc/e_mod_main.h deleted file mode 100644 index 4adf2f1fbe..0000000000 --- a/src/modules/everything-calc/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/everything-calc/module.desktop.in b/src/modules/everything-calc/module.desktop.in deleted file mode 100644 index e4aaf0dfe1..0000000000 --- a/src/modules/everything-calc/module.desktop.in +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Everything Calculator -Name[ru]=Всё - Калькулятор -Name[de]=Everything - Taschenrechner -Name[fr]=Omni - Calculatrice -Name[it]=Everything - Calcolatrice -Name[pt]=Everything - Calculadora -Name[tr]=Everything - Hesap Makinesi -Icon=accessories-calculator -Comment=Frontend for bc. Use '=' as trigger. -Comment[ru]=Интерфейс к утилите bc. Используйте '=' для запуска. -Comment[de]=Bedienung von bc. Verwenden Sie '=' als Auslöser. -Comment[fr]=Frontal pour bc, utilise « = » comme déclencheur. -Comment[it]=Frontend per bc, usa '=' come richiamo. -Comment[pt]=Interface gráfica para calculadora. Utiliza "=" como lançador -Comment[tr]=bc arayüzü. Tetikleyici olarak '=' kullanın. -X-Enlightenment-ModuleType=launcher diff --git a/src/modules/everything-files/Makefile.am b/src/modules/everything-files/Makefile.am deleted file mode 100644 index d719aa92b7..0000000000 --- a/src/modules/everything-files/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = everything-files - -# data files for the module -filesdir = $(libdir)/enlightenment/modules/$(MODULE) -files_DATA = \ -module.desktop - -EXTRA_DIST = $(files_DATA) - -# the module .so file -INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/modules/$(MODULE) \ - -I$(top_srcdir)/src/bin \ - -I$(top_builddir)/src/bin \ - -I$(top_srcdir)/src/modules \ - -I$(top_srcdir)/src/modules/everything \ - @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = evry_plug_files.c \ - e_mod_main.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - -uninstall: - rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) diff --git a/src/modules/everything-files/e_mod_main.h b/src/modules/everything-files/e_mod_main.h deleted file mode 100644 index 4adf2f1fbe..0000000000 --- a/src/modules/everything-files/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/everything-files/module.desktop.in b/src/modules/everything-files/module.desktop.in deleted file mode 100644 index 345e33104e..0000000000 --- a/src/modules/everything-files/module.desktop.in +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Everything Files -Name[ru]=Всё - Файлы -Name[de]=Everything - Dateien -Name[fr]=Omni - Fichiers -Name[it]=Everything - File -Name[pt]=Everything - Ficheiros -Name[tr]=Everything - Dosyalar -Icon=system-file-manager -Comment=File actions. -Comment[ru]=Действия для файлов. -Comment[de]=Aktionen auf Ihren Dateien. -Comment[fr]=Actions sur les fichiers. -Comment[it]=Azioni sui file. -Comment[pt]=Ações sobre os ficheiros -X-Enlightenment-ModuleType=launcher diff --git a/src/modules/everything-settings/Makefile.am b/src/modules/everything-settings/Makefile.am deleted file mode 100644 index 71c82c481b..0000000000 --- a/src/modules/everything-settings/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = everything-settings - -# data files for the module -filesdir = $(libdir)/enlightenment/modules/$(MODULE) -files_DATA = \ -module.desktop - -EXTRA_DIST = $(files_DATA) - -# the module .so file -INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/modules/$(MODULE) \ - -I$(top_srcdir)/src/bin \ - -I$(top_builddir)/src/bin \ - -I$(top_srcdir)/src/modules \ - -I$(top_srcdir)/src/modules/everything \ - @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = evry_plug_settings.c \ - e_mod_main.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - -uninstall: - rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) diff --git a/src/modules/everything-settings/e_mod_main.h b/src/modules/everything-settings/e_mod_main.h deleted file mode 100644 index 4adf2f1fbe..0000000000 --- a/src/modules/everything-settings/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/everything-settings/module.desktop.in b/src/modules/everything-settings/module.desktop.in deleted file mode 100644 index 0b4442449b..0000000000 --- a/src/modules/everything-settings/module.desktop.in +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Everything Settings -Name[ru]=Всё - Настройки -Name[de]=Everything - Einstellungen -Name[fr]=Omni - Configuration -Name[it]=Everything - Impostazioni -Name[pt]=Everything - Definições -Name[tr]=Everything - Ayarlar -Icon=configure -Comment=Quickly open e17 settings dialogs. -Comment[ru]=Быстрый доступ к диалогам настроек E17. -Comment[de]=Schnell den Einstellungsdialog für E17 öffnen. -Comment[fr]=Accès rapide aux paramètres de configuration de E17. -Comment[it]=Accede rapidamente alle finestre di dialogo per le impostazioni di e17. -Comment[pt]=Início rápido para as definições do E17 -Comment[tr]=e17 ayarlar penceresini hızlıca açar. -X-Enlightenment-ModuleType=launcher diff --git a/src/modules/everything-windows/Makefile.am b/src/modules/everything-windows/Makefile.am deleted file mode 100644 index 6f5658b747..0000000000 --- a/src/modules/everything-windows/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = everything-windows - -# data files for the module -filesdir = $(libdir)/enlightenment/modules/$(MODULE) -files_DATA = \ -module.desktop - -EXTRA_DIST = $(files_DATA) - -# the module .so file -INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/modules/$(MODULE) \ - -I$(top_srcdir)/src/bin \ - -I$(top_builddir)/src/bin \ - -I$(top_srcdir)/src/modules \ - -I$(top_srcdir)/src/modules/everything \ - @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = evry_plug_windows.c \ - e_mod_main.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - -uninstall: - rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) diff --git a/src/modules/everything-windows/e_mod_main.h b/src/modules/everything-windows/e_mod_main.h deleted file mode 100644 index 4adf2f1fbe..0000000000 --- a/src/modules/everything-windows/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/everything-windows/module.desktop.in b/src/modules/everything-windows/module.desktop.in deleted file mode 100644 index f0ef704d4f..0000000000 --- a/src/modules/everything-windows/module.desktop.in +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Everything Windows -Name[ru]=Всё - Окна -Name[de]=Everything - Fenster -Name[fr]=Omni - Fenêtres -Name[it]=Everything - Finestre -Name[pt]=Everything - Janelas -Name[tr]=Everything - Pencereler -Icon=preferences-system-windows -Comment=Window actions -Comment[ru]=Действия для окон. -Comment[de]=Fensteraktionen. -Comment[fr]=Actions sur les fenêtres. -Comment[it]=Azioni sulle finestre. -Comment[pt]=Ações sobre as janelas -Comment[tr]=Pencere eylemleri -X-Enlightenment-ModuleType=launcher diff --git a/src/modules/everything/Makefile.am b/src/modules/everything/Makefile.am index d15040a002..f355d06e94 100644 --- a/src/modules/everything/Makefile.am +++ b/src/modules/everything/Makefile.am @@ -39,16 +39,13 @@ module_la_SOURCES = $(EVRYHEADERS) \ evry_plug_text.c \ evry_plug_collection.c \ evry_gadget.c \ - md5.c - -if !USE_MODULE_EVERYTHING_AS_MODULES -module_la_SOURCES += \ - ../everything-apps/evry_plug_apps.c \ - ../everything-files/evry_plug_files.c \ - ../everything-windows/evry_plug_windows.c \ - ../everything-settings/evry_plug_settings.c \ - ../everything-calc/evry_plug_calc.c -endif + md5.c \ + md5.h \ + evry_plug_apps.c \ + evry_plug_files.c \ + evry_plug_windows.c \ + evry_plug_settings.c \ + evry_plug_calc.c module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index 55e82e7936..724d928fc3 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -1,6 +1,4 @@ #include "e_mod_main.h" -#include "../everything-apps/e_mod_main.h" - static void _e_mod_action_cb(E_Object *obj, const char *params); static void _e_mod_action_cb_edge(E_Object *obj, const char *params, E_Event_Zone_Edge *ev); @@ -136,13 +134,11 @@ e_modapi_init(E_Module *m) evry_history_init(); evry_plug_actions_init(); -#ifndef USE_MODULE_EVERYTHING_AS_MODULES evry_plug_apps_init(m); evry_plug_files_init(m); evry_plug_windows_init(m); evry_plug_settings_init(m); evry_plug_calc_init(m); -#endif e_datastore_set("evry_api", _api); EINA_LIST_FOREACH(e_datastore_get("evry_modules"), l, em) diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h index 7e999e24dc..3224d4f1c7 100644 --- a/src/modules/everything/e_mod_main.h +++ b/src/modules/everything/e_mod_main.h @@ -325,7 +325,6 @@ int evry_view_toggle(Evry_State *s, const char *trigger); int evry_gadget_init(void); void evry_gadget_shutdown(void); -#ifndef USE_MODULE_EVERYTHING_AS_MODULES Eina_Bool evry_plug_apps_init(E_Module *m); void evry_plug_apps_shutdown(void); void evry_plug_apps_save(void); @@ -345,7 +344,6 @@ void evry_plug_settings_save(void); Eina_Bool evry_plug_calc_init(E_Module *m); void evry_plug_calc_shutdown(void); void evry_plug_calc_save(void); -#endif Ecore_Event_Handler *evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data); diff --git a/src/modules/everything-apps/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c index f5c6cf492c..15aafb3318 100644 --- a/src/modules/everything-apps/evry_plug_apps.c +++ b/src/modules/everything/evry_plug_apps.c @@ -1,12 +1,10 @@ #include "e.h" -#include "e_mod_main.h" #include "evry_api.h" -#include "e_mod_main.h" #define MOD_CONFIG_FILE_EPOCH 0x0001 #define MOD_CONFIG_FILE_GENERATION 0x009d -#define MOD_CONFIG_FILE_VERSION \ - ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) +#define MOD_CONFIG_FILE_VERSION \ + ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) // FIXME clear cache on .desktop chage event @@ -1391,41 +1389,6 @@ evry_plug_apps_save(void) e_config_domain_save("module.everything-apps", conf_edd, _conf); } -#ifdef USE_MODULE_EVERYTHING_AS_MODULES - -EAPI E_Module_Api e_modapi = - { - E_MODULE_API_VERSION, - "everything-apps" - }; - -EAPI void * -e_modapi_init(E_Module *m) -{ - evry_plug_apps_init(m); - - e_module_delayed_set(m, 1); - - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - evry_plug_apps_shutdown(); - - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - evry_plug_apps_save(); - - return 1; -} -#endif - /***************************************************************************/ diff --git a/src/modules/everything-calc/evry_plug_calc.c b/src/modules/everything/evry_plug_calc.c index f3d178b2b8..ed1724e847 100644 --- a/src/modules/everything-calc/evry_plug_calc.c +++ b/src/modules/everything/evry_plug_calc.c @@ -1,5 +1,4 @@ #include "e.h" -#include "e_mod_main.h" #include "evry_api.h" // TODO - show error when input not parseable @@ -289,40 +288,6 @@ _plugins_shutdown(void) /***************************************************************************/ -#ifdef USE_MODULE_EVERYTHING_AS_MODULES - -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "everything-calc" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown); - - e_module_delayed_set(m, 1); - - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - EVRY_MODULE_FREE(evry_module); - - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} - -#else - Eina_Bool evry_plug_calc_init(E_Module *m) { @@ -339,4 +304,3 @@ evry_plug_calc_shutdown(void) void evry_plug_calc_save(void){} -#endif diff --git a/src/modules/everything-files/evry_plug_files.c b/src/modules/everything/evry_plug_files.c index 85fee487db..b714e2d5cb 100644 --- a/src/modules/everything-files/evry_plug_files.c +++ b/src/modules/everything/evry_plug_files.c @@ -5,14 +5,13 @@ FIXME */ #include "e.h" -#include "e_mod_main.h" #include "evry_api.h" #include <Efreet_Trash.h> #define MOD_CONFIG_FILE_EPOCH 0x0001 #define MOD_CONFIG_FILE_GENERATION 0x008d -#define MOD_CONFIG_FILE_VERSION \ - ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) +#define MOD_CONFIG_FILE_VERSION \ + ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) #define MAX_ITEMS 10 #define MAX_SHOWN 300 @@ -1643,46 +1642,6 @@ _conf_shutdown(void) /***************************************************************************/ -#ifdef USE_MODULE_EVERYTHING_AS_MODULES - -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "everything-files" -}; - - -EAPI void * -e_modapi_init(E_Module *m) -{ - _conf_init(m); - - EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown); - - e_module_delayed_set(m, 1); - - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - EVRY_MODULE_FREE(evry_module); - - _conf_shutdown(); - - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - e_config_domain_save("module.everything-files", conf_edd, _conf); - return 1; -} - -#else - Eina_Bool evry_plug_files_init(E_Module *m) { @@ -1706,4 +1665,3 @@ evry_plug_files_save(void) { e_config_domain_save("module.everything-files", conf_edd, _conf); } -#endif diff --git a/src/modules/everything-settings/evry_plug_settings.c b/src/modules/everything/evry_plug_settings.c index b78f750b45..e8be787203 100644 --- a/src/modules/everything-settings/evry_plug_settings.c +++ b/src/modules/everything/evry_plug_settings.c @@ -1,5 +1,4 @@ #include "e.h" -#include "e_mod_main.h" #include "evry_api.h" typedef struct _Plugin Plugin; @@ -218,40 +217,6 @@ _plugins_shutdown(void) /***************************************************************************/ -#ifdef USE_MODULE_EVERYTHING_AS_MODULES - -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "everything-settings" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown); - - e_module_delayed_set(m, 1); - - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - EVRY_MODULE_FREE(evry_module); - - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} - -#else - Eina_Bool evry_plug_settings_init(E_Module *m) { @@ -270,4 +235,3 @@ evry_plug_settings_shutdown(void) void evry_plug_settings_save(void){} -#endif diff --git a/src/modules/everything-windows/evry_plug_windows.c b/src/modules/everything/evry_plug_windows.c index 50d593a950..fe6f0b9063 100644 --- a/src/modules/everything-windows/evry_plug_windows.c +++ b/src/modules/everything/evry_plug_windows.c @@ -1,5 +1,4 @@ #include "e.h" -#include "e_mod_main.h" #include "evry_api.h" #define BORDER_SHOW 1 @@ -478,40 +477,6 @@ _plugins_shutdown(void) /***************************************************************************/ -#ifdef USE_MODULE_EVERYTHING_AS_MODULES - -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "everything-windows" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown); - - e_module_delayed_set(m, 1); - - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - EVRY_MODULE_FREE(evry_module); - - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} - -#else - Eina_Bool evry_plug_windows_init(E_Module *m) { @@ -528,4 +493,3 @@ evry_plug_windows_shutdown(void) void evry_plug_windows_save(void){} -#endif |