From 69fa1736c00e627294d8808a93c6334154cc3601 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 3 Dec 2009 04:19:36 +0000 Subject: [PATCH] Fix a few more config dialog window class problems. SVN revision: 44159 --- src/modules/conf_dpms/e_int_config_dpms.c | 4 ++-- src/modules/conf_dpms/e_mod_main.c | 14 -------------- .../conf_edgebindings/e_int_config_edgebindings.c | 4 ++-- src/modules/conf_edgebindings/e_mod_main.c | 14 -------------- src/modules/conf_engine/e_int_config_engine.c | 4 ++-- src/modules/conf_engine/e_mod_main.c | 14 -------------- src/modules/conf_exebuf/e_int_config_exebuf.c | 4 ++-- src/modules/conf_exebuf/e_mod_main.c | 14 -------------- 8 files changed, 8 insertions(+), 64 deletions(-) diff --git a/src/modules/conf_dpms/e_int_config_dpms.c b/src/modules/conf_dpms/e_int_config_dpms.c index 58a7dda83..4e0ad2ef4 100644 --- a/src/modules/conf_dpms/e_int_config_dpms.c +++ b/src/modules/conf_dpms/e_int_config_dpms.c @@ -95,7 +95,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if ((e_config_dialog_find("E", "screen/power_management")) || + if ((e_config_dialog_find("E", "_config_dpms_dialogt")) || (!_e_int_config_dpms_available()) || (!_e_int_config_dpms_capable())) return NULL; @@ -110,7 +110,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__) v->override_auto_apply = 1; cfd = e_config_dialog_new(con, _("Display Power Management Settings"), "E", - "screen/power_management", "preferences-system-power-management", + "_config_dpms_dialog", "preferences-system-power-management", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_dpms/e_mod_main.c b/src/modules/conf_dpms/e_mod_main.c index ba9a346e6..c32b83382 100644 --- a/src/modules/conf_dpms/e_mod_main.c +++ b/src/modules/conf_dpms/e_mod_main.c @@ -4,23 +4,9 @@ #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 = { diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.c b/src/modules/conf_edgebindings/e_int_config_edgebindings.c index 48aded601..54b754c55 100644 --- a/src/modules/conf_edgebindings/e_int_config_edgebindings.c +++ b/src/modules/conf_edgebindings/e_int_config_edgebindings.c @@ -93,7 +93,7 @@ e_int_config_edgebindings(E_Container *con, const char *params) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "keyboard_and_mouse/edge_bindings")) return NULL; + if (e_config_dialog_find("E", "_config_edgebindings_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -103,7 +103,7 @@ e_int_config_edgebindings(E_Container *con, const char *params) v->override_auto_apply = 1; cfd = e_config_dialog_new(con, _("Edge Binding Settings"), "E", - "keyboard_and_mouse/edge_bindings", + "_config_edgebindings_dialog", "enlightenment/edges", 0, v, NULL); if ((params) && (params[0])) { diff --git a/src/modules/conf_edgebindings/e_mod_main.c b/src/modules/conf_edgebindings/e_mod_main.c index 36b44e2ff..9d4c8b037 100644 --- a/src/modules/conf_edgebindings/e_mod_main.c +++ b/src/modules/conf_edgebindings/e_mod_main.c @@ -4,23 +4,9 @@ #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 = { diff --git a/src/modules/conf_engine/e_int_config_engine.c b/src/modules/conf_engine/e_int_config_engine.c index 08346ae1a..62fe4fb14 100644 --- a/src/modules/conf_engine/e_int_config_engine.c +++ b/src/modules/conf_engine/e_int_config_engine.c @@ -25,7 +25,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "advanced/engine")) return NULL; + if (e_config_dialog_find("E", "_config_engine_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); if (!v) return NULL; v->create_cfdata = _create_data; @@ -36,7 +36,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con, _("Engine Settings"), - "E", "advanced/engine", + "E", "_config_engine_dialog", "preferences-engine", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_engine/e_mod_main.c b/src/modules/conf_engine/e_mod_main.c index 9e7b756db..deb64367d 100644 --- a/src/modules/conf_engine/e_mod_main.c +++ b/src/modules/conf_engine/e_mod_main.c @@ -4,23 +4,9 @@ #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 = { diff --git a/src/modules/conf_exebuf/e_int_config_exebuf.c b/src/modules/conf_exebuf/e_int_config_exebuf.c index 2f89346f6..737a7e7de 100644 --- a/src/modules/conf_exebuf/e_int_config_exebuf.c +++ b/src/modules/conf_exebuf/e_int_config_exebuf.c @@ -36,7 +36,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "advanced/run_command")) return NULL; + if (e_config_dialog_find("E", "_config_exebuf_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -47,7 +47,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__) v->advanced.create_widgets = _advanced_create_widgets; cfd = e_config_dialog_new(con, _("Run Command Settings"), - "E", "advanced/run_command", + "E", "_config_exebuf_dialog", "system-run", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_exebuf/e_mod_main.c b/src/modules/conf_exebuf/e_mod_main.c index 60230c8bd..18a47256e 100644 --- a/src/modules/conf_exebuf/e_mod_main.c +++ b/src/modules/conf_exebuf/e_mod_main.c @@ -4,23 +4,9 @@ #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 = {