diff --git a/src/modules/conf_mouse/e_int_config_mouse.c b/src/modules/conf_mouse/e_int_config_mouse.c index 8aee863fe..9786e38c1 100644 --- a/src/modules/conf_mouse/e_int_config_mouse.c +++ b/src/modules/conf_mouse/e_int_config_mouse.c @@ -23,7 +23,7 @@ e_int_config_mouse(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_settings")) + if (e_config_dialog_find("E", "_config_mouse_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); @@ -35,7 +35,7 @@ e_int_config_mouse(E_Container *con, const char *params __UNUSED__) v->basic.check_changed = _basic_check_changed; cfd = e_config_dialog_new(con, _("Mouse Settings"), "E", - "keyboard_and_mouse/mouse_settings", + "_config_mouse_dialog", "preferences-desktop-mouse", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_mouse/e_mod_main.c b/src/modules/conf_mouse/e_mod_main.c index 83dcc031b..adea1f349 100644 --- a/src/modules/conf_mouse/e_mod_main.c +++ b/src/modules/conf_mouse/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_mouse_cursor/e_int_config_cursor.c b/src/modules/conf_mouse_cursor/e_int_config_cursor.c index 0e4aa9df6..ddfba6f48 100644 --- a/src/modules/conf_mouse_cursor/e_int_config_cursor.c +++ b/src/modules/conf_mouse_cursor/e_int_config_cursor.c @@ -31,7 +31,7 @@ e_int_config_cursor(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "appearance/mouse_cursor")) return NULL; + if (e_config_dialog_find("E", "_config_cursor_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -43,7 +43,7 @@ e_int_config_cursor(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con, _("Cursor Settings"), - "E", "appearance/mouse_cursor", + "E", "_config_cursor_dialog", "preferences-desktop-pointer", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_mouse_cursor/e_mod_main.c b/src/modules/conf_mouse_cursor/e_mod_main.c index 5b0a7baea..e0e5a9987 100644 --- a/src/modules/conf_mouse_cursor/e_mod_main.c +++ b/src/modules/conf_mouse_cursor/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_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c index 939c939bf..e95050dc0 100644 --- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c +++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c @@ -99,7 +99,7 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_bindings")) return NULL; + if (e_config_dialog_find("E", "_config_mousebindings_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -110,7 +110,7 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con, _("Mouse Binding Settings"), - "E", "keyboard_and_mouse/mouse_bindings", + "E", "_config_mousebindings_dialog", "preferences-desktop-mouse", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_mousebindings/e_mod_main.c b/src/modules/conf_mousebindings/e_mod_main.c index 4b69d0848..b7e0e8c2a 100644 --- a/src/modules/conf_mousebindings/e_mod_main.c +++ b/src/modules/conf_mousebindings/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_paths/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c index 8131b8533..bbcb07fb2 100644 --- a/src/modules/conf_paths/e_int_config_paths.c +++ b/src/modules/conf_paths/e_int_config_paths.c @@ -51,7 +51,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "advanced/search_directories")) return NULL; + if (e_config_dialog_find("E", "_config_paths_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -60,7 +60,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__) v->basic.apply_cfdata = _basic_apply_data; cfd = e_config_dialog_new(con, _("Search Path Settings"), - "E", "advanced/search_directories", + "E", "_config_paths_dialog", "preferences-directories", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c index 29932ff2c..6cb0e2b67 100644 --- a/src/modules/conf_paths/e_mod_main.c +++ b/src/modules/conf_paths/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_performance/e_int_config_performance.c b/src/modules/conf_performance/e_int_config_performance.c index 1ea07b33e..7a8d1c662 100644 --- a/src/modules/conf_performance/e_int_config_performance.c +++ b/src/modules/conf_performance/e_int_config_performance.c @@ -26,7 +26,7 @@ e_int_config_performance(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "advanced/performance")) return NULL; + if (e_config_dialog_find("E", "_config_performance_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -38,7 +38,7 @@ e_int_config_performance(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con, _("Performance Settings"), - "E", "advanced/performance", + "E", "_config_performance_dialog", "preferences-system-performance", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c index 60ff26ccd..4c43860f2 100644 --- a/src/modules/conf_performance/e_mod_main.c +++ b/src/modules/conf_performance/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_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c index 9cd410f54..13f198efa 100644 --- a/src/modules/conf_profiles/e_int_config_profiles.c +++ b/src/modules/conf_profiles/e_int_config_profiles.c @@ -43,7 +43,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "settings/profiles")) return NULL; + if (e_config_dialog_find("E", "_config_profiles_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); if (!v) return NULL; v->create_cfdata = _create_data; @@ -53,7 +53,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con, _("Profile Selector"), - "E", "settings/profiles", + "E", "_config_profiles_dialog", "preferences-profiles", 0, v, NULL); e_config_dialog_changed_auto_set(cfd, 0); return cfd; diff --git a/src/modules/conf_scale/e_int_config_scale.c b/src/modules/conf_scale/e_int_config_scale.c index cce7b3f1b..7100fa2a7 100644 --- a/src/modules/conf_scale/e_int_config_scale.c +++ b/src/modules/conf_scale/e_int_config_scale.c @@ -45,7 +45,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "appearance/scale")) return NULL; + if (e_config_dialog_find("E", "_config_scale_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -59,7 +59,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con, _("Scaling Settings"), - "E", "appearance/scale", + "E", "_config_scale_dialog", "preferences-scale", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_scale/e_mod_main.c b/src/modules/conf_scale/e_mod_main.c index ec78ed31d..6fb1eb97d 100644 --- a/src/modules/conf_scale/e_mod_main.c +++ b/src/modules/conf_scale/e_mod_main.c @@ -4,23 +4,10 @@ #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_screensaver/e_int_config_screensaver.c b/src/modules/conf_screensaver/e_int_config_screensaver.c index 5b1176fc7..946720e6d 100644 --- a/src/modules/conf_screensaver/e_int_config_screensaver.c +++ b/src/modules/conf_screensaver/e_int_config_screensaver.c @@ -52,7 +52,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "screen/screen_saver")) return NULL; + if (e_config_dialog_find("E", "_config_screensaver_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -65,7 +65,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__) v->override_auto_apply = 1; cfd = e_config_dialog_new(con,_("Screen Saver Settings"), - "E", "screen/screen_saver", + "E", "_config_screensaver_dialog", "preferences-desktop-screensaver", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_screensaver/e_mod_main.c b/src/modules/conf_screensaver/e_mod_main.c index 12883a991..51eebce69 100644 --- a/src/modules/conf_screensaver/e_mod_main.c +++ b/src/modules/conf_screensaver/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_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c index e2c1c7f92..0e6a75fcc 100644 --- a/src/modules/conf_shelves/e_int_config_shelf.c +++ b/src/modules/conf_shelves/e_int_config_shelf.c @@ -33,7 +33,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "extensions/shelves")) return NULL; + if (e_config_dialog_find("E", "_config_shelf_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); if (!v) return NULL; v->create_cfdata = _create_data; @@ -41,7 +41,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__) v->basic.create_widgets = _basic_create; cfd = e_config_dialog_new(con, _("Shelf Settings"), "E", - "extensions/shelves", + "_config_shelf_dialog", "preferences-desktop-shelf", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c index a89d10119..e5efdb9c7 100644 --- a/src/modules/conf_shelves/e_mod_main.c +++ b/src/modules/conf_shelves/e_mod_main.c @@ -4,27 +4,13 @@ #include "e.h" #include "e_mod_main.h" -/***************************************************************************/ -/**/ /* actual module specifics */ - static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_mod_menu_add(void *data, E_Menu *m); static E_Module *conf_module = NULL; static E_Int_Menu_Augmentation *maug = NULL; -/**/ -/***************************************************************************/ - -/***************************************************************************/ -/**/ - -/**/ -/***************************************************************************/ - -/***************************************************************************/ -/**/ /* module setup */ EAPI E_Module_Api e_modapi = { diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c index 4de11bf2d..c7141ef15 100644 --- a/src/modules/conf_startup/e_int_config_startup.c +++ b/src/modules/conf_startup/e_int_config_startup.c @@ -27,7 +27,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "appearance/startup")) return NULL; + if (e_config_dialog_find("E", "_config_startup_dialog")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v->create_cfdata = _create_data; @@ -37,7 +37,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__) cfd = e_config_dialog_new(con, _("Startup Settings"), - "E", "appearance/startup", + "E", "_config_startup_dialog", "preferences-startup", 0, v, NULL); return cfd; } diff --git a/src/modules/conf_startup/e_mod_main.c b/src/modules/conf_startup/e_mod_main.c index 994963319..a3c467c7e 100644 --- a/src/modules/conf_startup/e_mod_main.c +++ b/src/modules/conf_startup/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 = {