From: Dana Jansens Date: Tue, 26 Feb 2008 06:00:26 +0000 (-0500) Subject: Merge branch 'backport' into work X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=8387c6cce85136426837e1528cdd2bf851a1ce3a;p=chaz%2Fopenbox Merge branch 'backport' into work --- 8387c6cce85136426837e1528cdd2bf851a1ce3a diff --cc openbox/screen.c index 773cb75f,346b50c3..221e338d --- a/openbox/screen.c +++ b/openbox/screen.c @@@ -668,12 -682,15 +668,15 @@@ void screen_set_desktop(guint num, gboo } } screen_desktop_timeout = FALSE; - ob_main_loop_timeout_remove(ob_main_loop, last_desktop_func); - ob_main_loop_timeout_add(ob_main_loop, REMEMBER_LAST_DESKTOP_TIME, - last_desktop_func, NULL, NULL, NULL); + obt_main_loop_timeout_remove(ob_main_loop, last_desktop_func); + obt_main_loop_timeout_add(ob_main_loop, REMEMBER_LAST_DESKTOP_TIME, + last_desktop_func, NULL, NULL, NULL); - ob_debug("Moving to desktop %d\n", num+1); + ob_debug("Moving to desktop %d", num+1); + if (ob_state() == OB_STATE_RUNNING) + screen_show_desktop_popup(screen_desktop); + /* ignore enter events caused by the move */ ignore_start = event_start_ignore_all_enters();