[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian, updated. debian/0.7.17-1-6-g7802f51

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 5ce19296366cc7f5ab1a5fbac2b388995ae8a549
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jan 30 19:01:50 2009 +0000

    New upstream release
    
    * New upstream release
    * Cherry-pick patch from upstream git to reinstate offline/error/unknown
      statuses in the GetStatuses return
    * Cherry-pick patch from upstream git to set actor correctly when
      terminating Jingle calls

diff --git a/debian/changelog b/debian/changelog
index 73f1fcc..68609eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+telepathy-gabble (0.7.19-1) experimental; urgency=low
+
+  * New upstream release
+  * Cherry-pick patch from upstream git to reinstate offline/error/unknown
+    statuses in the GetStatuses return
+  * Cherry-pick patch from upstream git to set actor correctly when
+    terminating Jingle calls
+
+ -- Simon McVittie <smcv at debian.org>  Fri, 30 Jan 2009 19:01:03 +0000
+
 telepathy-gabble (0.7.17-1) experimental; urgency=low
 
   [ Simon McVittie ]
diff --git a/debian/patches/0001-conn-presence.c-disallow-setting-offline-error-unkn.patch b/debian/patches/0001-conn-presence.c-disallow-setting-offline-error-unkn.patch
new file mode 100644
index 0000000..d1cad6f
--- /dev/null
+++ b/debian/patches/0001-conn-presence.c-disallow-setting-offline-error-unkn.patch
@@ -0,0 +1,45 @@
+From 996d626ee7550d4dd761af999872c79b0d9029ea Mon Sep 17 00:00:00 2001
+From: Senko Rasic <senko.rasic at collabora.co.uk>
+Date: Thu, 29 Jan 2009 14:20:51 +0100
+Subject: [PATCH] conn-presence.c: disallow setting offline/error/unknown statuses, but don't hide it in GetStatuses()
+ (cherry picked from commit b641b75ebbfd9d86f984a27dc4cbdd75243edc3a)
+
+---
+ src/conn-presence.c |   17 +++++++++++------
+ 1 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/src/conn-presence.c b/src/conn-presence.c
+index bcc73e1..7a13192 100644
+--- a/src/conn-presence.c
++++ b/src/conn-presence.c
+@@ -199,6 +199,17 @@ set_own_status_cb (GObject *obj,
+       GValue *message = NULL, *priority = NULL;
+       const gchar *message_str = NULL;
+ 
++      /* Workaround for tp-glib not checking whether we support setting
++       * a particular status (can be removed once we depend on tp-glib
++       * with the check enabled). Assumes PresenceId value ordering. */
++      if (i < GABBLE_PRESENCE_HIDDEN)
++        {
++          g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
++              "Status '%s' can not be requested in this connection",
++                gabble_statuses[i].name);
++          return FALSE;
++        }
++
+       if (args != NULL)
+         {
+           message = g_hash_table_lookup (args, "message");
+@@ -295,12 +306,6 @@ status_available_cb (GObject *obj, guint status)
+   if (base->status != TP_CONNECTION_STATUS_CONNECTED)
+     return FALSE;
+ 
+-  /* Workaround for tp-glib not checking whether we support setting
+-   * a particular status (can be removed once we depend on tp-glib
+-   * with the check enabled). */
+-  if (!gabble_statuses[status].self)
+-    return FALSE;
+-
+   if (gabble_statuses[status].presence_type == TP_CONNECTION_PRESENCE_TYPE_HIDDEN &&
+       (conn->features & GABBLE_CONNECTION_FEATURES_PRESENCE_INVISIBLE) == 0)
+     return FALSE;
diff --git a/debian/patches/0002-JingleSession-properly-set-actor-when-terminating-t.patch b/debian/patches/0002-JingleSession-properly-set-actor-when-terminating-t.patch
new file mode 100644
index 0000000..58a95a8
--- /dev/null
+++ b/debian/patches/0002-JingleSession-properly-set-actor-when-terminating-t.patch
@@ -0,0 +1,47 @@
+From e82eceb88fefd81903e53e590317207ec270b595 Mon Sep 17 00:00:00 2001
+From: Senko Rasic <senko.rasic at collabora.co.uk>
+Date: Thu, 29 Jan 2009 16:43:37 +0100
+Subject: [PATCH] JingleSession: properly set actor when terminating the session
+ (cherry picked from commit d28487e51b0dfa3dd763ee88ddd162182a75ff41)
+
+---
+ src/jingle-session.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/jingle-session.c b/src/jingle-session.c
+index 68a1299..8e51102 100644
+--- a/src/jingle-session.c
++++ b/src/jingle-session.c
+@@ -78,6 +78,7 @@ struct _GabbleJingleSessionPrivate
+   gchar *sid;
+ 
+   gboolean locally_accepted;
++  gboolean locally_terminated;
+ 
+   guint timer_id;
+ 
+@@ -137,6 +138,7 @@ gabble_jingle_session_init (GabbleJingleSession *obj)
+ 
+   priv->state = JS_STATE_PENDING_CREATED;
+   priv->locally_accepted = FALSE;
++  priv->locally_terminated = FALSE;
+   priv->timer_id = 0;
+   priv->dispose_has_run = FALSE;
+ }
+@@ -1477,7 +1479,7 @@ set_state (GabbleJingleSession *sess, JingleState state)
+     }
+ 
+   if (state == JS_STATE_ENDED)
+-      g_signal_emit (sess, signals[TERMINATED], 0, FALSE);
++      g_signal_emit (sess, signals[TERMINATED], 0, priv->locally_terminated);
+ }
+ 
+ void
+@@ -1513,6 +1515,7 @@ gabble_jingle_session_terminate (GabbleJingleSession *sess)
+    * takes care of cleanup */
+ 
+   DEBUG ("we are terminating this session");
++  priv->locally_terminated = TRUE;
+   set_state (sess, JS_STATE_ENDED);
+ }
+ 

-- 
telepathy-gabble packaging