[Telepathy-commits] [telepathy-gabble/master] change session timeout back to 60s and allow content-remove before session is accepted

[Senko Rasic]

---
 src/jingle-session.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/jingle-session.c b/src/jingle-session.c
index 1808d20..35a5c3e 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -106,14 +106,14 @@ static const gchar *action_table[] = {
   NULL
 };
 
-#define DEFAULT_SESSION_TIMEOUT 6000
+#define DEFAULT_SESSION_TIMEOUT 60000
 
 typedef struct {
   JingleState state;
   JingleAction *actions;
 } JingleStateActions;
 
-static JingleAction allowed_actions[6][10] = {
+static JingleAction allowed_actions[6][11] = {
   /* JS_STATE_PENDING_CREATED */
   { JINGLE_ACTION_SESSION_INITIATE, JINGLE_ACTION_UNKNOWN },
   /* JS_STATE_PENDING_INITIATE_SENT */
@@ -124,7 +124,8 @@ static JingleAction allowed_actions[6][10] = {
   { JINGLE_ACTION_SESSION_ACCEPT, JINGLE_ACTION_SESSION_TERMINATE,
     JINGLE_ACTION_TRANSPORT_INFO, JINGLE_ACTION_CONTENT_REJECT,
     JINGLE_ACTION_CONTENT_MODIFY, JINGLE_ACTION_CONTENT_ACCEPT,
-    JINGLE_ACTION_CONTENT_REMOVE, JINGLE_ACTION_UNKNOWN },
+    JINGLE_ACTION_CONTENT_REMOVE, 
+    JINGLE_ACTION_TRANSPORT_ACCEPT, JINGLE_ACTION_UNKNOWN },
   /* JS_STATE_PENDING_ACCEPT_SENT */
   { JINGLE_ACTION_SESSION_TERMINATE, JINGLE_ACTION_UNKNOWN },
   /* JS_STATE_ACTIVE */
-- 
1.5.6.5