diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-03-02 18:36:32 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-03-02 18:36:32 -0500 |
| commit | 4b5373f609e6462995a38cc4f0f50b17cbc8f835 (patch) | |
| tree | 67a01fbfa781382cb04f30e5ca9bc2e88580310b /openbox | |
| parent | 7fb107cd37a09787c5cfa590688944b3bcb2bab8 (diff) | |
| parent | 20bd592f8b7a5565d9b7ae89751de548c9e5d13a (diff) | |
Merge branch 'backport' into work
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/actions/session.c | 4 | ||||
| -rw-r--r-- | openbox/ping.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openbox/actions/session.c b/openbox/actions/session.c index 27df917a..775deab1 100644 --- a/openbox/actions/session.c +++ b/openbox/actions/session.c @@ -60,12 +60,12 @@ static gboolean logout_func(ObActionsData *data, gpointer options) ObPrompt *p; ObPromptAnswer answers[] = { { _("Cancel"), 0 }, - { _("Log out"), 1 } + { _("Log Out"), 1 } }; o2 = g_memdup(o, sizeof(Options)); p = prompt_new(_("Are you sure you want to log out?"), - _("Log out"), + _("Log Out"), answers, 2, 0, 0, prompt_cb, prompt_cleanup, o2); prompt_show(p, NULL, FALSE); } diff --git a/openbox/ping.c b/openbox/ping.c index 83202493..b8479294 100644 --- a/openbox/ping.c +++ b/openbox/ping.c @@ -38,7 +38,7 @@ static guint32 ping_next_id = 1; #define PING_TIMEOUT (G_USEC_PER_SEC * 3) /*! Warn the user after this many PING_TIMEOUT intervals */ -#define PING_TIMEOUT_WARN 1 +#define PING_TIMEOUT_WARN 2 static void ping_send(ObPingTarget *t); static void ping_end(ObClient *client, gpointer data); |