From c2b3532fd77f23ef6bc75c5abef2938def61e275 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sat, 30 Apr 2011 13:35:25 +0000
Subject: [PATCH] more merging of modules that are needlessly split

SVN revision: 59053
---
 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_winlist/.cvsignore           |   7 ---
 src/modules/conf_winlist/Makefile.am          |  31 ------------
 .../conf_winlist/e-module-conf_winlist.edj    | Bin 12858 -> 0 bytes
 src/modules/conf_winlist/e_mod_main.c         |  44 ------------------
 src/modules/conf_winlist/e_mod_main.h         |  16 -------
 src/modules/conf_winlist/module.desktop.in    |  34 --------------
 src/modules/winlist/Makefile.am               |   4 +-
 .../e_int_config_winlist.c                    |   4 +-
 .../e_int_config_winlist.h                    |   0
 src/modules/winlist/e_mod_main.c              |   8 ++++
 src/modules/winlist/e_mod_main.h              |   3 +-
 18 files changed, 16 insertions(+), 177 deletions(-)
 delete mode 100644 src/modules/conf_winlist/.cvsignore
 delete mode 100644 src/modules/conf_winlist/Makefile.am
 delete mode 100644 src/modules/conf_winlist/e-module-conf_winlist.edj
 delete mode 100644 src/modules/conf_winlist/e_mod_main.c
 delete mode 100644 src/modules/conf_winlist/e_mod_main.h
 delete mode 100644 src/modules/conf_winlist/module.desktop.in
 rename src/modules/{conf_winlist => winlist}/e_int_config_winlist.c (99%)
 rename src/modules/{conf_winlist => winlist}/e_int_config_winlist.h (100%)

diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index d9deaf087..7d3c020ca 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -257,14 +257,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_winlist";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_engine";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index 807c81105..e7c310551 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -289,14 +289,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_winlist";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_engine";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 7e124fd24..368c8d69a 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -80,14 +80,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_winlist";
-      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 57b63f2d6..889227fb0 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -80,14 +80,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_winlist";
-      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 9b0b7c2c2..6d1da69f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -701,7 +701,6 @@ AC_E_OPTIONAL_MODULE([conf_window_manipulation], true)
 AC_E_OPTIONAL_MODULE([conf_menus], true)
 AC_E_OPTIONAL_MODULE([conf_dialogs], true)
 AC_E_OPTIONAL_MODULE([conf_performance], true)
-AC_E_OPTIONAL_MODULE([conf_winlist], true)
 AC_E_OPTIONAL_MODULE([conf_paths], true)
 AC_E_OPTIONAL_MODULE([conf_mime], true)
 AC_E_OPTIONAL_MODULE([conf_interaction], true)
@@ -832,8 +831,6 @@ src/modules/conf_dialogs/Makefile
 src/modules/conf_dialogs/module.desktop
 src/modules/conf_performance/Makefile
 src/modules/conf_performance/module.desktop
-src/modules/conf_winlist/Makefile
-src/modules/conf_winlist/module.desktop
 src/modules/conf_paths/Makefile
 src/modules/conf_paths/module.desktop
 src/modules/conf_mime/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c65bf6901..31cc9b65d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -204,8 +204,6 @@ src/modules/conf_window_manipulation/e_int_config_window_stacking.c
 src/modules/conf_window_manipulation/e_mod_main.c
 src/modules/conf_window_remembers/e_int_config_remembers.c
 src/modules/conf_window_remembers/e_mod_main.c
-src/modules/conf_winlist/e_int_config_winlist.c
-src/modules/conf_winlist/e_mod_main.c
 src/modules/cpufreq/e_mod_main.c
 src/modules/cpufreq/freqset.c
 src/modules/dropshadow/e_mod_config.c
@@ -230,6 +228,7 @@ src/modules/fileman_opinfo/e_mod_main.c
 src/modules/gadman/e_mod_config.c
 src/modules/gadman/e_mod_gadman.c
 src/modules/gadman/e_mod_main.c
+src/modules/winlist/e_int_config_winlist.c
 src/modules/winlist/e_mod_main.c
 src/modules/winlist/e_winlist.c
 src/modules/ibar/e_mod_config.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 9f977afda..1d2cdb8b6 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -158,10 +158,6 @@ if USE_MODULE_CONF_PERFORMANCE
 SUBDIRS += conf_performance
 endif
 
-if USE_MODULE_CONF_WINLIST
-SUBDIRS += conf_winlist
-endif
-
 if USE_MODULE_CONF_PATHS
 SUBDIRS += conf_paths
 endif
