From 5b894aa5ad8702279c0458b890025a22172bfdd1 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Mon, 7 Mar 2011 13:18:11 +0000
Subject: Don't look for Call channels

We don't support them on master yet.
---
 src/empathy-call-observer.c | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 22d0afa1e..d724a40ff 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -22,8 +22,6 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <libempathy/empathy-channel-factory.h>
 #include <libempathy/empathy-utils.h>
 
@@ -102,8 +100,7 @@ find_main_channel (GList *channels)
 
       channel_type = tp_channel_get_channel_type_id (channel);
 
-      if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
-          channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
+      if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA)
         return channel;
     }
 
@@ -113,21 +110,8 @@ find_main_channel (GList *channels)
 static gboolean
 has_ongoing_calls (EmpathyCallObserver *self)
 {
-  GList *l;
-
-  for (l = self->priv->channels; l != NULL; l = l->next)
-    {
-      TpChannel *channel = TP_CHANNEL (l->data);
-      GQuark type = tp_channel_get_channel_type_id (channel);
-
-      /* Check that Call channels are not ended */
-      if (type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL &&
-          tpy_call_channel_get_state (TPY_CALL_CHANNEL (channel), NULL, NULL)
-               == TPY_CALL_STATE_ENDED)
-        continue;
-
-      return TRUE;
-    }
+  if (self->priv->channels != NULL)
+    return TRUE;
 
   return FALSE;
 }
@@ -255,7 +239,7 @@ empathy_call_observer_init (EmpathyCallObserver *self)
       TP_CLIENT_CHANNEL_FACTORY (factory));
   g_object_unref (factory);
 
-  /* Observe Call and StreamedMedia channels */
+  /* Observe StreamedMedia channels */
   tp_base_client_take_observer_filter (self->priv->observer,
       tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
@@ -263,13 +247,6 @@ empathy_call_observer_init (EmpathyCallObserver *self)
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
           TP_HANDLE_TYPE_CONTACT,
         NULL));
-  tp_base_client_take_observer_filter (self->priv->observer,
-      tp_asv_new (
-        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TPY_IFACE_CHANNEL_TYPE_CALL,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
-          TP_HANDLE_TYPE_CONTACT,
-        NULL));
 
   tp_base_client_set_observer_delay_approvers (self->priv->observer, TRUE);
 
-- 
cgit v1.2.3