nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'backport' into work

Browse source
This commit is contained in:
Dana Jansens 2008-02-26 01:00:26 -05:00
commit 8387c6cce8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openbox/client.c
View file

@ -3335,8 +3335,8 @@ static void client_prompt_kill(ObClient *self)
/* check if we're already prompting */ /* check if we're already prompting */
if (!self->kill_prompt) { if (!self->kill_prompt) {
ObPromptAnswer answers[] = { ObPromptAnswer answers[] = {
{ _("No"), OB_KILL_RESULT_NO }, { _("Cancel"), OB_KILL_RESULT_NO },
{ _("Yes"), OB_KILL_RESULT_YES } { _("Force Exit"), OB_KILL_RESULT_YES }
}; };
gchar *m; gchar *m;

6
openbox/screen.c
View file

@ -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 enter events caused by the move */
ignore_start = event_start_ignore_all_enters(); ignore_start = event_start_ignore_all_enters();
@ -704,9 +707,6 @@ void screen_set_desktop(guint num, gboolean dofocus)
if (event_curtime != CurrentTime) if (event_curtime != CurrentTime)
screen_desktop_user_time = event_curtime; 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)