From d2dc4fd3ae2995ef7ccba32db7dccc0850f07187 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sun, 1 May 2011 02:51:21 +0000
Subject: [PATCH] more merging of modules

SVN revision: 59056
---
 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_engine/.cvsignore            |   7 ---
 src/modules/conf_engine/Makefile.am           |  31 -------------
 .../conf_engine/e-module-conf_engine.edj      | Bin 16585 -> 0 bytes
 src/modules/conf_engine/e_mod_main.c          |  43 ------------------
 src/modules/conf_engine/e_mod_main.h          |  16 -------
 src/modules/conf_engine/module.desktop.in     |  34 --------------
 src/modules/conf_performance/Makefile.am      |   4 +-
 .../e_int_config_engine.c                     |   0
 .../e_int_config_engine.h                     |   0
 src/modules/conf_performance/e_mod_main.c     |   3 ++
 src/modules/conf_performance/e_mod_main.h     |   2 +
 20 files changed, 9 insertions(+), 187 deletions(-)
 delete mode 100644 src/modules/conf_engine/.cvsignore
 delete mode 100644 src/modules/conf_engine/Makefile.am
 delete mode 100644 src/modules/conf_engine/e-module-conf_engine.edj
 delete mode 100644 src/modules/conf_engine/e_mod_main.c
 delete mode 100644 src/modules/conf_engine/e_mod_main.h
 delete mode 100644 src/modules/conf_engine/module.desktop.in
 rename src/modules/{conf_engine => conf_performance}/e_int_config_engine.c (100%)
 rename src/modules/{conf_engine => conf_performance}/e_int_config_engine.h (100%)

diff --git a/config/illume-home/e.src b/config/illume-home/e.src
index 22935f4e5..82f448a44 100644
--- a/config/illume-home/e.src
+++ b/config/illume-home/e.src
@@ -1186,12 +1186,6 @@ group "E_Config" struct {
             value "delayed" uchar: 1;
             value "priority" int: 0;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf_engine";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
-        }
         group "E_Config_Module" struct {
             value "name" string: "conf_interaction";
             value "enabled" uchar: 1;
diff --git a/config/illume/e.src b/config/illume/e.src
index 74518871b..d73634083 100644
--- a/config/illume/e.src
+++ b/config/illume/e.src
@@ -127,14 +127,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_startup";
diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index 216ec82f7..ae532f4d6 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -249,14 +249,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_interaction";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index 008ef974b..fb716ddce 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -281,14 +281,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "fileman";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 00977ae92..1003c01ac 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -72,14 +72,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_window_manipulation";
diff --git a/config/standard/e.src b/config/standard/e.src
index 6e351da94..eabe6b705 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -72,14 +72,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_window_manipulation";
diff --git a/configure.ac b/configure.ac
index 27e5fe7ef..6ad4b7b7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -689,7 +689,6 @@ 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_engine], true)
 AC_E_OPTIONAL_MODULE([conf_applications], true)
 AC_E_OPTIONAL_MODULE([conf_display], true)
 AC_E_OPTIONAL_MODULE([conf_shelves], true)
@@ -806,8 +805,6 @@ src/modules/conf_profiles/Makefile
 src/modules/conf_profiles/module.desktop
 src/modules/msgbus/Makefile
 src/modules/msgbus/module.desktop
-src/modules/conf_engine/Makefile
-src/modules/conf_engine/module.desktop
 src/modules/conf_applications/Makefile
 src/modules/conf_applications/module.desktop
 src/modules/conf_display/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8095a73cb..6a61b8a8d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -149,8 +149,6 @@ src/modules/conf_display/e_int_config_dpms.c
 src/modules/conf_display/e_mod_main.c
 src/modules/conf_edgebindings/e_int_config_edgebindings.c
 src/modules/conf_edgebindings/e_mod_main.c
-src/modules/conf_engine/e_int_config_engine.c
-src/modules/conf_engine/e_mod_main.c
 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
@@ -174,6 +172,7 @@ src/modules/conf_mouse_cursor/e_int_config_cursor.c
 src/modules/conf_mouse_cursor/e_mod_main.c
 src/modules/conf_paths/e_int_config_paths.c
 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
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index ca332b27b..3bd09c1fc 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -110,10 +110,6 @@ if USE_MODULE_MSGBUS
 SUBDIRS += msgbus
 endif
 
-if USE_MODULE_CONF_ENGINE
-SUBDIRS += conf_engine
-endif
-
 if USE_MODULE_CONF_APPLICATIONS
 SUBDIRS += conf_applications
 endif
