From 1a3f544f5442a0b5edb4ef00f236f379b18b0096 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 1 May 2011 03:09:10 +0000 Subject: [PATCH] more module merging. SVN revision: 59058 --- config/illume-home/e.src | 6 --- config/illume/e.src | 8 ---- config/minimalist/e.src | 8 ---- config/netbook/e.src | 8 ---- config/scaleable/e.src | 8 ---- config/standard/e.src | 8 ---- configure.ac | 3 -- po/POTFILES.in | 3 +- src/modules/Makefile.am | 4 -- src/modules/conf_dialogs/Makefile.am | 4 +- .../e_int_config_profiles.c | 0 .../e_int_config_profiles.h | 0 src/modules/conf_dialogs/e_mod_main.c | 3 ++ src/modules/conf_dialogs/e_mod_main.h | 2 + src/modules/conf_profiles/.cvsignore | 7 --- src/modules/conf_profiles/Makefile.am | 31 ------------ .../conf_profiles/e-module-conf_profiles.edj | Bin 14419 -> 0 bytes src/modules/conf_profiles/e_mod_main.c | 44 ------------------ src/modules/conf_profiles/e_mod_main.h | 16 ------- src/modules/conf_profiles/module.desktop.in | 34 -------------- 20 files changed, 9 insertions(+), 188 deletions(-) rename src/modules/{conf_profiles => conf_dialogs}/e_int_config_profiles.c (100%) rename src/modules/{conf_profiles => conf_dialogs}/e_int_config_profiles.h (100%) delete mode 100644 src/modules/conf_profiles/.cvsignore delete mode 100644 src/modules/conf_profiles/Makefile.am delete mode 100644 src/modules/conf_profiles/e-module-conf_profiles.edj delete mode 100644 src/modules/conf_profiles/e_mod_main.c delete mode 100644 src/modules/conf_profiles/e_mod_main.h delete mode 100644 src/modules/conf_profiles/module.desktop.in diff --git a/config/illume-home/e.src b/config/illume-home/e.src index 82f448a44..c63c97ed4 100644 --- a/config/illume-home/e.src +++ b/config/illume-home/e.src @@ -1198,12 +1198,6 @@ group "E_Config" struct { value "delayed" uchar: 1; value "priority" int: 0; } - group "E_Config_Module" struct { - value "name" string: "conf_profiles"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } group "E_Config_Module" struct { value "name" string: "conf_scale"; value "enabled" uchar: 1; diff --git a/config/illume/e.src b/config/illume/e.src index d73634083..0a0f3ee18 100644 --- a/config/illume/e.src +++ b/config/illume/e.src @@ -103,14 +103,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_profiles"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_performance"; diff --git a/config/minimalist/e.src b/config/minimalist/e.src index 86dd29cc4..b08bb3a30 100644 --- a/config/minimalist/e.src +++ b/config/minimalist/e.src @@ -185,14 +185,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_profiles"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_shelves"; diff --git a/config/netbook/e.src b/config/netbook/e.src index dd970b738..f9c60cf6f 100644 --- a/config/netbook/e.src +++ b/config/netbook/e.src @@ -217,14 +217,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_profiles"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_shelves"; diff --git a/config/scaleable/e.src b/config/scaleable/e.src index 1713817b7..4c371c215 100644 --- a/config/scaleable/e.src +++ b/config/scaleable/e.src @@ -120,14 +120,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_profiles"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_performance"; diff --git a/config/standard/e.src b/config/standard/e.src index 817afa7c6..78a312951 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -120,14 +120,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_profiles"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_performance"; diff --git a/configure.ac b/configure.ac index 32e2a2d99..aab2885c0 100644 --- a/configure.ac +++ b/configure.ac @@ -687,7 +687,6 @@ AC_E_OPTIONAL_MODULE([conf_mouse_cursor], true) AC_E_OPTIONAL_MODULE([conf_transitions], true) AC_E_OPTIONAL_MODULE([conf_startup], true) AC_E_OPTIONAL_MODULE([conf_intl], true) -AC_E_OPTIONAL_MODULE([conf_profiles], true) AC_E_OPTIONAL_MODULE([msgbus], true) AC_E_OPTIONAL_MODULE([conf_applications], true) AC_E_OPTIONAL_MODULE([conf_display], true) @@ -800,8 +799,6 @@ src/modules/conf_startup/Makefile src/modules/conf_startup/module.desktop src/modules/conf_intl/Makefile src/modules/conf_intl/module.desktop -src/modules/conf_profiles/Makefile -src/modules/conf_profiles/module.desktop src/modules/msgbus/Makefile src/modules/msgbus/module.desktop src/modules/conf_applications/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 26fa05664..6630b6364 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -137,6 +137,7 @@ src/modules/conf_borders/e_int_config_borders.c src/modules/conf_borders/e_mod_main.c src/modules/conf_colors/e_int_config_color_classes.c src/modules/conf_colors/e_mod_main.c +src/modules/conf_dialogs/e_int_config_profiles.c src/modules/conf_dialogs/e_int_config_dialogs.c src/modules/conf_dialogs/e_mod_main.c src/modules/conf_display/e_int_config_display.c @@ -172,8 +173,6 @@ src/modules/conf_paths/e_mod_main.c src/modules/conf_performance/e_int_config_engine.c src/modules/conf_performance/e_int_config_performance.c src/modules/conf_performance/e_mod_main.c -src/modules/conf_profiles/e_int_config_profiles.c -src/modules/conf_profiles/e_mod_main.c src/modules/conf_scale/e_int_config_scale.c src/modules/conf_scale/e_mod_main.c src/modules/conf_shelves/e_int_config_shelf.c diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index dabe4d43d..bc09a1969 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -102,10 +102,6 @@ if USE_MODULE_CONF_INTL SUBDIRS += conf_intl endif -if USE_MODULE_CONF_PROFILES -SUBDIRS += conf_profiles -endif - if USE_MODULE_MSGBUS SUBDIRS += msgbus endif diff --git a/src/modules/conf_dialogs/Makefile.am b/src/modules/conf_dialogs/Makefile.am index 5bf34e8d8..e70381000 100644 --- a/src/modules/conf_dialogs/Makefile.am +++ b/src/modules/conf_dialogs/Makefile.am @@ -21,7 +21,9 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_dialogs.c \ - e_int_config_dialogs.h + e_int_config_dialogs.h \ + e_int_config_profiles.c \ + e_int_config_profiles.h module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_dialogs/e_int_config_profiles.c similarity index 100% rename from src/modules/conf_profiles/e_int_config_profiles.c rename to src/modules/conf_dialogs/e_int_config_profiles.c diff --git a/src/modules/conf_profiles/e_int_config_profiles.h b/src/modules/conf_dialogs/e_int_config_profiles.h similarity index 100% rename from src/modules/conf_profiles/e_int_config_profiles.h rename to src/modules/conf_dialogs/e_int_config_profiles.h diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c index 9ba06947e..62d847963 100644 --- a/src/modules/conf_dialogs/e_mod_main.c +++ b/src/modules/conf_dialogs/e_mod_main.c @@ -16,6 +16,7 @@ e_modapi_init(E_Module *m) { e_configure_registry_category_add("settings", 80, _("Settings"), NULL, "preferences-system"); e_configure_registry_item_add("settings/dialogs", 10, _("Dialogs"), NULL, "preferences-system", e_int_config_dialogs); + e_configure_registry_item_add("settings/profiles", 50, _("Profiles"), NULL, "preferences-profiles", e_int_config_profiles); conf_module = m; e_module_delayed_set(m, 1); return m; @@ -25,7 +26,9 @@ EAPI int e_modapi_shutdown(E_Module *m __UNUSED__) { E_Config_Dialog *cfd; + while ((cfd = e_config_dialog_get("E", "settings/profiles"))) e_object_del(E_OBJECT(cfd)); while ((cfd = e_config_dialog_get("E", "settings/dialogs"))) e_object_del(E_OBJECT(cfd)); + e_configure_registry_item_del("settings/profiles"); e_configure_registry_item_del("settings/dialogs"); e_configure_registry_category_del("settings"); conf_module = NULL; diff --git a/src/modules/conf_dialogs/e_mod_main.h b/src/modules/conf_dialogs/e_mod_main.h index 0ecc3c335..e8df8445e 100644 --- a/src/modules/conf_dialogs/e_mod_main.h +++ b/src/modules/conf_dialogs/e_mod_main.h @@ -3,9 +3,11 @@ #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; diff --git a/src/modules/conf_profiles/.cvsignore b/src/modules/conf_profiles/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_profiles/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_profiles/Makefile.am b/src/modules/conf_profiles/Makefile.am deleted file mode 100644 index dd4b856d2..000000000 --- a/src/modules/conf_profiles/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_profiles - -# data files for the module -filesdir = $(libdir)/enlightenment/modules/$(MODULE) -files_DATA = \ -e-module-$(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 \ - @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = e_mod_main.c \ - e_mod_main.h \ - e_int_config_profiles.c \ - e_int_config_profiles.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/conf_profiles/e-module-conf_profiles.edj b/src/modules/conf_profiles/e-module-conf_profiles.edj deleted file mode 100644 index f6bb9c8c51b75b23ef43fb6fb6e3d9026b755339..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14419 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 Id41vk0X7s+lmGw# diff --git a/src/modules/conf_profiles/e_mod_main.c b/src/modules/conf_profiles/e_mod_main.c deleted file mode 100644 index b57b694f4..000000000 --- a/src/modules/conf_profiles/e_mod_main.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "e.h" -#include "e_mod_main.h" - -/* actual module specifics */ -static E_Module *conf_module = NULL; - -/* module setup */ -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "Settings - Profiles" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("settings", 80, _("Settings"), - NULL, "preferences-system"); - e_configure_registry_item_add("settings/profiles", 50, _("Profiles"), - NULL, "preferences-profiles", - e_int_config_profiles); - conf_module = m; - e_module_delayed_set(m, 1); - return m; -} - -EAPI int -e_modapi_shutdown(E_Module *m __UNUSED__) -{ - E_Config_Dialog *cfd; - - while ((cfd = e_config_dialog_get("E", "settings/profiles"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("settings/profiles"); - e_configure_registry_category_del("settings"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_profiles/e_mod_main.h b/src/modules/conf_profiles/e_mod_main.h deleted file mode 100644 index d4487f2e1..000000000 --- a/src/modules/conf_profiles/e_mod_main.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -#define E_TYPEDEFS 1 -#include "e_int_config_profiles.h" - -#undef E_TYPEDEFS -#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); - -#endif diff --git a/src/modules/conf_profiles/module.desktop.in b/src/modules/conf_profiles/module.desktop.in deleted file mode 100644 index 6b6730756..000000000 --- a/src/modules/conf_profiles/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Profiles -Name[ru]=Профили -Name[cs]=Profily -Name[de]= -Name[eo]=Profiloj -Name[es]=Perfiles -Name[fr]=Profils -Name[hu]=Profilok -Name[it]=Profili -Name[ja]= -Name[pt]=Perfis -Name[pt_BR]= -Name[tr]=Profiller -Name[zh_CN]= -Name[zh_TW]= -Icon=e-module-conf_profiles -Comment=Allows management of configuration profiles. -Comment[ru]=Позволяет управлять конфигурацией профилей. -Comment[cs]=Správa profilů. -Comment[de]= -Comment[eo]=Administri agordajn profilojn. -Comment[es]=Permite la administración de perfiles de configuración. -Comment[fr]=Gestionnaire des profils. -Comment[hu]=Lehetőséged van különböző profilok beállítására. -Comment[it]=Consente la gestione dei profili di configurazione. -Comment[ja]= -Comment[pt]=Permite-lhe configurar os perfis -Comment[pt_BR]= -Comment[tr]=Profillerin yapılandırmasını yönetir. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings