projects
/
dana
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'backport' into work
[dana/openbox.git]
/
openbox
/
screen.c
diff --git
a/openbox/screen.c
b/openbox/screen.c
index
773cb75
..
221e338
100644
(file)
--- a/
openbox/screen.c
+++ b/
openbox/screen.c
@@
-674,6
+674,9
@@
void screen_set_desktop(guint num, gboolean dofocus)
ob_debug("Moving to desktop %d", 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();
/* ignore enter events caused by the move */
ignore_start = event_start_ignore_all_enters();
@@
-704,9
+707,6
@@
void screen_set_desktop(guint num, gboolean dofocus)
if (event_curtime != CurrentTime)
screen_desktop_user_time = event_curtime;
if (event_curtime != CurrentTime)
screen_desktop_user_time = event_curtime;
-
- if (ob_state() == OB_STATE_RUNNING)
- screen_show_desktop_popup(screen_desktop);
}
void screen_add_desktop(gboolean current)
}
void screen_add_desktop(gboolean current)