From 9aa29fc77052e749ff10b4460b49bf695fea9aed Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sat, 9 Apr 2011 15:01:07 +0000
Subject: [PATCH] as per plan - merge more core modules.

SVN revision: 58526
---
 config/minimalist/e.src                       |  16 -------
 config/netbook/e.src                          |  16 -------
 config/scaleable/e.src                        |  16 -------
 config/standard/e.src                         |  24 ----------
 configure.ac                                  |   9 ----
 src/modules/Makefile.am                       |  12 -----
 src/modules/conf_acpibindings/Makefile.am     |  31 ------------
 src/modules/conf_acpibindings/e_mod_main.c    |  45 ------------------
 src/modules/conf_acpibindings/e_mod_main.h    |  16 -------
 .../conf_acpibindings/module.desktop.in       |  16 -------
 src/modules/conf_interaction/Makefile.am      |   4 +-
 .../e_int_config_mouse.c                      |   0
 .../e_int_config_mouse.h                      |   0
 src/modules/conf_interaction/e_mod_main.c     |  14 +++++-
 src/modules/conf_interaction/e_mod_main.h     |   2 +
 .../conf_interaction/module.desktop.in        |  34 ++++++-------
 src/modules/conf_keybindings/Makefile.am      |   6 ++-
 .../e_int_config_acpibindings.c               |   0
 .../e_int_config_acpibindings.h               |   0
 .../e_int_config_mousebindings.c              |   0
 .../e_int_config_mousebindings.h              |   0
 src/modules/conf_keybindings/e_mod_main.c     |  24 ++++++++--
 src/modules/conf_keybindings/e_mod_main.h     |   4 ++
 .../conf_keybindings/module.desktop.in        |  40 ++++++++--------
 src/modules/conf_mouse/.cvsignore             |   7 ---
 src/modules/conf_mouse/Makefile.am            |  31 ------------
 .../conf_mouse/e-module-conf_mouse.edj        | Bin 17282 -> 0 bytes
 src/modules/conf_mouse/e_mod_main.c           |  45 ------------------
 src/modules/conf_mouse/e_mod_main.h           |  16 -------
 src/modules/conf_mouse/module.desktop.in      |  34 -------------
 src/modules/conf_mousebindings/.cvsignore     |   7 ---
 src/modules/conf_mousebindings/Makefile.am    |  31 ------------
 .../e-module-conf_mousebindings.edj           | Bin 17282 -> 0 bytes
 src/modules/conf_mousebindings/e_mod_main.c   |  45 ------------------
 src/modules/conf_mousebindings/e_mod_main.h   |  16 -------
 .../conf_mousebindings/module.desktop.in      |  34 -------------
 36 files changed, 84 insertions(+), 511 deletions(-)
 delete mode 100644 src/modules/conf_acpibindings/Makefile.am
 delete mode 100644 src/modules/conf_acpibindings/e_mod_main.c
 delete mode 100644 src/modules/conf_acpibindings/e_mod_main.h
 delete mode 100644 src/modules/conf_acpibindings/module.desktop.in
 rename src/modules/{conf_mouse => conf_interaction}/e_int_config_mouse.c (100%)
 rename src/modules/{conf_mouse => conf_interaction}/e_int_config_mouse.h (100%)
 rename src/modules/{conf_acpibindings => conf_keybindings}/e_int_config_acpibindings.c (100%)
 rename src/modules/{conf_acpibindings => conf_keybindings}/e_int_config_acpibindings.h (100%)
 rename src/modules/{conf_mousebindings => conf_keybindings}/e_int_config_mousebindings.c (100%)
 rename src/modules/{conf_mousebindings => conf_keybindings}/e_int_config_mousebindings.h (100%)
 delete mode 100644 src/modules/conf_mouse/.cvsignore
 delete mode 100644 src/modules/conf_mouse/Makefile.am
 delete mode 100644 src/modules/conf_mouse/e-module-conf_mouse.edj
 delete mode 100644 src/modules/conf_mouse/e_mod_main.c
 delete mode 100644 src/modules/conf_mouse/e_mod_main.h
 delete mode 100644 src/modules/conf_mouse/module.desktop.in
 delete mode 100644 src/modules/conf_mousebindings/.cvsignore
 delete mode 100644 src/modules/conf_mousebindings/Makefile.am
 delete mode 100644 src/modules/conf_mousebindings/e-module-conf_mousebindings.edj
 delete mode 100644 src/modules/conf_mousebindings/e_mod_main.c
 delete mode 100644 src/modules/conf_mousebindings/e_mod_main.h
 delete mode 100644 src/modules/conf_mousebindings/module.desktop.in

diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index 5c01c7430..0cbb76142 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -177,22 +177,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mousebindings";
-      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 f925cca70..1e580ce07 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -209,22 +209,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mousebindings";
-      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 6e41639ed..89d237d56 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -192,22 +192,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mousebindings";
-      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";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_mime";
diff --git a/config/standard/e.src b/config/standard/e.src
index 552262768..c9712d760 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -192,22 +192,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mousebindings";
-      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";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_mime";
@@ -472,14 +456,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_acpibindings";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "themes" list {
     group "E_Config_Theme" struct {
       value "category" string: "theme";
diff --git a/configure.ac b/configure.ac
index f82a77bd3..387e2cf5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -671,10 +671,7 @@ AC_E_OPTIONAL_MODULE([conf_applications], true)
 AC_E_OPTIONAL_MODULE([conf_display], true)
 AC_E_OPTIONAL_MODULE([conf_shelves], true)
 AC_E_OPTIONAL_MODULE([conf_keybindings], true)
-AC_E_OPTIONAL_MODULE([conf_mousebindings], true)
 AC_E_OPTIONAL_MODULE([conf_edgebindings], true)
-AC_E_OPTIONAL_MODULE([conf_acpibindings], true)
-AC_E_OPTIONAL_MODULE([conf_mouse], true)
 AC_E_OPTIONAL_MODULE([conf_window_display], true)
 AC_E_OPTIONAL_MODULE([conf_window_focus], true)
 AC_E_OPTIONAL_MODULE([conf_window_remembers], true)
@@ -802,14 +799,8 @@ src/modules/conf_shelves/Makefile
 src/modules/conf_shelves/module.desktop
 src/modules/conf_keybindings/Makefile
 src/modules/conf_keybindings/module.desktop
-src/modules/conf_mousebindings/Makefile
-src/modules/conf_mousebindings/module.desktop
 src/modules/conf_edgebindings/Makefile
 src/modules/conf_edgebindings/module.desktop
-src/modules/conf_acpibindings/Makefile
-src/modules/conf_acpibindings/module.desktop
-src/modules/conf_mouse/Makefile
-src/modules/conf_mouse/module.desktop
 src/modules/conf_window_display/Makefile
 src/modules/conf_window_display/module.desktop
 src/modules/conf_window_focus/Makefile
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index cfb918f48..f610fae2c 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -134,22 +134,10 @@ if USE_MODULE_CONF_KEYBINDINGS
 SUBDIRS += conf_keybindings
 endif
 
-if USE_MODULE_CONF_MOUSEBINDINGS
-SUBDIRS += conf_mousebindings
-endif
-
 if USE_MODULE_CONF_EDGEBINDINGS
 SUBDIRS += conf_edgebindings
 endif
 
-if USE_MODULE_CONF_ACPIBINDINGS
-SUBDIRS += conf_acpibindings
-endif
-
-if USE_MODULE_CONF_MOUSE
-SUBDIRS += conf_mouse
-endif
-
 if USE_MODULE_CONF_WINDOW_DISPLAY
 SUBDIRS += conf_window_display
 endif
diff --git a/src/modules/conf_acpibindings/Makefile.am b/src/modules/conf_acpibindings/Makefile.am
deleted file mode 100644
index 67b54692b..000000000
--- a/src/modules/conf_acpibindings/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_acpibindings
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-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_acpibindings.c \
-                         e_int_config_acpibindings.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_acpibindings/e_mod_main.c b/src/modules/conf_acpibindings/e_mod_main.c
deleted file mode 100644
index b4450b9c7..000000000
--- a/src/modules/conf_acpibindings/e_mod_main.c
+++ /dev/null
@@ -1,45 +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 - ACPI Bindings"
-};
-
-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/acpi_bindings", 10, 
-				 _("ACPI Bindings"), NULL, 
-				 "preferences-system-power-management", 
-				 e_int_config_acpibindings);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   if ((cfd = e_config_dialog_get("E", "advanced/acpi_bindings")))
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("advanced/acpi_bindings");
-   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_acpibindings/e_mod_main.h b/src/modules/conf_acpibindings/e_mod_main.h
deleted file mode 100644
index 2fb7323de..000000000
--- a/src/modules/conf_acpibindings/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_acpibindings.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_acpibindings.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_acpibindings/module.desktop.in b/src/modules/conf_acpibindings/module.desktop.in
deleted file mode 100644
index f79c6469b..000000000
--- a/src/modules/conf_acpibindings/module.desktop.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=ACPI Bindings
-Name[ru]=Привязки ACPI
-Name[fr]=Raccourcis ACPI
-Name[it]=Associazioni ACPI
-Name[pt]=Associações ACPI
-Name[tr]=ACPI Bağlayıcıları
-Icon=preferences-system-power-management
-Comment=Configure your ACPI bindings here.
-Comment[ru]=Настройте Ваши ACPI привязки здесь.
-Comment[fr]=Permet de configurer vos raccourcis ACPI.
-Comment[it]=Configurate qui le vostre associazioni con ACPI.
-Comment[pt]=Permite-lhe configurar as associações ACPI
-Comment[tr]=ACPI bağlayıcılarınızı yapılandırın.
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_interaction/Makefile.am b/src/modules/conf_interaction/Makefile.am
index df5f4f3e5..338c6b87e 100644
--- a/src/modules/conf_interaction/Makefile.am
+++ b/src/modules/conf_interaction/Makefile.am
@@ -22,7 +22,9 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
 			 e_int_config_interaction.c \
