From 82ffbc59f39f2753d6cd37d6678b178a4388f9c5 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 30 Apr 2011 13:47:06 +0000 Subject: [PATCH] more conf module merges SVN revision: 59054 --- 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 | 5 +- src/modules/Makefile.am | 4 -- src/modules/conf_imc/.cvsignore | 7 --- src/modules/conf_imc/Makefile.am | 33 ------------- src/modules/conf_imc/e-module-conf_imc.edj | Bin 16042 -> 0 bytes src/modules/conf_imc/e_mod_main.c | 44 ------------------ src/modules/conf_imc/e_mod_main.h | 15 ------ src/modules/conf_imc/module.desktop.in | 34 -------------- src/modules/conf_intl/Makefile.am | 6 ++- .../e_int_config_imc.c | 0 .../e_int_config_imc.h | 0 .../e_int_config_imc_import.c | 0 .../e_int_config_imc_import.h | 0 src/modules/conf_intl/e_mod_main.c | 6 +++ src/modules/conf_intl/e_mod_main.h | 3 ++ 21 files changed, 16 insertions(+), 184 deletions(-) delete mode 100644 src/modules/conf_imc/.cvsignore delete mode 100644 src/modules/conf_imc/Makefile.am delete mode 100644 src/modules/conf_imc/e-module-conf_imc.edj delete mode 100644 src/modules/conf_imc/e_mod_main.c delete mode 100644 src/modules/conf_imc/e_mod_main.h delete mode 100644 src/modules/conf_imc/module.desktop.in rename src/modules/{conf_imc => conf_intl}/e_int_config_imc.c (100%) rename src/modules/{conf_imc => conf_intl}/e_int_config_imc.h (100%) rename src/modules/{conf_imc => conf_intl}/e_int_config_imc_import.c (100%) rename src/modules/{conf_imc => conf_intl}/e_int_config_imc_import.h (100%) diff --git a/config/illume/e.src b/config/illume/e.src index a6c57571b..74518871b 100644 --- a/config/illume/e.src +++ b/config/illume/e.src @@ -63,14 +63,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_imc"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_keybindings"; diff --git a/config/minimalist/e.src b/config/minimalist/e.src index 7d3c020ca..216ec82f7 100644 --- a/config/minimalist/e.src +++ b/config/minimalist/e.src @@ -129,14 +129,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_imc"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_intl"; diff --git a/config/netbook/e.src b/config/netbook/e.src index e7c310551..008ef974b 100644 --- a/config/netbook/e.src +++ b/config/netbook/e.src @@ -161,14 +161,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_imc"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_intl"; diff --git a/config/scaleable/e.src b/config/scaleable/e.src index 368c8d69a..00977ae92 100644 --- a/config/scaleable/e.src +++ b/config/scaleable/e.src @@ -200,14 +200,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_imc"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_icon_theme"; diff --git a/config/standard/e.src b/config/standard/e.src index 889227fb0..6e351da94 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -200,14 +200,6 @@ group "E_Config" struct { value "priority" int: 0; } } - group "modules" list { - group "E_Config_Module" struct { - value "name" string: "conf_imc"; - value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; - } - } group "modules" list { group "E_Config_Module" struct { value "name" string: "conf_icon_theme"; diff --git a/configure.ac b/configure.ac index 6d1da69f6..27e5fe7ef 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_imc], true) AC_E_OPTIONAL_MODULE([conf_profiles], true) AC_E_OPTIONAL_MODULE([msgbus], true) AC_E_OPTIONAL_MODULE([conf_engine], true) @@ -803,8 +802,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_imc/Makefile -src/modules/conf_imc/module.desktop src/modules/conf_profiles/Makefile src/modules/conf_profiles/module.desktop src/modules/msgbus/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 31cc9b65d..8095a73cb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -155,12 +155,11 @@ src/modules/conf_fonts/e_int_config_fonts.c src/modules/conf_fonts/e_mod_main.c src/modules/conf_icon_theme/e_int_config_icon_themes.c src/modules/conf_icon_theme/e_mod_main.c -src/modules/conf_imc/e_int_config_imc.c -src/modules/conf_imc/e_int_config_imc_import.c -src/modules/conf_imc/e_mod_main.c src/modules/conf_interaction/e_int_config_interaction.c src/modules/conf_interaction/e_int_config_mouse.c src/modules/conf_interaction/e_mod_main.c +src/modules/conf_intl/e_int_config_imc.c +src/modules/conf_intl/e_int_config_imc_import.c src/modules/conf_intl/e_int_config_intl.c src/modules/conf_intl/e_mod_main.c src/modules/conf_keybindings/e_int_config_keybindings.c diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index 1d2cdb8b6..ca332b27b 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_IMC -SUBDIRS += conf_imc -endif - if USE_MODULE_CONF_PROFILES SUBDIRS += conf_profiles endif diff --git a/src/modules/conf_imc/.cvsignore b/src/modules/conf_imc/.cvsignore deleted file mode 100644 index 06d064a84..000000000 --- a/src/modules/conf_imc/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la -module.desktop diff --git a/src/modules/conf_imc/Makefile.am b/src/modules/conf_imc/Makefile.am deleted file mode 100644 index b390a2f84..000000000 --- a/src/modules/conf_imc/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = conf_imc - -# 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_imc_import.c \ - e_int_config_imc_import.h \ - e_int_config_imc.c \ - e_int_config_imc.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_imc/e-module-conf_imc.edj b/src/modules/conf_imc/e-module-conf_imc.edj deleted file mode 100644 index e915b14593ac08be0bcb70f5ca81a7ac81294b39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16042 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 diff --git a/src/modules/conf_imc/e_mod_main.c b/src/modules/conf_imc/e_mod_main.c deleted file mode 100644 index a538b2d6d..000000000 --- a/src/modules/conf_imc/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 - Input Methods" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - e_configure_registry_category_add("language", 70, _("Language"), NULL, - "preferences-desktop-locale"); - e_configure_registry_item_add("language/input_method_settings", 20, - _("Input Method Settings"), NULL, - "preferences-imc", e_int_config_imc); - 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", "language/input_method_settings"))) - e_object_del(E_OBJECT(cfd)); - e_configure_registry_item_del("language/input_method_settings"); - e_configure_registry_category_del("language"); - conf_module = NULL; - return 1; -} - -EAPI int -e_modapi_save(E_Module *m __UNUSED__) -{ - return 1; -} diff --git a/src/modules/conf_imc/e_mod_main.h b/src/modules/conf_imc/e_mod_main.h deleted file mode 100644 index 4d8ab8b1e..000000000 --- a/src/modules/conf_imc/e_mod_main.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -#define E_TYPEDEFS 1 -#include "e_int_config_imc.h" -#undef E_TYPEDEFS -#include "e_int_config_imc.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_imc/module.desktop.in b/src/modules/conf_imc/module.desktop.in deleted file mode 100644 index 6efdf9cb8..000000000 --- a/src/modules/conf_imc/module.desktop.in +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Input Methods -Name[ru]=Методы ввода -Name[cs]=Vstupní metody -Name[de]= -Name[eo]=Tajpo-metodoj -Name[es]=Método de entrada -Name[fr]=Méthode de saisie -Name[hu]=Beviteli mód -Name[it]=Metodo di input -Name[ja]= -Name[pt]=Métodos de introdução -Name[pt_BR]= -Name[tr]=Girdi Metodları -Name[zh_CN]= -Name[zh_TW]= -Icon=e-module-conf_imc -Comment=Used to select an input method. -Comment[ru]=Используется для выбора метода ввода. -Comment[cs]=Pro výběr vstupní metody. -Comment[de]= -Comment[eo]=Elekti tajpo-metodon. -Comment[es]=Usado para elegir el método de entrada. -Comment[fr]=Permet de choisir une méthode de saisie. -Comment[hu]=Beviteli mód beállítások (input method). -Comment[it]=Usato per selezionare un metodo di input. -Comment[ja]= -Comment[pt]=Permite-lhe selecionar o método de introdução -Comment[pt_BR]= -Comment[tr]=Girdi metodu seçmekte kullanılır. -Comment[zh_CN]= -Comment[zh_TW]= -X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_intl/Makefile.am b/src/modules/conf_intl/Makefile.am index a8c8dffc9..ceaf1c55a 100644 --- a/src/modules/conf_intl/Makefile.am +++ b/src/modules/conf_intl/Makefile.am @@ -22,7 +22,11 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_intl.c \ - e_int_config_intl.h + e_int_config_intl.h \ + e_int_config_imc_import.c \ + e_int_config_imc_import.h \ + e_int_config_imc.c \ + e_int_config_imc.h module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_intl/e_int_config_imc.c similarity index 100% rename from src/modules/conf_imc/e_int_config_imc.c rename to src/modules/conf_intl/e_int_config_imc.c diff --git a/src/modules/conf_imc/e_int_config_imc.h b/src/modules/conf_intl/e_int_config_imc.h similarity index 100% rename from src/modules/conf_imc/e_int_config_imc.h rename to src/modules/conf_intl/e_int_config_imc.h diff --git a/src/modules/conf_imc/e_int_config_imc_import.c b/src/modules/conf_intl/e_int_config_imc_import.c similarity index 100% rename from src/modules/conf_imc/e_int_config_imc_import.c rename to src/modules/conf_intl/e_int_config_imc_import.c diff --git a/src/modules/conf_imc/e_int_config_imc_import.h b/src/modules/conf_intl/e_int_config_imc_import.h similarity index 100% rename from src/modules/conf_imc/e_int_config_imc_import.h rename to src/modules/conf_intl/e_int_config_imc_import.h diff --git a/src/modules/conf_intl/e_mod_main.c b/src/modules/conf_intl/e_mod_main.c index 8fc3e4a87..58baabba2 100644 --- a/src/modules/conf_intl/e_mod_main.c +++ b/src/modules/conf_intl/e_mod_main.c @@ -20,6 +20,9 @@ e_modapi_init(E_Module *m) _("Language Settings"), NULL, "preferences-desktop-locale", e_int_config_intl); + e_configure_registry_item_add("language/input_method_settings", 20, + _("Input Method Settings"), NULL, + "preferences-imc", e_int_config_imc); conf_module = m; e_module_delayed_set(m, 1); return m; @@ -30,8 +33,11 @@ e_modapi_shutdown(E_Module *m __UNUSED__) { E_Config_Dialog *cfd; + while ((cfd = e_config_dialog_get("E", "language/input_method_settings"))) + e_object_del(E_OBJECT(cfd)); while ((cfd = e_config_dialog_get("E", "language/language_settings"))) e_object_del(E_OBJECT(cfd)); + e_configure_registry_item_del("language/input_method_settings"); e_configure_registry_item_del("language/language_settings"); e_configure_registry_category_del("language"); conf_module = NULL; diff --git a/src/modules/conf_intl/e_mod_main.h b/src/modules/conf_intl/e_mod_main.h index dddeae527..22def95ea 100644 --- a/src/modules/conf_intl/e_mod_main.h +++ b/src/modules/conf_intl/e_mod_main.h @@ -3,8 +3,11 @@ #define E_TYPEDEFS 1 #include "e_int_config_intl.h" +#include "e_int_config_imc.h" + #undef E_TYPEDEFS #include "e_int_config_intl.h" +#include "e_int_config_imc.h" EAPI extern E_Module_Api e_modapi;