X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=628d0344cc176aa34dbc9f5102c60133c1476a90;hb=896098c961a9a37e10541680637eb582805a9523;hp=d37288fa8da3ad2b784e9e4f7361b7259b442474;hpb=35dd3065a93bfed213bc7b8602d945b93f7edfb4;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index d37288fa..628d0344 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -568,11 +568,11 @@ static guint translate_row_col(guint r, guint c)
     return 0;
 }
 
-static void popup_cycle(guint d, gboolean show)
+void screen_desktop_popup(guint d, gboolean show)
 {
     Rect *a;
 
-    if (!show) {
+    if (!show || !config_dialog_desktop) {
         pager_popup_hide(desktop_cycle_popup);
     } else {
         a = screen_physical_area_monitor(0);
@@ -687,14 +687,14 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
     }
 
     if (dialog) {
-        popup_cycle(d, TRUE);
+        screen_desktop_popup(d, TRUE);
         return d;
     }
 
 done_cycle:
     first = TRUE;
 
-    popup_cycle(0, FALSE);
+    screen_desktop_popup(0, FALSE);
 
     return d;
 }
@@ -860,10 +860,10 @@ void screen_install_colormap(ObClient *client, gboolean install)
     XWindowAttributes wa;
 
     if (client == NULL) {
-	if (install)
-	    XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
-	else
-	    XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
+        if (install)
+            XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
+        else
+            XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
     } else {
         if (XGetWindowAttributes(ob_display, client->window, &wa) &&
             wa.colormap != None) {