diff --git a/src/modules/conf_winlist/.cvsignore b/src/modules/conf_winlist/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_winlist/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_winlist/Makefile.am b/src/modules/conf_winlist/Makefile.am
deleted file mode 100644
index 3811a225f..000000000
--- a/src/modules/conf_winlist/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_winlist
-
-# 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_winlist.c \
-                         e_int_config_winlist.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_winlist/e-module-conf_winlist.edj b/src/modules/conf_winlist/e-module-conf_winlist.edj
deleted file mode 100644
index 25fba8aac75d6e6bf17bdb458b85aec9f9084815..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/src/modules/conf_winlist/e_mod_main.c b/src/modules/conf_winlist/e_mod_main.c
deleted file mode 100644
index d023594fb..000000000
--- a/src/modules/conf_winlist/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 - Window List"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, 
-                                     "preferences-system-windows");
-   e_configure_registry_item_add("windows/window_list", 30, _("Window List"), 
-                                 NULL, "preferences-winlist", 
-                                 e_int_config_winlist);
-   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/window_list"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("advanced/window_list");
-   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_winlist/e_mod_main.h b/src/modules/conf_winlist/e_mod_main.h
deleted file mode 100644
index d506da5d9..000000000
--- a/src/modules/conf_winlist/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_winlist.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_winlist.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_winlist/module.desktop.in b/src/modules/conf_winlist/module.desktop.in
deleted file mode 100644
index ca07c660b..000000000
--- a/src/modules/conf_winlist/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Window List
-Name[ru]=Список окон
-Name[cs]=Seznam oken
-Name[de]=
-Name[eo]=Fenestrolisto
-Name[es]=Lista de ventanas
-Name[fr]=Liste des fenêtres
-Name[hu]=Ablak lista
-Name[it]=Lista finestre
-Name[ja]=
-Name[pt]=Lista de janelas
-Name[pt_BR]=
-Name[tr]=Pencere Listesi
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_winlist
-Comment=Configure your window list properties.
-Comment[ru]=Позволяет конфигурацию списка окон.
-Comment[cs]=Změna vlastností seznamu oken.
-Comment[de]=
-Comment[eo]=Agordi la ecojn de la fenestrolisto.
-Comment[es]=Configura las propiedades de su lista de ventanas.
-Comment[fr]=Configure les propriétés de la liste des fenêtres.
-Comment[hu]=Az ablak lista beállításait teszi lehetõvé ez a modul.
-Comment[it]=Configura le proprietà della lista delle finestre.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar as propriedades da lista de janelas
-Comment[pt_BR]=
-Comment[tr]=Pencere listesi özelliklerini yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/winlist/Makefile.am b/src/modules/winlist/Makefile.am
index 58da0eb56..b5c9c1879 100644
--- a/src/modules/winlist/Makefile.am
+++ b/src/modules/winlist/Makefile.am
@@ -21,7 +21,9 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
 			 e_winlist.c \
-                         e_winlist.h
+                         e_winlist.h \
+                         e_int_config_winlist.c \
+                         e_int_config_winlist.h
 			 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_winlist/e_int_config_winlist.c b/src/modules/winlist/e_int_config_winlist.c
similarity index 99%
rename from src/modules/conf_winlist/e_int_config_winlist.c
rename to src/modules/winlist/e_int_config_winlist.c
index 407f06234..df442b109 100644
--- a/src/modules/conf_winlist/e_int_config_winlist.c
+++ b/src/modules/winlist/e_int_config_winlist.c
@@ -46,7 +46,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "advanced/window_list")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_list")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -56,7 +56,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
    v->basic.check_changed = _basic_check_changed;
 
    cfd = e_config_dialog_new(con, _("Window List Settings"),
-			     "E", "advanced/window_list",
+			     "E", "windows/window_list",
 			     "preferences-winlist", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_winlist/e_int_config_winlist.h b/src/modules/winlist/e_int_config_winlist.h
similarity index 100%
rename from src/modules/conf_winlist/e_int_config_winlist.h
rename to src/modules/winlist/e_int_config_winlist.h
diff --git a/src/modules/winlist/e_mod_main.c b/src/modules/winlist/e_mod_main.c
index daaa0c272..38312373b 100644
--- a/src/modules/winlist/e_mod_main.c
+++ b/src/modules/winlist/e_mod_main.c
@@ -22,6 +22,8 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    conf_module = m;
+   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
+   e_configure_registry_item_add("windows/window_list", 70, _("Window List"), NULL, "preferences-winlist", e_int_config_winlist);
    e_winlist_init();
    /* add module supplied action */
    act = e_action_add("winlist");
@@ -62,6 +64,8 @@ e_modapi_init(E_Module *m)
 EAPI int
 e_modapi_shutdown(E_Module *m __UNUSED__)
 {
+   E_Config_Dialog *cfd;
+   
    /* remove module-supplied action */
    if (act)
      {
@@ -79,6 +83,10 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 	act = NULL;
      }
    e_winlist_shutdown();
+   
+   while ((cfd = e_config_dialog_get("E", "windows/window_list"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("windows/window_list");
+   e_configure_registry_category_del("windows");
    conf_module = NULL;
    return 1;
 }
diff --git a/src/modules/winlist/e_mod_main.h b/src/modules/winlist/e_mod_main.h
index a4c2a7dbf..aab247206 100644
--- a/src/modules/winlist/e_mod_main.h
+++ b/src/modules/winlist/e_mod_main.h
@@ -3,10 +3,11 @@
 
 #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"
 
 EAPI extern E_Module_Api e_modapi;