From 92b9968b5282a24effa1b10d3a6b16a7d6f0c110 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 2 May 2007 23:44:04 +0000 Subject: [PATCH] merge r5991-5992 from trunk --- openbox/focus.c | 8 ++++---- openbox/popup.h | 2 +- openbox/screen.c | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/openbox/focus.c b/openbox/focus.c index c9c18955..8fcb13f9 100644 --- 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 66e0fcab..c16e4cab 100644 --- 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 25b7a46d..a302828b 100644 --- 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); } } -- 2.34.1