-                         e_int_config_interaction.h
+                         e_int_config_interaction.h \
+                         e_int_config_mouse.c \
+                         e_int_config_mouse.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_mouse/e_int_config_mouse.c b/src/modules/conf_interaction/e_int_config_mouse.c
similarity index 100%
rename from src/modules/conf_mouse/e_int_config_mouse.c
rename to src/modules/conf_interaction/e_int_config_mouse.c
diff --git a/src/modules/conf_mouse/e_int_config_mouse.h b/src/modules/conf_interaction/e_int_config_mouse.h
similarity index 100%
rename from src/modules/conf_mouse/e_int_config_mouse.h
rename to src/modules/conf_interaction/e_int_config_mouse.h
diff --git a/src/modules/conf_interaction/e_mod_main.c b/src/modules/conf_interaction/e_mod_main.c
index 373a0fa54..626c6867f 100644
--- a/src/modules/conf_interaction/e_mod_main.c
+++ b/src/modules/conf_interaction/e_mod_main.c
@@ -16,10 +16,14 @@ e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), 
                                      NULL, "preferences-behavior");
-   e_configure_registry_item_add("keyboard_and_mouse/interaction", 11, 
-                                 _("Interaction"), NULL, 
+   e_configure_registry_item_add("keyboard_and_mouse/interaction", 40, 
+                                 _("Touch"), NULL, 
                                  "preferences-interaction", 
                                  e_int_config_interaction);
+   e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 50,
+                                 _("Mouse"), NULL,
+                                 "preferences-desktop-mouse",
+                                 e_int_config_mouse);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -30,10 +34,16 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
 
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_settings")))
+      e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/interaction"))) 
      e_object_del(E_OBJECT(cfd));
+   
+   e_configure_registry_item_del("keyboard_and_mouse/mouse_settings");
    e_configure_registry_item_del("keyboard_and_mouse/interaction");
+   
    e_configure_registry_category_del("keyboard_and_mouse");
+   
    conf_module = NULL;
    return 1;
 }
diff --git a/src/modules/conf_interaction/e_mod_main.h b/src/modules/conf_interaction/e_mod_main.h
index 74c8c50dc..b3e58161c 100644
--- a/src/modules/conf_interaction/e_mod_main.h
+++ b/src/modules/conf_interaction/e_mod_main.h
@@ -3,9 +3,11 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_interaction.h"
+#include "e_int_config_mouse.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_interaction.h"
+#include "e_int_config_mouse.h"
 
 EAPI extern E_Module_Api e_modapi;
 
diff --git a/src/modules/conf_interaction/module.desktop.in b/src/modules/conf_interaction/module.desktop.in
index 606c3a2e0..9cc27a8c8 100644
--- a/src/modules/conf_interaction/module.desktop.in
+++ b/src/modules/conf_interaction/module.desktop.in
@@ -1,34 +1,34 @@
 [Desktop Entry]
 Type=Link
 Name=Interaction
-Name[ru]=Взаимодействие
-Name[cs]=Interakce
+Name[ru]=
+Name[cs]=
 Name[de]=
-Name[eo]=Interagoj
+Name[eo]=
 Name[es]=
-Name[fr]=Interaction
-Name[hu]=Kölcsönhatások
-Name[it]=Interazione
+Name[fr]=
+Name[hu]=
+Name[it]=
 Name[ja]=
-Name[pt]=Interação
+Name[pt]=
 Name[pt_BR]=
-Name[tr]=Etkileşim
+Name[tr]=
 Name[zh_CN]=
 Name[zh_TW]=
 Icon=e-module-conf_interaction
-Comment=Configure default user interaction settings.
-Comment[ru]=Настройка стандартных параметров взаимодействия с пользователем.
-Comment[cs]=Nastavte výchozí volby interakce s uživatelem.
+Comment=Configure Mouse and Touch input.
+Comment[ru]=
+Comment[cs]=
 Comment[de]=
-Comment[eo]=Agordas defaŭltajn uzantajn interagojn.
+Comment[eo]=
 Comment[es]=
-Comment[fr]=Paramétrage par défaut de l'interaction au niveau utilisateur.
-Comment[hu]=Alapértelmezett felhasználói kölcsönhatás beállítása.
-Comment[it]=Configura le impostazioni predefinite per l'interazione utente.
+Comment[fr]=
+Comment[hu]=
+Comment[it]=
 Comment[ja]=
-Comment[pt]=Permite-lhe configurar as definições de interação do utilizador
+Comment[pt]=
 Comment[pt_BR]=
-Comment[tr]=Öntanımlı kullanıcı etkileşim ayarlarını yapılandırır.
+Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_keybindings/Makefile.am b/src/modules/conf_keybindings/Makefile.am
index fafd65cb5..47a7165ab 100644
--- a/src/modules/conf_keybindings/Makefile.am
+++ b/src/modules/conf_keybindings/Makefile.am
@@ -21,7 +21,11 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
 			 e_int_config_keybindings.c \
