Stop observing/approving StreamedMedia channels

[empathy.git] / src / empathy-event-manager.c

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index f652c2164bb9d7a6f72a5074f5546bcd43edd862..e5b19e2adf532e2c29e1dade043f09334b00305e 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -20,26 +20,27 @@
  */
 
 #include "config.h"
+#include "empathy-event-manager.h"
 
 #include <glib/gi18n.h>
-
-#include <libempathy/empathy-presence-manager.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-sasl-mechanisms.h>
-
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-call-utils.h>
-#include <libempathy-gtk/empathy-subscription-dialog.h>
-
-#include "empathy-event-manager.h"
+#include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
+
+#include "empathy-call-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
+#include "empathy-presence-manager.h"
+#include "empathy-sasl-mechanisms.h"
+#include "empathy-sound-manager.h"
+#include "empathy-subscription-dialog.h"
+#include "empathy-tp-chat.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
 
@@ -796,8 +797,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 == TP_IFACE_QUARK_CHANNEL_TYPE_CALL ||
+      if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL ||
           channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER ||
           channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
         return channel;
@@ -917,8 +917,19 @@ approve_call_channel (EmpathyEventManager *self,
 
   priv->ringing++;
   if (priv->ringing == 1)
-    empathy_sound_manager_start_playing (priv->sound_mgr, NULL,
-        EMPATHY_SOUND_PHONE_INCOMING, MS_BETWEEN_RING);
+    {
+      TpAccountManager *am = tp_account_manager_dup ();
+      TpConnectionPresenceType presence;
+
+      presence = tp_account_manager_get_most_available_presence (am,
+          NULL, NULL);
+
+      if (presence != TP_CONNECTION_PRESENCE_TYPE_BUSY)
+        empathy_sound_manager_start_playing (priv->sound_mgr, NULL,
+            EMPATHY_SOUND_PHONE_INCOMING, MS_BETWEEN_RING);
+
+      g_object_unref (am);
+    }
 }
 
 static void
@@ -1100,7 +1111,7 @@ check_publish_state (EmpathyEventManager *self,
 
   message = tp_contact_get_publish_request (tp_contact);
 
-  if (!EMP_STR_EMPTY (message))
+  if (!TPAW_STR_EMPTY (message))
     event_msg = g_strdup_printf (_("\nMessage: %s"), message);
   else
     event_msg = NULL;
@@ -1125,10 +1136,10 @@ event_manager_publish_state_changed_cb (TpContact *contact,
 }
 
 static void
-event_manager_presence_changed_cb (EmpathyContact *contact,
+check_presence (EmpathyEventManager *manager,
+    EmpathyContact *contact,
     TpConnectionPresenceType current,
-    TpConnectionPresenceType previous,
-    EmpathyEventManager *manager)
+    TpConnectionPresenceType previous)
 {
   EmpathyEventManagerPriv *priv = GET_PRIV (manager);
   TpAccount *account;
@@ -1156,7 +1167,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
             {
               event_manager_add (manager, NULL, contact,
                   EMPATHY_EVENT_TYPE_PRESENCE_OFFLINE,
-                  EMPATHY_IMAGE_AVATAR_DEFAULT,
+                  TPAW_IMAGE_AVATAR_DEFAULT,
                   empathy_contact_get_alias (contact), _("Disconnected"),
                   NULL, NULL, NULL);
             }
@@ -1177,7 +1188,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
             {
               event_manager_add (manager, NULL, contact,
                   EMPATHY_EVENT_TYPE_PRESENCE_ONLINE,
-                  EMPATHY_IMAGE_AVATAR_DEFAULT,
+                  TPAW_IMAGE_AVATAR_DEFAULT,
                   empathy_contact_get_alias (contact), _("Connected"),
                   NULL, NULL, NULL);
             }
@@ -1188,6 +1199,15 @@ out:
   g_object_unref (presence_mgr);
 }
 
+static void
+event_manager_presence_changed_cb (EmpathyContact *contact,
+    TpConnectionPresenceType current,
+    TpConnectionPresenceType previous,
+    EmpathyEventManager *manager)
+{
+  check_presence (manager, contact, current, previous);
+}
+
 static GObject *
 event_manager_constructor (GType type,
                           guint n_props,
@@ -1290,6 +1310,10 @@ contact_list_changed_cb (EmpathyConnectionAggregator *aggregator,
       tp_g_signal_connect_object (contact, "presence-changed",
           G_CALLBACK (event_manager_presence_changed_cb), self, 0);
 
+      check_presence (self, contact,
+          empathy_contact_get_presence (contact),
+          TP_CONNECTION_PRESENCE_TYPE_OFFLINE);
+
       tp_g_signal_connect_object (tp_contact, "notify::publish-state",
           G_CALLBACK (event_manager_publish_state_changed_cb), self, 0);
 
@@ -1352,7 +1376,7 @@ empathy_event_manager_init (EmpathyEventManager *manager)
   g_ptr_array_unref (contacts);
   g_ptr_array_unref (empty);
 
-   am = tp_account_manager_dup ();
+  am = tp_account_manager_dup ();
 
   priv->approver = tp_simple_approver_new_with_am (am, "Empathy.EventManager",
       FALSE, approve_channels, manager, NULL);
@@ -1380,12 +1404,6 @@ empathy_event_manager_init (EmpathyEventManager *manager)
         NULL));
 
   /* Calls */
-  tp_base_client_take_approver_filter (priv->approver,
-      tp_asv_new (
-        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-        NULL));
   tp_base_client_take_approver_filter (priv->approver,
       tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,