diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-26 01:00:26 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-26 01:00:26 -0500 |
| commit | 8387c6cce85136426837e1528cdd2bf851a1ce3a (patch) | |
| tree | e16b92e6adeb5db8c09063f423262764dd583d1d /openbox | |
| parent | 97de73776708d7c75b42c8fcf33342541d721c83 (diff) | |
| parent | dd97c9beac2778cddb97603315b21778323a25c7 (diff) | |
Merge branch 'backport' into work
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/client.c | 4 | ||||
| -rw-r--r-- | openbox/screen.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openbox/client.c b/openbox/client.c index fe67b78b..5b96fb3c 100644 --- 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 773cb75f..221e338d 100644 --- 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) |