-                         e_int_config_keybindings.h
+                         e_int_config_keybindings.h \
+			 e_int_config_mousebindings.c \
+                         e_int_config_mousebindings.h \
+			 e_int_config_acpibindings.c \
+                         e_int_config_acpibindings.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_acpibindings/e_int_config_acpibindings.c b/src/modules/conf_keybindings/e_int_config_acpibindings.c
similarity index 100%
rename from src/modules/conf_acpibindings/e_int_config_acpibindings.c
rename to src/modules/conf_keybindings/e_int_config_acpibindings.c
diff --git a/src/modules/conf_acpibindings/e_int_config_acpibindings.h b/src/modules/conf_keybindings/e_int_config_acpibindings.h
similarity index 100%
rename from src/modules/conf_acpibindings/e_int_config_acpibindings.h
rename to src/modules/conf_keybindings/e_int_config_acpibindings.h
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_keybindings/e_int_config_mousebindings.c
similarity index 100%
rename from src/modules/conf_mousebindings/e_int_config_mousebindings.c
rename to src/modules/conf_keybindings/e_int_config_mousebindings.c
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.h b/src/modules/conf_keybindings/e_int_config_mousebindings.h
similarity index 100%
rename from src/modules/conf_mousebindings/e_int_config_mousebindings.h
rename to src/modules/conf_keybindings/e_int_config_mousebindings.h
diff --git a/src/modules/conf_keybindings/e_mod_main.c b/src/modules/conf_keybindings/e_mod_main.c
index 5895aaa24..32815ddea 100644
--- a/src/modules/conf_keybindings/e_mod_main.c
+++ b/src/modules/conf_keybindings/e_mod_main.c
@@ -8,7 +8,7 @@ static E_Module *conf_module = NULL;
 EAPI E_Module_Api e_modapi =
 {
    E_MODULE_API_VERSION,
-     "Settings - Key Bindings"
+     "Settings - Input Controls"
 };
 
 EAPI void *
@@ -16,10 +16,19 @@ e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), 
                                      NULL, "preferences-behavior");
+   
    e_configure_registry_item_add("keyboard_and_mouse/key_bindings", 10, 
-                                 _("Key Bindings"), NULL, 
+                                 _("Keys"), NULL, 
                                  "preferences-desktop-keyboard-shortcuts", 
                                  e_int_config_keybindings);
+   e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20,
+                                 _("Mouse"), NULL,
+                                 "preferences-desktop-mouse",
+                                 e_int_config_mousebindings);
+   e_configure_registry_item_add("keyboard_and_mouse/acpi_bindings", 30,
+                                 _("Buttons"), NULL,
+                                 "preferences-system-power-management",
+                                 e_int_config_acpibindings);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -30,10 +39,19 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
 
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/acpi_bindings")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_bindings")))
+      e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) 
-     e_object_del(E_OBJECT(cfd));
+      e_object_del(E_OBJECT(cfd));
+   
+   e_configure_registry_item_del("keyboard_and_mouse/acpi_bindings");
+   e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings");
    e_configure_registry_item_del("keyboard_and_mouse/key_bindings");
+   
    e_configure_registry_category_del("keyboard_and_mouse");
+   
    conf_module = NULL;
    return 1;
 }
diff --git a/src/modules/conf_keybindings/e_mod_main.h b/src/modules/conf_keybindings/e_mod_main.h
index 0bcac3f6e..e1f013926 100644
--- a/src/modules/conf_keybindings/e_mod_main.h
+++ b/src/modules/conf_keybindings/e_mod_main.h
@@ -3,9 +3,13 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_keybindings.h"
+#include "e_int_config_mousebindings.h"
+#include "e_int_config_acpibindings.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_keybindings.h"
+#include "e_int_config_mousebindings.h"
+#include "e_int_config_acpibindings.h"
 
 EAPI extern E_Module_Api e_modapi;
 
diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_keybindings/module.desktop.in
index 48e55ed15..3e55e0a7d 100644
--- a/src/modules/conf_keybindings/module.desktop.in
+++ b/src/modules/conf_keybindings/module.desktop.in
@@ -1,34 +1,34 @@
 [Desktop Entry]
 Type=Link
-Name=Key Bindings
-Name[ru]=Привязки клавиатуры
-Name[cs]=Klávesové zkratky
+Name=Input Control Settings
+Name[ru]=
+Name[cs]=
 Name[de]=
-Name[eo]=Klavaraj bindoj
-Name[es]=Atajos de teclado
-Name[fr]=Raccourcis clavier
-Name[hu]=Kombinációk
-Name[it]=Associazioni di tasti
+Name[eo]=
+Name[es]=
+Name[fr]=
+Name[hu]=
+Name[it]=
 Name[ja]=
-Name[pt]=Atalhos de teclado
+Name[pt]=
 Name[pt_BR]=
-Name[tr]=Tuş Bağlayıcıları
+Name[tr]=
 Name[zh_CN]=
 Name[zh_TW]=
 Icon=preferences-desktop-keyboard-shortcuts
-Comment=Configure your keybindings here.
-Comment[ru]=Настройка привязок клавиатуры здесь.
-Comment[cs]=Nastavení klávesových zkratek.
+Comment=Key, Mouse and Button control settings
+Comment[ru]=
+Comment[cs]=
 Comment[de]=
-Comment[eo]=Agordi siajn klavarajn bindojn.
-Comment[es]=Configure sus atajos de teclado.
-Comment[fr]=Configure vos raccourcis clavier.
-Comment[hu]=Billentyű kombinációk, gyorsbillentyűk beállítása.
-Comment[it]=Configura le vostre associazioni di tasti.
+Comment[eo]=
+Comment[es]=
+Comment[fr]=
+Comment[hu]=
+Comment[it]=
 Comment[ja]=
-Comment[pt]=Permite-lhe configurar os atalhos do teclado
+Comment[pt]=
 Comment[pt_BR]=
