Merge branch 'backport' into work
Dana Jansens danakj@orodu.net
2 files changed,
5 insertions(+),
5 deletions(-)
M
openbox/client.c
→
openbox/client.c
@@ -3335,8 +3335,8 @@ {
/* 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;
M
openbox/screen.c
→
openbox/screen.c
@@ -674,6 +674,9 @@ last_desktop_func, NULL, NULL, NULL);
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 @@ event_end_ignore_all_enters(ignore_start);
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)