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

SVN revision: 59057
---
 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_mime/.cvsignore              |   7 ---
 src/modules/conf_mime/Makefile.am             |  34 -------------
 src/modules/conf_mime/e-module-conf_mime.edj  | Bin 16451 -> 0 bytes
 src/modules/conf_mime/e_mod_main.c            |  46 ------------------
 src/modules/conf_mime/e_mod_main.h            |  18 -------
 src/modules/conf_mime/module.desktop.in       |  34 -------------
 src/modules/fileman/Makefile.am               |   6 ++-
 .../e_int_config_mime.c                       |   0
 .../e_int_config_mime.h                       |   0
 .../e_int_config_mime_edit.c                  |   4 +-
 .../e_int_config_mime_edit.h                  |   0
 src/modules/fileman/e_mod_main.c              |  14 +++++-
 src/modules/fileman/e_mod_main.h              |   4 ++
 20 files changed, 25 insertions(+), 186 deletions(-)
 delete mode 100644 src/modules/conf_mime/.cvsignore
 delete mode 100644 src/modules/conf_mime/Makefile.am
 delete mode 100644 src/modules/conf_mime/e-module-conf_mime.edj
 delete mode 100644 src/modules/conf_mime/e_mod_main.c
 delete mode 100644 src/modules/conf_mime/e_mod_main.h
 delete mode 100644 src/modules/conf_mime/module.desktop.in
 rename src/modules/{conf_mime => fileman}/e_int_config_mime.c (100%)
 rename src/modules/{conf_mime => fileman}/e_int_config_mime.h (100%)
 rename src/modules/{conf_mime => fileman}/e_int_config_mime_edit.c (99%)
 rename src/modules/{conf_mime => fileman}/e_int_config_mime_edit.h (100%)

diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index ae532f4d6..86dd29cc4 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -153,14 +153,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mime";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_mouse_cursor";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index fb716ddce..dd970b738 100644
--- a/config/netbook/e.src
+++ b/config/netbook/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_mime";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_mouse_cursor";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 1003c01ac..1713817b7 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -160,14 +160,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mime";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_menus";
diff --git a/config/standard/e.src b/config/standard/e.src
index eabe6b705..817afa7c6 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -160,14 +160,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mime";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_menus";
diff --git a/configure.ac b/configure.ac
index 6ad4b7b7f..32e2a2d99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -700,7 +700,6 @@ 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_paths], true)
-AC_E_OPTIONAL_MODULE([conf_mime], true)
 AC_E_OPTIONAL_MODULE([conf_interaction], true)
 AC_E_OPTIONAL_MODULE([conf_scale], true)
 AC_E_OPTIONAL_MODULE([gadman], true)
@@ -827,8 +826,6 @@ src/modules/conf_performance/Makefile
 src/modules/conf_performance/module.desktop
 src/modules/conf_paths/Makefile
 src/modules/conf_paths/module.desktop
-src/modules/conf_mime/Makefile
-src/modules/conf_mime/module.desktop
 src/modules/conf_interaction/Makefile
 src/modules/conf_interaction/module.desktop
 src/modules/conf_scale/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6a61b8a8d..26fa05664 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -165,9 +165,6 @@ src/modules/conf_keybindings/e_int_config_mousebindings.c
 src/modules/conf_keybindings/e_mod_main.c
 src/modules/conf_menus/e_int_config_menus.c
 src/modules/conf_menus/e_mod_main.c
-src/modules/conf_mime/e_int_config_mime.c
-src/modules/conf_mime/e_int_config_mime_edit.c
-src/modules/conf_mime/e_mod_main.c
 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
@@ -219,6 +216,8 @@ src/modules/everything-calc/evry_plug_calc.c
 src/modules/everything-files/evry_plug_files.c
 src/modules/everything-settings/evry_plug_settings.c
 src/modules/everything-windows/evry_plug_windows.c
+src/modules/fileman/e_int_config_mime.c
+src/modules/fileman/e_int_config_mime_edit.c
 src/modules/fileman/e_mod_main.c
 src/modules/fileman/e_mod_config.c
 src/modules/fileman/e_fwin.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 3bd09c1fc..dabe4d43d 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -154,10 +154,6 @@ if USE_MODULE_CONF_PATHS
 SUBDIRS += conf_paths
 endif
 