-Comment[tr]=Tuş bağlayıcılarınızı buradan yapılandırın.
+Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mouse/.cvsignore b/src/modules/conf_mouse/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_mouse/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_mouse/Makefile.am b/src/modules/conf_mouse/Makefile.am
deleted file mode 100644
index f3f1dcf2d..000000000
--- a/src/modules/conf_mouse/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_mouse
-
-# 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_mouse.c \
-                         e_int_config_mouse.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_mouse/e-module-conf_mouse.edj b/src/modules/conf_mouse/e-module-conf_mouse.edj
deleted file mode 100644
index 2a3f88838719eb52d371fa87e82a85dc89a6a5ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17282
zcmeI1d0dSB*Z5~dMN(AKqCKHqlBAtG2_+Iy(>Coj)wF6C5>ZNvc5C)jBw9qMXy1`m
zD%z9w<##?a*SLr0`}|(d@AvmJuh;3E&-*%`{hV`Mw_Bi>O$&#^G2w7{1srbUAlS>P
zvhFeHRUk`&Pr&nM;Kq%^tt-Mf9*5if5QpR9rOLVrYCrgkQ!j--L(u0u_&0*h3IhHb
zPeI=RvjBJ(*ej@9^C)OXkU8K3bi4$7U*d3#7QkT*I1UgP2e$-=<3a0WhUS(<_<_9)
z*lN&-^I^;q7_1NZ;Z!jOYv2)q_DYZ-jI{uhf%bCLMnACQfGL4yq!J3#0j3HJ^;N+9
zW`OBJ8|`s7#*PC!0&NDmzC>WhfboIoV}5SHJfMx%w;5yN!2F@j1!99S*gMZ<XruFz
zz*rTqBxu9Fan~@`4lEto;;4;&U{?cs3tAAw3u7=2&sS)(fy7`e71&Q`qd7b<27Be1
zhc+X~b&PGo;dmLKjpjAOm=7?thh?aZeqh6zdC{3LVQmSp*8}4Ojkq7iuK*K<Hj1?d
zjGY7~i}^)hOcU5nVD$GP222b2As_Su8`j0E4|)wqFbIkl*e9<AXcnp$#m^m>6EJii
z7qPx)frUYvna+<NSma-Q;aqqVfzkH%9Be6I*FdkN>)Q?NAu#&!AU=6f9-ugVgv}cd
z4CNKQUktE!h=Jr`e&>O~y;E2;#?U!8VGP9#ip>#VZJ_DT3eJHS-8s5TTdXg{AMX#0
zm4ili9}EooQ~aDUKXqU*52_QmTNs1f;6<^47#U*$aGXmKLv8c}`xP)2(DY~j8ra&u
zm^UzCU?>jUvA){CP#myR2BVIr0}R$fWuVc1LV%$=M}1SVzK}0`rWm_~F^F3}RA*Mu
zjkg4tCt@HdPZB^xfdzqP2MNRaN&rJ~K);qwU}?Zs(Tz6>4Ba_e%OR|<6|j70)6Z)O
z49!PjpkW<2*gs!2XcQa!u)gNNpg#Rkn@#|OxhZ~6F+T%f=q~ANm_IO-)AS5tk8chb
z8`cl)lLv?6M|VUYyHMBox#|4SJs$+NfyS`@kU#v2z)=4a7`p~c12NP_Kd{Gu>4B!q
zi!rE&{3d@fsA>H6fAxiP;YW3nG9G9(5QsB=w08PA8i1V#M!ydtusC4oexpFp*%ksz
z2aR&;F1D8M!0uqo0b>x~{ErbsZS(^h?w3E0#z3oplmROSjmCb0`E>y+M~u>u+P4o_
z-Ct}7*yq1kF));?^nKxO`3L`E9l%gt();xQL+hkxa7XLWUTLugIfT0l4An?<Z}!-l
zHvwCZF%;|QeG4(Vej{RZ``8Uk;V%YzU61Ysjdv3pPZt=-AAMmR>kk8?uh}sEdJDur
z9$<ZWfw@4NK3>Fu1pwm&`2d3E!UKa`r}T{l4ST?S1C|OJ)xvYwcz1!_gZ65W5D-(4
z@4)gwL;T~Q2BY}K^#g-A!tv1U_Z%>E_S|$V7>5%;wT{9-OM-j^24_tf?-@2P+^xV?
zj8$O_;zwXVFqB_D7=t(yuttn-4ycI&e!$Q^Pz=k1C;<yY4C^NiHtbaZ-WQabgK7oZ
z<0W9%5ThFpYKuT7ur*j;Hn8sid-azeS|9jQ`+{}_fw&d;0-7D91nb`f44n&oO@#On
zm<P5N^H~eF8GL@ASfao4Gr)v^(Z|(8VCWpt97$Mzs8@n2&_;WL_W=%SIC{qm?gNeP
z{~ZWAbGTnYW6+effVKyD2Fw=pYBU!5fn5pA2Q(MRZHz%b!Hdx5pg2+eYJsH#qhH^B
zU?6|gad=k<!Ww_))^@NV{sdowro4Ya+ks32dkY$^`4u*=7qA+{=;r+e3}S}jSB&|c
z1O|CcVMU<Vfw%)31x<?sICtD-VCd|*uzreQZ^Ge(P@cn?;j%&CE^tI(+!%WgS|3CW
z7<}veQR~hF6T|$jfJU`{1uz(sl5dTm(On_GZJ;T25_B{O<fRadNqIk~gGTq@4Qv-^
zN=$-=J)j&EG6YTQ>j3t3U?!khL6ktQf<Rjcje%GKNFs<YFb~jcK#)%|$U|UfLBl$6
z1t5VS4}e8s4E0L^fjkgGHu6LL(m<dt2;Brt`F;V7@)q(>2;DilH`MP22-;gNXw(<t
z1Q!cZ1*{k}THk9-s{*UU><rLooiM)8Cyb#vA^&jYz<NQ`?$QEmbznb1(`vR9*f5q5
zx?hyHg&?6IFo!Uz4~RVnfwMzv5JowH7+UW=5bzh?jInyq1|YD1VP()<AZQ(EpRhjR
z1E5j9qJ9rSHUdLyqSXy+uwg&KWYDND>IdhE-haa9F!m8N<OWU%SPJOXAZV<|An$=a
z!Win81ri1f<qR4R`Q(5=oC!A|hQ)Iv*do9nW+>yKe&`;`fX!eG<<4P{6X1&OjFS7H
zH9!P`@q<S9fX06T0_zl!0ZpqLE?~z1L$S+`%_|NzoU@1tXhskr5Okk!fSH3v46P#{
z1Th<oq4Ck4VBaE6plNd?fn5pAA2e-mx4}LM>@sLdodg{Lq5&)wG`eGKeB3W!=x%5^
za{=sWVA-H)cN7kG6);#2^}owNUjwNFR!+x!!PWu>zLZ=>>n#OY0;~-*Z4Q)&P(ws|
zKvTXgKnH`w0viU6Y7&|Y?gHhfC=+N_5HwZ=h#N3Y(6sSTEJ7U;MfXAb?{$=;aMq$|
zF50=EvxNH;-3J=oCmJ8l4y{?#7&JQw8owF@?q1XuG^L(`CV@cyi@JkG=ZE^$fWV$b
zfm7a>s2`jO4i78>H0_Sk!QKHZ88qsP`Za+-9*N!oy#nMD$X$>tz|h&#@|PQIcrIE5
zn)aOyF@;kGhSq@gf#z%mL3?Y#7#hD7Bo$aUXj<-jfV~{pAktV&J^~x9WdbzqOzXjh
z^ATO3^LqmJbsSENb{}ZYFCZqsI6<?5pgG$>;9SInL9YQpKJ6e6fGL1R`$aw-Aeq2a
zK_iBIIzjw^>3~Li>j3Ejxe3e=G@1kXpgn;tMgYwQf_%P$BmzTuhjJhJd;>v!LqT(Z
zARiQW8NlK|BR}NR3nB#UKIqjT$fpnFJ+K0dA)oIcVZbUuqrS-J2Z#tTv<B1{`SgPb
z0{aOXodNP00C@vpxePQT2=W=k7}_gh$Y%&d1N_ifC|;1yFo+hg^`KFlBA*cu$Qf~I
z&?sk+&nO7wjQDQQtRTo|3<P3B9GxGU2l=3Nq47*Xqw$c>I7lEcXV7R~<ns#z?ou3t
z6644R#R<f-IGh8;5BW@jKun6qfJSp5pD7SDZz{%+&osz&U?|qn`jF2I2*i+hF2<10
zEC|dgUIH4OAM%+4c>t^tG>RAGGY<kWB#vSSG32uV0x=|x?g6a@`7DA!9EhX!qj|vx
z4+_~Ekbz<deDKIl1cuIpi|T`40ygyBAP$;?>VszhI|JBu%ny9<OTiWbwjVUy9rD4W
zyM7PM3}fJfNB0b8w}Av2%>h1mCa^_-oyPpY2hR*P#L$LV&~OIG2frNbH^5+S6fejJ
zkM@n&LyUnB9_?ELSPp2oOXPz`cd7;KC1}_m^1-9Cfblm}gI-7V!LI^40a!0+c#eGV
z=zQQVH=y%F{lEv0&IpZ%&K8XaK6n(ff$&d@$REv%IJ!T$O9?*Es2@5TI7bvi5}PnT
zv_DR;m4PXOMsuLEhVw!5N@!pVeDG_*z79+eG+G<@;JLwu7?L=OG4R2|ekk)2L8I}(
z2hRgG#E^tHXmloM&%9t~0t>+y_~6l6A%-L_fJSQpA3Q(UH-W{0M)QIX9_1t05;s7j
z{eur)0PI9y*`U$dzy}ZaNa<S&8tn^w@Iqk2JxY86jr_m|FAO$tiDA&_oWRD5fDJLU
z5fp`i4_*}PFktAsQD5-Ei-8S#;|9zReDLC6!?+ujK%+ANA3S;v@v>1DG>Rec!AoFF
zA7kKyM-ys*pAl$um*9g(_oW5Q0yMf?@WF2eI~JH5Xmp<7gO>z50a!R_bXMSlmjWB^
zaw9rFbf(~gmj)Y+cMUWe4}9=4U_%UT%mR((1s}XD*bqY-3qhk80w25_*gJrI!2G}m
zFAp}v(8gxaXb$kfZvh+4+l4XYgCkly5M}M1Eo_NoSvi~)$;pXm<zY{9L9O2yIT6St
zPj@RKncBm~-ib)D2)`}aKRZ+USXsf4&aU9>j`JeAlVM<-4bj5G)163wHqPFP<Rath
zVv8fXc)0uGs8bL;d|in&+ttF|!Wn08joXdZpo<nt*k$hyizK=G5_VI%q0aWOvj5~l
z-2}nfo;n%T$H2nfgP{F;um5F0%0U0E6Wu9M#-(`wgARmpU^o{GXCjWW2cnG)EEMNV
z@+1=pL@!t;8Rt%Pg#)0q>}_30a27UB7Pe#@*~$V2aV6Qico5wQ&LnGSz)tO<vptz$
z??Sc*V&!D-O7I{N;7HJ@7Ea*nV&MT}kX$?n&O|s0D>BZSXk+2&<bfl5z#|#TisXFc
zTqWf&;$`9FNyK^ClkF{GN_Zr*9X+&gf(6O=VA>aFWA8(>mhr~49nRU_1zPAY*cLv>
zhQD?&DA5(VQIszXCr=rS><YV=0dJfIW?I0|R1-F40|DSpbdr~WKNcSLUPOY=Uu|D%
zn`C1{CVJ4GVlC{My)})4MPXb18jr4xJ*OXUiwymETV!bCQ7m8TjRM43lH9F{?lMj^
z!<}Y$&<snO;X*=5;RJ`~<Rn9OCXqbssJ1JKOn|+@f+>$s)54NWYtlWTqqIKgE?_uX
zAFPS`U?%EAGhJ-qQmNC!Ia^p$ZAwT&l9JqI+))gJw#Bq1rY)!%j*Mnt9$REEmn|}w
zj{?m{fi{W)%|`)zJcvFXGGzOckO|1Lu}Am!+w`TH5E?X!Od7TD`AxyZC@nN8V^AB|
z6Sy*J;h+u*P2}?jBSO-U?a4S>cMEHKNJDg^zipI8aFG83X#5eBzdiqa;QLpP-(mHq
z|L^#s$8<sI^T#lB5B?ngccA|5|9gB(l8+4Sl>W7SAuN4lTrI4v?OkjkN9kK|fEJMd
zGIk_qk}c7N2z3f0v~j4<e;+r+``@vsPibvmy5hQvNVamfcSUa!S}h`21H)OnTi8-Y
z@%h(8Wdm;f_aiHkCzLWe;QQ}0iZ5N8>iZY4v3G%zY5i|6YVAb`y(@gFwbdC4q`eck
z{=04*yl$XIySkHHQQd<2_S>|>OiI<GQfld=?2|xpaiZV<zb_Z+>j07wUTN-D6zybB
zhRRHB5GV~=okern{Z%4qnd)reimH<<yhdH2>{1#~uI=Fc0u6T(3TlEC><`K+jrjbw
ze1BUfDHhxda>B|JGA*23?JOveG6n32(y+9!a<uY<az>#tCtaN^;KZm68xp*+uo?*!
z8nb?vO3Ld{25Z9m7rne`&A*&2|9na-p?`Ftz8<NFTHL6$m5$J=r4Ke7#f?@o|A44+
z{sE{p_dkq9dkOq8)*ld!^#`EVV!E*`C>5Cwkg0W<j!>%ezaJiS2}J$sq3#F=FB7<5
z>fhf9^PdukmIHr&VGz;h9rkHK{m%F|_z4CWL0@H*Ou#vLS`es-Obu`%`Us={sG}@+
zw-4nT#OdGfC>#`E^jYFW`9MNB_uqY=VV`i6adiLux<juZ>}wQEC<!u#yR{E%9?;ph
z8*3llee^J9>h9Onq2WWun)~+Y8`C*y?bFxR!`eEA`bGwrt)+jI=B26idsrBCx8VWJ
zeb^&Z6Ttkv7Rp-xK?(i)yNQ~kzh9cv1pI$Z*1uB}%gsOXjv6pnO8u2X|Ffj|k16v1
znGOFX@UgI_4^lE+$o(Bo|D))kJNf?{1^@lk(_i)9w}?vK|K1QPCjWaw|Gt*~H-|iA
z{w$yWw;ZBWBlIr?KA%iuza3!E<UA9`F4oDkd<cGL3^$szI=gv?byYEp;0iWWRCy^#
zWRzD{#Y>WhQa(N``L<0f^z_tPt?eg<8rwC5%^p4-6>XMn+97sSt>o63V*{jY``2CR
zxao+f9+I}$$?NRbmo=Qb#+$|L#ypx3Cp4(P;ADHf+TKUZbh_!l^P;8m<#o|gtF|f|
znVf$cXmfe1ePFJFw#kmAwhl*BY_8=xHN@RGZkVi>obgn$N<t=mN~?0OZq^f#jy09{
zE*iGWZ?wHSbkOa&jZwj=ZTH0<iMTZ;8Wr-cIduQn+vbCTs%{K!qHY}D?KijxyNJ8o
znEl2sch_s@$g0GMn0IZuDbLH=cTa!$>U}7XZPTFmQ2m296IOf-Jqb?hc8v(F6kcf+
zvikJF)AAKOI@L>Gi@m<GHB;I@@gKENxeIb(a*>aNAD^>2aecC`=7AUCHp>$&Zm-x&
z_7~q39VpG!l&#tDjdXBf+qdBwmTbLd^T_d`m^OwVlTkCO*XJYcXCyZETsfa|FpIp|
zOVfLVH${olU+<NfN87;>)lr6votM={^jqo`Y>E!v^6p~m(zjgTp54+ZcxvKP%izNL
z2O98?KuGYIfcpLO!4H}+xf*%Sm<r*wwASpAC|tcqLfFILm?ryCYp#P*eV<HCX9c;A
zWt%gLg^aiP4Hqiy*nEmJi~EF*xA{RHW6i0B-nnQ#frNt|Z#});ZL3=2XFsX-_P2i+
z4pj13xk>J3anus+6@MGX`$H_Iz6zEY&5kV=GdZ3J>&_2f9c-pP?$(rU+WqsB<I~Bm
zx}e5uU!J`)ZhzC#Qu?7@VeXSJImuXxaB{rL=-J$SZtSyUlj+i=s@Cx^V!IR}cYI)O
z`saa@2U7iOT3dIL8}1yGJj=>wv#hCMcm3(K+2g7n%KaDDskIiDe(1mKH~gGD85h4e
zvEP5(OE)6?%F-o~Ou;XGRX1%jG3>GuQxrasd)Dbn<9(Od{zq5IZ66%#>>VZVPh1xL
z6(2gaC)i{z&ZDDnWy{C9I?H$SlaG|ydDhOXfBtT_b4*JabNI)#GPR#yi|w#<Z0Cuz
z$_=~U+jV2+iSDHfaSd;_>*^oCt>H3^S@X4AVnL+2B1v>&VnXn0!n({*Lc%<wN6k0Y
zy4DJ*z9PRS{&S(u-No@IL`$BP<vvUzevYeLlO?_@B#6YuVpKh<*ziwx+L9rjj+B(t
z&B{FXKa#H|ifjsB9?dBzaZOnEL)Y#L*3n_5&E2Ju)y1rNT1@Ylel04pxn~GoYN)Tz
zc`-i`oB!(9sV@H9-J>f%7wArp#>Fe`UE-f#l>5(*eh2YQGDk#4d1vs0`ipzcUo`Zp
z-luC=@H1QCmYkB#3ioVrCCNkCb@gJ>%DVPZ?0k}LwFlk1yWV#F=o)YAtG%&sYF3W%
zPD!KM)+7a6zLulMWrMy?_f|!*IPa@E=lQWfK2MNO%;S)p)A|jjDeK3Yj*~V$dG>Vg
zKMv9F@w#sE(W?Zj_v&44t?<}XRvFhdw{z1bsi?Z^TFET8gk<&Iv$Msd#dk-qStFLp
zi<4DbELgg9-|9EJxQ9xY=OyymZ4*2*ET5=MHW8UJOP38h<7Bu~dm&d->(t`C$G%pA
z-aXkPHStFLH%rc{e)+<%W1w#kU%I6HY-VqLkFT<!p+S0He0<y<;<2k*zV>%HwZjUM
z`OEj{g))Y(;pULcs;&J|Fcz2ew!F4euq2EvEz&QaH%nuv!E38|fpz(7mv>&f?3f1%
zSLYU$CGpnuyeOD9=~18A(XVk#_cFhVmy<@AQoH{lui-ZFFQzGV4J{kLiO;uw_;Bk*
z_Fjj3_io+0Zn#%(Zzs!ibnN9#<+{2fA=|@mGmf0eNcGoh{c_@^qMY2(pDd2)AHG=E
zo?4dj`Pu89kzY0Y6EjH$3kTYpzpdvAlz(@u`*5KCx!8y+yX<$#Y(F`Er!GA=_sH1K
zpW;jtm7$sOq27AroShRbR)!}GHa=CXSkG#B$W)Yz$YprWQTd~Cbab-FsN3ioj`cU5
z_yi7`xRE_oRouUpB?StzZcQ`xdg(QkyrO4R`s;oI)4KlSoebk{Y8l_QeJMzN@Z+RZ
z*G_?HRn4*NEjROTnD#AJEPwv|dELdlzVF{JhcdCfAMGyv7Hdq1&CT8BSy=F7-{$v{
zH?ywk{^;ksbuZiG{Dr;g#;G@N-`4f_U$WKwz`1x<zHP;9twow<siQ1*#YZixExry9
z7OL{k_4U8%CtP9eH;cL$WSTLhu&V6%Pq&F}1GY0hH&SDioKlxtXNZet+UhzU3Vl-C
z+#WdVTwYOec<1E6M^RH#(=|Lin@9ztXA5TA{M<R+>gqpB&Q1=;Uw<uf_t7cY1|?lj
z&y*`yuIQP$gxtJE+@qxx{YFH>;DT+M?~#FlfdidI#{}(5(#R`Y+RDo8zTal;mz8_e
z{4(!IliKW+2LUsijy;=D{>WKiCSp*3>}PD`<mVk110q%pOMUedd8XcMbcIuo=?DDZ
z$N9p-Leq)C&l1B$vyTSOu8IgBImhg&wp7~ejJiS0Shjngfz<x}4-F3;k|mxCo14?p
z)vx|hk5h|cmX4Dp$gEwvmK3txvAbINNuHAbcrDYytDTD(enWA}IW{X!`uHyx`u3EU
zicj6*<_!9@Q+(liWPKB_ZL0lb@;K*I;0_1B+$-0M6qUA>JxWnA5-?vm{<`Xka`icj
ztS3)6y}iAcuUvU$cIYL+EMQPk*|j6s!^1;}J8qAam4dtWOGe)Yp+jppE^~Boh$|}_
zHU48|)qOZ>QCU%Q^rcr@fyk#{xki%2_nhjZ6BE(pF{;*eH^a9`+imvmv~R2yzvfMB
zKdEdx))W<U`QDEctNZz<jE%489oM^XKE&p$%BSQ70X}YtJX;<Gn~0W{mX7=l<>TM$
ziK|blySEqmJsW6ys<&c{C0#S7p>f+r^|IYkcD!O6#Ps@lq<vogIyU~HZK@!Rm#JiA
zUQ_;aiOk$|CzJKele=3KUC&R=PM>=gpK&TP@>xZa%JJ*9rM2yfNsj)q>b*9%@3zRk
zuQn>&Pds*aYg6+Fv#D7f!GN1n_xXMLqSE6eS>Ih+|Dj0mh2MvPk2%E7*JswOUArMA
zCFNdxI-|6-v!OAQ`o@PEGL>PBJnt9m?|$FHR<xt4;bwR5RI#*@^cRkTz?6zqMQxj^
zgr-c*;HAZEOP0*V3LIi!ur9xNfzkc*w`9-7DyyLQ(1k}r`tQ$QF!->ymb-bctzTHz
z;`fZSy+%f{=YMiZ9@)6iV9}cA*7fzPSYTjahl2jv8<PR7S&zMk&Awh-)hN1E>FJ%L
z8>OYg7=8CL^t`R9G04i!E(rE9S;_inYTez;VP1h3-{)R0dl|2sW4pN`QQ7pnoYl#w
zjT#(gEQ!2AY;E4v!D;>OO#+i|1J9nHk3Qu;A{+O9Y|HpIqq?@HM`NGMV<gV-9yT`q
zpfX$_DkCGammwe^;MD<**4Ea;G70KIMXjFArkhu_Xg}7m<TnUS<ZU{$rF^$@MOoPq
zMfZ0RS8Iy9*vklRD_isWW_aD}@*HhvPRTs!*Bl8oZ`gHl_?zumwa%B`6D2LOIt!Uv
zZMLN5bBRS9z9VIqMcsciY?_|xj_j<LcApxth-GkVKUH+#!NZ4dOG>nF?@zjIc@0;%
zrJs>d`l+S1_U_g@j~>NFcNucAM1(coA7($q(aqAgd@i#Ff3|RHpq^mg`e>a0^f56R
z_s{9PU(Ih<R#&l0PiB=q)Y3o1a=cm8>+|P?<_Qt*BGC-}v?HETs;g&@>*(lwW4cpf
z>F6kFW@fg<u}R7zqDH?@wotWjWO2vWGcpbDY~CEa$f+H=q~YDoo19HrJS59#fAP6%
zKhLYU5PqqCUW{5b9?nyrad*l*^Jl;;A#s*#am85XWyTSbmUKUSU^50hAGsh~WUx?t
zLjUE_$L1k*#SIOIzjyZce-P05m^#sZ=A?nqvE}Q%_Sovg-@9lO+mODmkx}rggPz_`
zw#?J&V<$f)E9VrIrt$L(@9cNDW||h_&(17(^oi@Mj=9do_?E>j3lAR-zGphRsJ=Ky
zzQ#BZ_Pu)`{NrcKVc|r<soB~4{p0wiYSo&1S=aEM*NmrQnk0=6AO6t#{3pBmk?Wc2
zmQ9iN9RmX=?tjqtdoXG(oxbXmr`m?e@Aan+>vs(IN;(dm2nc6vj|`d#nhsv9Uw9}z
zIMOcQ`z^LPip{IsHZ9=x*7W&f+&;Hg-MxEvv&>P37L_qxPlsLVrpx#H`FWei4IK2m
z%qu4$W9EM&V!fl-+Mb@Ipwo-4Q%0BG4UXk>eM(#OR5VvLSLfWSXwbNuKp^>cKF^SK
zNI&`V!gShnX14lbV{_eNQt?aH+#xOgfv9GJx|rX@K#acH^sa9VRb>_4D&7N}YPT!H
zPmZ&3b?kF)(e^4fPGDHawEkRZPtOrW+18W&o8@<@pGnQ0W}3=Ti_m-+UX=W7LMb3U
z(lNbDkI<oLX~O=T>CQUy$l`^*#Z+GhjnE6f(tc&`8QgYs@rOfygH!V<KW9?^VYQmi
zIUI#Unhn#<-{vRV1<S%e9{c#?SA_RFRmF6H<di!MWE*L<$hrIuhQYx*%PXC=79I$f
zg_0I=K||vYE=K$lX6MhOQa|+d{n3m<*mmTep+j>4Mwxw~fz#!s0!F;96P*L4^J~42
zbG7sz7PW0`Y}l(E5c)nuI?s4ULq|s`Z#-SrXa6Mu<=fk{w*^jhhTZAsF$|w<><Sq7
zZQ48W_G?vtYwUQidM$pT!SiD_u`h$Qg(ZbiXN-TK<5KBzpJJ=)v+*xl75RQ9_Aq?a
zPyM<tt;5qndto4Eo}Hmc&FqeG%(qUap%Ry$maH9f<SfR+l1bZyj&SiNHu^U=eY)n9
z7qoc)o`Ap(pFO{H24Zt^avG)fd`UbwoF~~aaN?XQ&##;F`T0>yuhNu*Rbwt+7Irv0
z=sSL8Rmb+0eY;GZLh|L6*4IzPG*|Eh6beq;@BGfN(4n6i(if)4I%P5@;Y}h{t%#9V
z*dOiJ+^Q(I$T}X}GHO&}=1_gcq^#}C^u4tT``3G^C6AU_47bhKbf|t~8~1Z4PEH6h
zdzp3Zpvm#$tCdnV3wm8=vy>hj7&xo{^iE*Zq`XUV_;wYQ>x_Mi0{l#$W4A1n;+1eb
zH9sQW#kOu|kS}$dCfxT{>-Zj8-Roc0J1wB5(=OqyU#+{vH=60BlK1oOT%-63jdA>t
zlB8TSIajuHXZ6*hf`T=7PN^G9s@~Bi4Il9BuHh^5)M<=x?Rv9ZQ6;WJp{~9@R{wFN
zwRFe6h82sQsi*z2mTx;^Nwk-#y0of8-T(b#3x`aG#CDau{;{R0OI|!av{TP7+L++N
zW-zbzv}R1mdH*Fd+<Zv&Cf4+;@e<DMO0uH2t*<BDmom*>7Z~;NWv|RGnT^rW*DcRj
zCO`iyaz6OAR;u0^GOM?`bft8*RjJI^(>L7bD!Vre8Zey-P^cbf9b(~Q*ICxWRh6Q^
z7f6!M<#_O>s;TGm<(ZS0I;vGC%$d3^cgnFbzv?%0^LV@%cOrC#oSL|Jd%QBJ;dD{;
z)r5&#DR-G1g%vxl<}XoGs{L|N#bnN<QwrZ_x{Z+(CGz#P*1*o?Ltf$jLTmvlev`?`
z{w<1ZWk&fj4u+xYEHa;v+9mgfm4ro>t?meAQ#1G#t(bG`mXZBLjW(O5l1qlUt)uj|
zBXPFlzkUq_7B4iMeo1P<CG(VoeCg@2u}$bbw`n0TVfWQ`|0{*lN>%~UrMoKZ9%-rM
zEGVdt+q2)9ipfv9f1zu*Yv7IPL#f4*E#<EkWZ9;rxI2dVKVCf+z0BIiTDVA|F;JE(
z$A9nM9ReA8M~<xONm*mmyRJKooul-UKn%kju6(b7sApM+z7<JHIY|z^HA+qy;B<N*
zEw6qwt%gtj^^#=93qdCYw&zV+%UH`WGbYMu2mLT7`N`mNGcNK>I&gP=dB!FjWIQ6O
z<lT~3eTboF-wd1QwZZ9voEXud9Cju@6}#^jQhw-lRJOm^(m>+>es`);QhfhlUQBd!
zqf4aU!@RtuLI($*Z&AoGifCw56q%g7ZoEA>xm{YtfQg4CQf=m3*I-YV(4|$m3D-(5
z+<JbDcTC;;ROmOfssxt1_@GeR>bZ4MEd0f!pBV##PA_jTR@_f58yuev=lH^@J|@!I
zdgAb^hOOzV8uoNw%6sindPz~Ya_fgUnb^Z~k1mI_`%E1--r^&%LCi9ZJJTz_wl-@G
z7mxJk+})dZ?S9)aZ9SzO_nw1ztA(le>-!1k)!A(G?6w)<Lk*wJ?ED-ZFJyMkYPN*&
z1T#&WmTRiZFH7JcF`6;n3n{sw6S=TvGAPwIRr%8B{@Km>r}(C8+oua|<GVvL8^5_Y
zs%UQ5_t=7Tz00<iRjJHtAh5o+H=|~v#lH0Io4f7GBF{qo-gr%Uop$=NX2a^vP6vVj
z7nitqYnI8|YlSJSW46NXC998l_E&BmzM6EA`_Q3o!<IJI$*QS^O-upAm2&umRjte9
zWE&X5YK;T&tJ?4GY##2uG+*>^YhDFgi?IR66nj@zq{_q<2eq8nRq;75*7wX6Z%Poq
z_Ld`3T_#CeD}DKbKJI0ZVQ73)p;+Y3xhSdQFP7#Xd=r<?qE`LSbpC}L2KOsUGwBY`
zhdw!4@BC2|6EpaIwdmQ*H}iFAnGF*@--};O)^NXDvI=Kq$;!Us3VwFv6vw-FR*TDI
zxLd!>jumip^P3OVS28sO7m7~zyO%ENyZ*y5ryi1E(e!O7QpKQZzTr&ZbzI@mdY<O0
z10xD=^719g_ioI57I@xP_j=#Hh|(=gflP$`C93X=+A0ewOrGhBa$yExLLHICWZb0W
z!{XI%T67N`ipj|{wyQOsTsJ$w_4Lyo)^*$w+%pU2t>vHJyxEn0zb-^UYOvgA!*KY}
zfsWn>U9DVR-jCCSnvS&m>QHQ%%^pfF6-WwvZ(@Uwzy*eD*S}&Hv{}B7v4<gOiB_<s
zIon84YTG&4(u)eJVJF-|)QX>nsNQTM{H)la#kw^=GVF`2yV8-?ixDf0*w{?3en?Mx
zn62WgvP0;SlT@d|ZJ&q2{%=g?0t&0GjO)Vvj<RmYSM<Id*Ia*R)9faWV71lEBa5-A
zj9vI2LAa?s1pVQNt5-ih4<CBOoxlR`)Qi?dHyK0Sl(uf=)Gm?lu)XP1S7k!bYkQYh
z<(Qn$uw>5MJ5<2Gw=kGV<7IE5S!JkiwDPI;-GuH*GltgX518sg)^-SuWTmFI8ON>d
z>Fv0|?cteDk~>mE{`L6_a{+7PoP)WXNy^3a(D3lpi<1m)E~^NS!wA!N16iK;u5{R{
z*gIJ#dlA?6In%RmX6etRvl|6FPId?gtt(sd2{-gj-++bB@jm%b4R^nTW}10Wxj^XC
zSo28TfEK@sH$QW1OCme;5?)pDMy~f;npV1=d%l{>+<zglb<{JSzu}bHtLNtfPOBF0
zEMWG*nLjFH*b!V(+%E4IG}txZkvbp!Xl=Z@%^Z7QNs+d*kKi!zQV??j>*FIoRWfs{
zyCok@)pV8MhC7l6ndOY7@B)llc!%0m1((d0Ee_j`=?^R}F7r#%9?UCl8A%>+TdUe#
zK6?9hX>CkS+hcBD_5`*(e1-N*F)3Wdr8hd%WJKVq<kVtBRq^3qlPEnob{1>gw8rvc
zwa{~nsZ2wReLDVv?fUz#b}z;(T*_S3WpciGf0->wqL?jRkiaB`D<jLhs>*SUEKM+8
zcc>xCWI<{4-QcQ|b|!LOSMys)YbtIm75q7~QG+c#aPb4wl1q!kBJI|*oKuaQQ$g>I
zQhxb-+8?FoP$I{Ewvo91nlZatu<NslM`jJ|d$ar0nC&f3jB7>bEN>fM5@4DqdhCFL
zTt#VSkiZ>5ud(h+Q3S0$>I3f-#;V_st)KS$7N+wcE#cGqV|a#5*>k7jWUok6>M)NR
z9^9+&>`Cfr#fqz0x91mr)fnlCKQI*PvfiI{sjbRo_sWuAO~&54$*rZ<Mb%e2-(B5y
zP0{gF75<VdBZszL()GQ}uk~dHTNCBAzRI&kxpw88S9Cs_<6OYVwkp#3JBOp8SM$)X
z&c2<=#i6UWfA?M7Hpe$+T5&Y<`HT5;T}K~F5syD&Szw)JaF(`;^!Y@d7&-9qby=}%
zXh_Jbk0nV-40{9_x^A$mDV(cb`le!!KYP;Z*ZQk*b)O>Gx3NS$Tt+m;ecWlFsH`!w
z^>hkjUC^3q>e9IPOn1rnx{RpSS1aB~?U~3H9uJuwu=8iP2_8|<a9W@KRe0m#lBjK`
zUJNovRfgGA3lH=JPrrz`Ge@=?I~j3js7B{d(CYn#_{2Hl)@ez*x%+nh+IIqQp8v?2
zQI|OVy0}<~`AwBTTPwdt;${4jV1FC-wB_e5{B7>=3aN`T?D?tjQC=gF@AUyTT-^x+
zH*TTIaBDS5_8g(BrDx^XDr|MS$wI9$UHF^J(w+E(D%qY^<I2^zgkUv-vTJ|h#OBxb
z!~e{<Qo47UJm*=C2OS5Tn%xHrEr<D(PO0pETbMV(!^tx7B1>v1-`ZVn!bc3UcAlA$
zI~jddesPW=Oj$5vgR-tZsl9Jcfg#`CyQytOS-YlX!|l@4yLYY)7}p&4CcNaFuWV-9
zMHn9!<9NAg?CWS==kgA_2c;Wij*aV_`@j``lApAlAXaT9Eq*xUyQJLOaQ_f;R`=5G
zf?K$~0q5jXiSK8Zv~76AJ{>FDvA1jUSf-bg%3ZFz_(x=?_$<*i9P9eO@JcIf&n@S>
zdz8aXL9w~3rN{A>%_siji(co4g@(k2+?~89KD*-bndg}qnALr@hB9k2mjp&UOuAjt
ze?X$Drc=A+M!>~BIoln%Zzr<c;~2N^`mp-7{I;n5tSL2`o+`PoGVFGW_L95!_XcW~
zUvF`Jbk-vOwMtAzNr~tFn54{-l7kvaCVNJeI0?H(pFN3C>9UM(-!_}x(YUd8G4ox(
zgXblmmTfS+?xYmEtyYXTt=xC-nfnKBxSdV54JY)eRn!LT8I^r@=J3uNTTgpbOz+L$
zSzalkwMuKl>z!IWmr9nzbzMBZ!A#gp+>Gp$HlTl*ZDZ~w=POCu7H~GQ<$nJMF~~3%

diff --git a/src/modules/conf_mouse/e_mod_main.c b/src/modules/conf_mouse/e_mod_main.c
deleted file mode 100644
index c62ca8c7a..000000000
--- a/src/modules/conf_mouse/e_mod_main.c
+++ /dev/null
@@ -1,45 +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 - Mouse Settings"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), 
-                                     NULL, "preferences-behavior");
-   e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 30, 
-                                 _("Mouse Settings"), NULL, 
-                                 "preferences-desktop-mouse", 
-                                 e_int_config_mouse);
-   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", "keyboard_and_mouse/mouse_settings"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("keyboard_and_mouse/mouse_settings");
-   e_configure_registry_category_del("keyboard_and_mouse");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_mouse/e_mod_main.h b/src/modules/conf_mouse/e_mod_main.h
deleted file mode 100644
index 784a10b6e..000000000
--- a/src/modules/conf_mouse/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_mouse.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_mouse.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_mouse/module.desktop.in b/src/modules/conf_mouse/module.desktop.in
deleted file mode 100644
index 74a4898e8..000000000
--- a/src/modules/conf_mouse/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Mouse Settings
-Name[ru]=Настройки мыши
-Name[cs]=Volby myši
-Name[de]=
-Name[eo]=Musa plirapidigo
-Name[es]=Aceleración del mouse
-Name[fr]=Paramétrage de la souris
-Name[hu]=Egér sebessége
-Name[it]=Accelerazione mouse
-Name[ja]=
-Name[pt]=Definições do rato
-Name[pt_BR]=
-Name[tr]=Fare Ayarları
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_mouse
-Comment=Configure mouse behavior.
-Comment[ru]=Конфигурация настроек мышки.
-Comment[cs]=Volby chování myši.
-Comment[de]=
-Comment[eo]=Agordi la musan plirapidigon.
-Comment[es]=Configure la aceleración del cursor del mouse.
-Comment[fr]=Configure les options de la souris.
-Comment[hu]=Egér kurzor sebességének beállítása.
-Comment[it]=Configura l'accelerazione del puntatore del mouse.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar o comportamento do rato
-Comment[pt_BR]=
-Comment[tr]=Fare davranışını yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mousebindings/.cvsignore b/src/modules/conf_mousebindings/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_mousebindings/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_mousebindings/Makefile.am b/src/modules/conf_mousebindings/Makefile.am
deleted file mode 100644
index a95e63ed9..000000000
--- a/src/modules/conf_mousebindings/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_mousebindings
-
-# 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_mousebindings.c \
-                         e_int_config_mousebindings.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_mousebindings/e-module-conf_mousebindings.edj b/src/modules/conf_mousebindings/e-module-conf_mousebindings.edj
deleted file mode 100644
index 2a3f88838719eb52d371fa87e82a85dc89a6a5ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/src/modules/conf_mousebindings/e_mod_main.c b/src/modules/conf_mousebindings/e_mod_main.c
deleted file mode 100644
index 0c3c51386..000000000
--- a/src/modules/conf_mousebindings/e_mod_main.c
+++ /dev/null
@@ -1,45 +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 - Mouse Bindings"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), 
-                                     NULL, "preferences-behavior");
-   e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, 
-                                 _("Mouse Bindings"), NULL, 
-                                 "preferences-desktop-mouse", 
-                                 e_int_config_mousebindings);
-   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", "keyboard_and_mouse/mouse_bindings"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings");
-   e_configure_registry_category_del("keyboard_and_mouse");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_mousebindings/e_mod_main.h b/src/modules/conf_mousebindings/e_mod_main.h
deleted file mode 100644
index 3843b705e..000000000
--- a/src/modules/conf_mousebindings/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_mousebindings.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_mousebindings.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_mousebindings/module.desktop.in b/src/modules/conf_mousebindings/module.desktop.in
deleted file mode 100644
index 31c9aa660..000000000
--- a/src/modules/conf_mousebindings/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Mouse Bindings
-Name[ru]=Привязки мыши
-Name[cs]=Zkratky myši
-Name[de]=
-Name[eo]=Musaj bindoj
-Name[es]=Atajos del mouse
-Name[fr]=Raccourcis souris
-Name[hu]=Egér kombinációk
-Name[it]=Associazioni del mouse
-Name[ja]=
-Name[pt]=Atalhos do rato
-Name[pt_BR]=
-Name[tr]=Fare Bağlayıcıları
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_mousebindings
-Comment=Used to configure your mouse bindings.
-Comment[ru]=Используется для настройки привязок мышки.
-Comment[cs]=Použit k nastavení zkratek myši.
-Comment[de]=
-Comment[eo]=Agordi siajn musajn bindojn.
-Comment[es]=Usado para configurar los atajos del mouse.
-Comment[fr]=Paramétrage des raccourcis souris.
-Comment[hu]=Az egér gombok kombinációjának beállítása.
-Comment[it]=Usato per configurare le associazioni per i tasti del mouse.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar os atalhos do rato
-Comment[pt_BR]=
-Comment[tr]=Farenizin bağlayıcılarını yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings