[Pkg-telepathy-commits] [telepathy-mission-control-6] 21/280: channel-utils: remove Tubes and ContactList special casing

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 15e7ec452f3456de8e2afc7f0cafe160ffd0c444
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Wed Aug 29 15:34:21 2012 +0100

    channel-utils: remove Tubes and ContactList special casing
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
    Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
---
 src/channel-utils.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/channel-utils.c b/src/channel-utils.c
index a0cbe5e..194ce50 100644
--- a/src/channel-utils.c
+++ b/src/channel-utils.c
@@ -40,7 +40,6 @@ _mcd_tp_channel_should_close (TpChannel *channel,
 {
     const GError *invalidated;
     const gchar *object_path;
-    GQuark channel_type;
 
     if (channel == NULL)
     {
@@ -60,20 +59,8 @@ _mcd_tp_channel_should_close (TpChannel *channel,
         return FALSE;
     }
 
-    channel_type = tp_channel_get_channel_type_id (channel);
-
-    if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST)
-    {
-        DEBUG ("Not %s %p:%s, it's a ContactList", verb, channel, object_path);
-        return FALSE;
-    }
-
-    if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TUBES)
-    {
-        DEBUG ("Not %s %p:%s, it's an old Tubes channel", verb, channel,
-               object_path);
-        return FALSE;
-    }
+    /* we used to special case ContactList and Tubes channels here and
+     * never close them automatically, but no longer! */
 
     return TRUE;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git