-if USE_MODULE_CONF_MIME
-SUBDIRS += conf_mime
-endif
-
 if USE_MODULE_CONF_INTERACTION
 SUBDIRS += conf_interaction
 endif
diff --git a/src/modules/conf_mime/.cvsignore b/src/modules/conf_mime/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_mime/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_mime/Makefile.am b/src/modules/conf_mime/Makefile.am
deleted file mode 100644
index 7a5a87f63..000000000
--- a/src/modules/conf_mime/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_mime
-
-# 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_mime.c \
-                         e_int_config_mime.h \
-                         e_int_config_mime_edit.c \
-                         e_int_config_mime_edit.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_mime/e-module-conf_mime.edj b/src/modules/conf_mime/e-module-conf_mime.edj
deleted file mode 100644
index b9328cc809826bea0250d47f2d858b3a4cd25222..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16451
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
ZCoB4!*)b8-^dl}OqqI3R2aRVt{tx-?vn&7r

diff --git a/src/modules/conf_mime/e_mod_main.c b/src/modules/conf_mime/e_mod_main.c
deleted file mode 100644
index b57717b8f..000000000
--- a/src/modules/conf_mime/e_mod_main.c
+++ /dev/null
@@ -1,46 +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 - File Icons"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("fileman", 100, _("Files"), NULL, 
-                                     "system-file-manager");
-   e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"), 
-                                 NULL, "preferences-file-icons", 
-                                 e_int_config_mime);
-   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", "_config_mime_edit_dialog"))) 
-     e_object_del(E_OBJECT(cfd));
-   while ((cfd = e_config_dialog_get("E", "fileman/file_icons"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("fileman/file_icons");
-   e_configure_registry_category_del("fileman");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_mime/e_mod_main.h b/src/modules/conf_mime/e_mod_main.h
deleted file mode 100644
index f1594d92e..000000000
--- a/src/modules/conf_mime/e_mod_main.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_mime_edit.h"
-#include "e_int_config_mime.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_mime_edit.h"
-#include "e_int_config_mime.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_mime/module.desktop.in b/src/modules/conf_mime/module.desktop.in
deleted file mode 100644
index 6060e61b3..000000000
--- a/src/modules/conf_mime/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=File Icons
-Name[ru]=Иконки файлов
-Name[cs]=Ikony souborů
-Name[de]=
-Name[eo]=Dosieraj piktogramoj
-Name[es]=Íconos de archivo
-Name[fr]=Icones des fichiers
-Name[hu]=Fájl ikonok
-Name[it]=Icone dei file
-Name[ja]=
-Name[pt]=Ícones dos ficheiros
-Name[pt_BR]=
-Name[tr]=Dosya Simgeleri
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_mime
-Comment=Configure E17 mime icons.
-Comment[ru]=Настройки иконок MIME для E17.
-Comment[cs]=Určen k nastavení MIME ikon.
-Comment[de]=
-Comment[eo]=Agordi piktogramojn de E17 por MIME.
-Comment[es]=Configure los íconos mime de E17.
-Comment[fr]=Configure les icones des types MIME dans E17.
-Comment[hu]=Fájltípusok ikonjainak a beállítása az E17 fájlkezelőjében.
-Comment[it]=Configura le icone dei tipi MIME in E17.
-Comment[ja]=
-Comment[pt]=Permite-lhe definir os ícones mime
-Comment[pt_BR]=
-Comment[tr]=E17 mime simgelerini yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/fileman/Makefile.am b/src/modules/fileman/Makefile.am
index eb937d5ea..e1c6b652c 100644
--- a/src/modules/fileman/Makefile.am
+++ b/src/modules/fileman/Makefile.am
@@ -25,7 +25,11 @@ module_la_SOURCES      = e_mod_main.c \
 			 e_mod_dbus.c \
 			 e_mod_dbus.h \
 			 e_fwin.c \
-                         e_fwin.h
+                         e_fwin.h \
+                         e_int_config_mime.c \
+                         e_int_config_mime.h \
+                         e_int_config_mime_edit.c \
+                         e_int_config_mime_edit.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_mime/e_int_config_mime.c b/src/modules/fileman/e_int_config_mime.c
similarity index 100%
rename from src/modules/conf_mime/e_int_config_mime.c
rename to src/modules/fileman/e_int_config_mime.c
diff --git a/src/modules/conf_mime/e_int_config_mime.h b/src/modules/fileman/e_int_config_mime.h
similarity index 100%
rename from src/modules/conf_mime/e_int_config_mime.h
rename to src/modules/fileman/e_int_config_mime.h
diff --git a/src/modules/conf_mime/e_int_config_mime_edit.c b/src/modules/fileman/e_int_config_mime_edit.c
similarity index 99%
rename from src/modules/conf_mime/e_int_config_mime_edit.c
rename to src/modules/fileman/e_int_config_mime_edit.c
index ed10831fd..572fe7930 100644
--- a/src/modules/conf_mime/e_int_config_mime_edit.c
+++ b/src/modules/fileman/e_int_config_mime_edit.c
@@ -57,7 +57,7 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
    cfdata->data = data;
    cfdata->data2 = data2;
    
-   if (e_config_dialog_find("E", "_config_mime_edit_dialog")) return NULL;
+   if (e_config_dialog_find("E", "fileman/mime_edit_dialog")) return NULL;
 
    con = e_container_current_get(e_manager_current_get());
    
@@ -69,7 +69,7 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
    v->basic.apply_cfdata = _basic_apply;
 
    cfd = e_config_dialog_new(con, _("File Icon"), "E", 
-			     "_config_mime_edit_dialog", 
+			     "fileman/mime_edit_dialog",
 			     "preferences-file-icons", 0, v, cfdata);
    return cfd;
 }
diff --git a/src/modules/conf_mime/e_int_config_mime_edit.h b/src/modules/fileman/e_int_config_mime_edit.h
similarity index 100%
rename from src/modules/conf_mime/e_int_config_mime_edit.h
rename to src/modules/fileman/e_int_config_mime_edit.h
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index bb2aa92ea..eae9d82c2 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -58,7 +58,9 @@ e_modapi_init(E_Module *m)
    e_configure_registry_item_add("fileman/fileman", 10, _("File Manager"),
                                  NULL, "system-file-manager",
                                  e_int_config_fileman);
-
+   e_configure_registry_item_add("fileman/file_icons", 20, _("File Icons"),
+                                 NULL, "preferences-file-icons",
+                                 e_int_config_mime);
    /* Setup Config edd */
    _e_mod_fileman_config_load();
 
@@ -119,6 +121,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    E_Manager *man;
    E_Container *con;
    E_Zone *zone;
+   E_Config_Dialog *cfd;
 
    e_fileman_dbus_shutdown();
 
@@ -154,7 +157,14 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
         e_action_del("fileman");
         act = NULL;
      }
-   /* remove fileman category from config panel */
+   while ((cfd = e_config_dialog_get("E", "fileman/mime_edit_dialog")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "fileman/file_icons")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "fileman/fileman")))
+      e_object_del(E_OBJECT(cfd));
+   
+   e_configure_registry_item_del("fileman/file_icons");
    e_configure_registry_item_del("fileman/fileman");
    e_configure_registry_category_del("fileman");
 
diff --git a/src/modules/fileman/e_mod_main.h b/src/modules/fileman/e_mod_main.h
index de90a4fcb..b9fd666b6 100644
--- a/src/modules/fileman/e_mod_main.h
+++ b/src/modules/fileman/e_mod_main.h
@@ -11,9 +11,13 @@ typedef struct _Config Config;
 
 #define E_TYPEDEFS 1
 #include "e_fwin.h"
+#include "e_int_config_mime_edit.h"
+#include "e_int_config_mime.h"
 
 #undef E_TYPEDEFS
 #include "e_fwin.h"
+#include "e_int_config_mime_edit.h"
+#include "e_int_config_mime.h"
 
 struct _Config 
 {