From f248aa69dc3db7b2fb4fb997f82cb210bcc8c368 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Wed, 11 Jan 2012 13:39:38 +0100
Subject: [PATCH] Support only Call1 channels

Empathy uses to support 2 D-Bus API for calls:
- StreamedMedia: legacy API
- Call.DRAFT: experimental version of the new API

Since 3.3.90, Empathy only supports Call1, the first stable version of the new
API, so the Shell should do the same.

https://bugzilla.gnome.org/show_bug.cgi?id=667694
---
 configure.ac             |  2 +-
 js/ui/telepathyClient.js |  6 ++----
 src/shell-tp-client.c    | 14 ++------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1846fb9bd..9563f89bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ GIO_MIN_VERSION=2.31.6
 LIBECAL_MIN_VERSION=2.32.0
 LIBEDATASERVER_MIN_VERSION=1.2.0
 LIBEDATASERVERUI_MIN_VERSION=2.91.6
-TELEPATHY_GLIB_MIN_VERSION=0.15.6
+TELEPATHY_GLIB_MIN_VERSION=0.17.5
 TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index b721034c7..e110c606c 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -233,8 +233,7 @@ const Client = new Lang.Class({
 
         if (chanType == Tp.IFACE_CHANNEL_TYPE_TEXT)
             this._approveTextChannel(account, conn, channel, dispatchOp, context);
-        else if (chanType == Tp.IFACE_CHANNEL_TYPE_STREAMED_MEDIA ||
-                 chanType == 'org.freedesktop.Telepathy.Channel.Type.Call.DRAFT')
+        else if (chanType == Tp.IFACE_CHANNEL_TYPE_CALL)
             this._approveCall(account, conn, channel, dispatchOp, context);
         else if (chanType == Tp.IFACE_CHANNEL_TYPE_FILE_TRANSFER)
             this._approveFileTransfer(account, conn, channel, dispatchOp, context);
@@ -265,8 +264,7 @@ const Client = new Lang.Class({
 
         let props = channel.borrow_immutable_properties();
 
-        if (props['org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo'] ||
-            props[Tp.PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO])
+        if (props[Tp.PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO])
           isVideo = true;
 
         // We got the TpContact
diff --git a/src/shell-tp-client.c b/src/shell-tp-client.c
index 98fa52c15..d64129e65 100644
--- a/src/shell-tp-client.c
+++ b/src/shell-tp-client.c
@@ -126,20 +126,10 @@ shell_tp_client_init (ShellTpClient *self)
         TP_HANDLE_TYPE_ROOM,
       NULL));
 
-  /* Approve calls (StreameMedia and Call.DRAFT). We let Empathy handle the
-   * call itself. */
+  /* Approve calls. We let Empathy handle the call itself. */
   tp_base_client_take_approver_filter (TP_BASE_CLIENT (self),
       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));
-
-  /* FIXME: use TP_IFACE_CHANNEL_TYPE_CALL once API is undrafted (fdo #24936) */
-  tp_base_client_take_approver_filter (TP_BASE_CLIENT (self),
-      tp_asv_new (
-        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          "org.freedesktop.Telepathy.Channel.Type.Call.DRAFT",
+        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
         NULL));