merge r5991-5992 from trunk

diff --git a/openbox/focus.c b/openbox/focus.c
index c9c1895539d101b1e31bbe416ea921eb5c71c758..8fcb13f93d4bb01b0453cb199a0966d046984d42 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -318,10 +318,10 @@ static void popup_cycle(ObClient *c, gboolean show)
                                 (p->iconic ? p->icon_title : p->title),
                                 NULL);
             */
-        icon_popup_delay_show(focus_cycle_popup, G_USEC_PER_SEC/12,
-                              (title ? title :
-                               (c->iconic ? c->icon_title : c->title)),
-                              client_icon(p, 48, 48));
+        icon_popup_show(focus_cycle_popup,
+                        (title ? title :
+                         (c->iconic ? c->icon_title : c->title)),
+                        client_icon(p, 48, 48));
         g_free(title);
     }
 }

diff --git a/openbox/popup.h b/openbox/popup.h
index 66e0fcab68fdc4738b83d757451261528e8e0db8..c16e4cab08633b247d753eb3ef3cacbe9d5a54e5 100644 (file)
--- a/openbox/popup.h
+++ b/openbox/popup.h
@@ -118,7 +118,7 @@ void icon_popup_delay_show(ObIconPopup *self, gulong usec,
 ObPagerPopup *pager_popup_new();
 void pager_popup_free(ObPagerPopup *self);
 
-#define pager_popup_show(s, t, d) paper_popup_delay_show((s),0,(t),(d;2D))
+#define pager_popup_show(s, t, d) pager_popup_delay_show((s),0,(t),(d))
 void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
                             gchar *text, guint desk);
 #define pager_popup_hide(p) popup_hide((p)->popup)

diff --git a/openbox/screen.c b/openbox/screen.c
index 25b7a46d0f918d49771e6f78bd0002bd15e44d89..a302828baf1a7a293d87dc995e6efce2cbb687a5 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -601,8 +601,7 @@ void screen_desktop_popup(guint d, gboolean show)
         pager_popup_width(desktop_cycle_popup, MAX(a->width/3, POPUP_WIDTH));
         pager_popup_height(desktop_cycle_popup, POPUP_HEIGHT);
 
-        pager_popup_delay_show(desktop_cycle_popup, G_USEC_PER_SEC/12,
-                               screen_desktop_names[d], d);
+        pager_popup_show(desktop_cycle_popup, screen_desktop_names[d], d);
     }
 }