diff --git a/src/modules/conf_engine/.cvsignore b/src/modules/conf_engine/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_engine/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_engine/Makefile.am b/src/modules/conf_engine/Makefile.am
deleted file mode 100644
index e47684c33..000000000
--- a/src/modules/conf_engine/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_engine
-
-# 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_engine.c \
-                         e_int_config_engine.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_engine/e-module-conf_engine.edj b/src/modules/conf_engine/e-module-conf_engine.edj
deleted file mode 100644
index 1fef81b6bef0ab7f3cbcb4e46fdbe04bb0870dec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16585
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

diff --git a/src/modules/conf_engine/e_mod_main.c b/src/modules/conf_engine/e_mod_main.c
deleted file mode 100644
index 31a9c08ff..000000000
--- a/src/modules/conf_engine/e_mod_main.c
+++ /dev/null
@@ -1,43 +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 - Engine"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, 
-                                     "preferences-advanced");
-   e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, 
-                                 "preferences-engine", e_int_config_engine);
-   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", "advanced/engine"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("advanced/engine");
-   e_configure_registry_category_del("advanced");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_engine/e_mod_main.h b/src/modules/conf_engine/e_mod_main.h
deleted file mode 100644
index 2d55b4780..000000000
--- a/src/modules/conf_engine/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_engine.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_engine.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_engine/module.desktop.in b/src/modules/conf_engine/module.desktop.in
deleted file mode 100644
index c9312693a..000000000
--- a/src/modules/conf_engine/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Engine
-Name[ru]=Движок
-Name[cs]=Engine
-Name[de]=
-Name[eo]=Motoro
-Name[es]=Motor
-Name[fr]=Moteur
-Name[hu]=Meghajtó
-Name[it]=Motore
-Name[ja]=
-Name[pt]=Motor
-Name[pt_BR]=
-Name[tr]=Motor
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_engine
-Comment=Used to select the rendering engine.
-Comment[ru]=Используется для выбора движка для системы прорисовки.
-Comment[cs]=Použit pro volbu vykreslovacího enginu.
-Comment[de]=
-Comment[eo]=Elekti la bildigan motoron.
-Comment[es]=Usado para seleccionar el motor de renderizado.
-Comment[fr]=Permet de choisir le moteur de rendu.
-Comment[hu]=A megjelenítő motor (rendering engine) kiválasztása.
-Comment[it]=Usato per selezionere il motore di rendering.
-Comment[ja]=
-Comment[pt]=Permite-lhe selecionar o motor de renderização
-Comment[pt_BR]=
-Comment[tr]=Render motorunu seçmekte kullanılır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_performance/Makefile.am b/src/modules/conf_performance/Makefile.am
index b7dd928ec..d403d1f0a 100644
--- a/src/modules/conf_performance/Makefile.am
+++ b/src/modules/conf_performance/Makefile.am
@@ -21,7 +21,9 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
 			 e_int_config_performance.c \
-                         e_int_config_performance.h
+                         e_int_config_performance.h \
+                         e_int_config_engine.c \
+                         e_int_config_engine.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_engine/e_int_config_engine.c b/src/modules/conf_performance/e_int_config_engine.c
similarity index 100%
rename from src/modules/conf_engine/e_int_config_engine.c
rename to src/modules/conf_performance/e_int_config_engine.c
diff --git a/src/modules/conf_engine/e_int_config_engine.h b/src/modules/conf_performance/e_int_config_engine.h
similarity index 100%
rename from src/modules/conf_engine/e_int_config_engine.h
rename to src/modules/conf_performance/e_int_config_engine.h
diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c
index 0e6384801..b587ce117 100644
--- a/src/modules/conf_performance/e_mod_main.c
+++ b/src/modules/conf_performance/e_mod_main.c
@@ -16,6 +16,7 @@ e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
    e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance);   
+   e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, "preferences-engine", e_int_config_engine);
    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", "advanced/engine"))) e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "advanced/performance"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("advanced/engine");
    e_configure_registry_item_del("advanced/performance");
    e_configure_registry_category_del("advanced");
    conf_module = NULL;
diff --git a/src/modules/conf_performance/e_mod_main.h b/src/modules/conf_performance/e_mod_main.h
index f880be9f0..235e37db9 100644
--- a/src/modules/conf_performance/e_mod_main.h
+++ b/src/modules/conf_performance/e_mod_main.h
@@ -3,9 +3,11 @@
 
 #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"
 
 EAPI extern E_Module_Api e_modapi;