remove the dialog options

diff --git a/openbox/config.c b/openbox/config.c
index d72cce8d234689da98f818dda0ff5e03d57cf4ba..16b0be4d093f89bafab49127799c409ccc25dbd7 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -343,19 +343,6 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
     }
 }
 
-static void parse_dialog(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
-                         void *d)
-{
-    xmlNodePtr n;
-
-    node = node->children;
-    
-    if ((n = parse_find_node("focus", node)))
-        config_dialog_focus = parse_bool(doc, n);
-    if ((n = parse_find_node("desktop", node)))
-        config_dialog_desktop = parse_bool(doc, n);
-}
-
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
 {
     for (node = node->children; node; node = node->next) {
@@ -542,11 +529,6 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "resistance", parse_resistance, NULL);
 
-    config_dialog_focus = TRUE;
-    config_dialog_desktop = TRUE;
-
-    parse_register(i, "dialog", parse_dialog, NULL);
-
     config_menu_files = NULL;
 
     parse_register(i, "menu", parse_menu, NULL);

diff --git a/openbox/config.h b/openbox/config.h
index c8c85eb823942c34f6eb3a2b13ff7094a471d56c..0c14b3764d9939de6bd743a99fc0078ab54ec658 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -93,11 +93,6 @@ extern gint config_resist_win;
 /*! Number of pixels to resist while crossing a screen's edge */
 extern gint config_resist_edge;
 
-/*! Show a dialog while cycling focus between windows */
-extern gboolean config_dialog_focus;
-/*! Show a dialogs while switching between desktops */
-extern gboolean config_dialog_desktop;
-
 /*! User-specified menu files */
 extern GSList *config_menu_files;
 

diff --git a/openbox/focus.c b/openbox/focus.c
index 302c4fc425fc7eca4c82b6937341c57863c325c4..b6d294bbd076096e107df463e908a02469cb0144 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -232,7 +232,7 @@ void focus_fallback(ObFocusFallbackType type)
 
 static void popup_cycle(ObClient *c, gboolean show)
 {
-    if (!show || !config_dialog_focus) {
+    if (!show) {
         icon_popup_hide(focus_cycle_popup);
     } else {
         Rect *a;

diff --git a/openbox/screen.c b/openbox/screen.c
index 628d0344cc176aa34dbc9f5102c60133c1476a90..a8f3b71cc8ee3647bb8eedd2414394c68857b04b 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -572,7 +572,7 @@ void screen_desktop_popup(guint d, gboolean show)
 {
     Rect *a;
 
-    if (!show || !config_dialog_desktop) {
+    if (!show) {
         pager_popup_hide(desktop_cycle_popup);
     } else {
         a = screen_physical_area_monitor(0);