make putting plugin menus in a menu closer to working..

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 6c9042a99edb1b3b51d10a6cbb5ecbea60b9c95d..8835c1b212b9ee83ad194b339c03a39987cbc17e 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -625,7 +625,6 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
     get_row_col(d, &r, &c);
 
     if (lin) {
-        g_message("linear %d", d);
         switch (dir) {
         case OB_DIRECTION_EAST:
             if (d < screen_num_desktops - 1)
@@ -643,7 +642,6 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
             assert(0);
             return screen_desktop;
         }
-        g_message("linear %d done", d);
     } else {
         switch (dir) {
         case OB_DIRECTION_EAST:
@@ -702,7 +700,8 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
         d = translate_row_col(r, c);
     }
 
-    popup_cycle(d, TRUE);
+    if (config_desktop_popup)
+        popup_cycle(d, TRUE);
     return d;
 
 done_cycle:
@@ -710,7 +709,7 @@ done_cycle:
 
     popup_cycle(0, FALSE);
 
-    return d = screen_desktop;
+    return d;
 }
 
 void screen_update_layout()