From: Dana Jansens <danakj@orodu.net>
Date: Sun, 2 Mar 2008 22:31:49 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2~3
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=b37531d54483d88f11e11fb7dcf47d42bc937496;hp=a1e446a21e19c936771800c76baba2a9c8389ac6

Merge branch 'backport' into 3.4-working
---

diff --git a/openbox/ping.c b/openbox/ping.c
index 748c0c8..46952f7 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);