[telepathy-gabble/master] Reduce Jingle session timeout when running tests

[Will Thompson]

---
 src/jingle-session.c       |   11 ++++++++---
 src/jingle-session.h       |    2 ++
 tests/twisted/main-debug.c |    3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/jingle-session.c b/src/jingle-session.c
index 91c2a33..c89377c 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -86,7 +86,7 @@ struct _GabbleJingleSessionPrivate
   gboolean dispose_has_run;
 };
 
-#define DEFAULT_SESSION_TIMEOUT 60000
+static guint session_timeout_time = 60000;
 
 typedef struct {
   JingleState state;
@@ -1522,7 +1522,7 @@ set_state (GabbleJingleSession *sess,
       (!priv->local_initiator && (state == JS_STATE_PENDING_INITIATED)))
     {
       g_assert (priv->timer_id == 0);
-      priv->timer_id = g_timeout_add (DEFAULT_SESSION_TIMEOUT,
+      priv->timer_id = g_timeout_add (session_timeout_time,
         timeout_session, sess);
     }
   /* if we're active or ended, we can clear the timer */
@@ -1718,4 +1718,9 @@ content_ready_cb (GabbleJingleContent *c, gpointer user_data)
   try_session_initiate_or_accept (sess);
 }
 
-
+/* Only to be used for the test suite */
+void
+gabble_set_jingle_session_timeout (guint ms)
+{
+  session_timeout_time = ms;
+}
diff --git a/src/jingle-session.h b/src/jingle-session.h
index 1ca3ea9..96bc63e 100644
--- a/src/jingle-session.h
+++ b/src/jingle-session.h
@@ -108,6 +108,8 @@ typedef void (*JingleReplyHandler) (GabbleJingleSession *, gboolean success,
 void gabble_jingle_session_send (GabbleJingleSession *sess, LmMessage *msg,
     JingleReplyHandler cb, gpointer user_data);
 
+/* Only to be used for the test suite */
+void gabble_set_jingle_session_timeout (guint seconds);
 
 #endif /* __JINGLE_SESSION_H__ */
 
diff --git a/tests/twisted/main-debug.c b/tests/twisted/main-debug.c
index 1df6019..ca30733 100644
--- a/tests/twisted/main-debug.c
+++ b/tests/twisted/main-debug.c
@@ -20,6 +20,7 @@
 #include "gabble.h"
 #include "connection.h"
 #include "jingle-factory.h"
+#include "jingle-session.h"
 
 #include <lib/gibber/gibber-resolver.h>
 
@@ -32,6 +33,8 @@ main (int argc,
   /* needed for test-disco-no-reply.py */
   gabble_connection_set_disco_reply_timeout (3000);
 
+  gabble_set_jingle_session_timeout (500);
+
   g_type_init ();
   gibber_resolver_set_resolver (GABBLE_TYPE_RESOLVER_FAKE);
   gabble_jingle_factory_set_test_mode ();
-- 
1.5.6.5