Merge branch 'backport' into work

diff --git a/openbox/client.c b/openbox/client.c
index fe67b78..5b96fb3 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3335,8 +3335,8 @@ static void client_prompt_kill(ObClient *self)
     /* check if we're already prompting */
     if (!self->kill_prompt) {
         ObPromptAnswer answers[] = {
-            { _("No"), OB_KILL_RESULT_NO },
-            { _("Yes"), OB_KILL_RESULT_YES }
+            { _("Cancel"), OB_KILL_RESULT_NO },
+            { _("Force Exit"), OB_KILL_RESULT_YES }
         };
         gchar *m;
 

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);
 
+    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();
 
@@ -704,9 +707,6 @@ void screen_set_desktop(guint num, gboolean dofocus)
 
     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)