On incoming calls don't request a new audio stream. This makes streams collide and...

[empathy.git] / libempathy / empathy-tp-call.c

diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 1f3371eea3305a628ed6040aca01322047cdbfb9..6c90f49d890a967fba8feac6b387f5627df86c92 100644 (file)
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -25,7 +25,7 @@
 
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/dbus.h>
-#include <telepathy-glib/_gen/telepathy-interfaces.h>
+#include <telepathy-glib/interfaces.h>
 
 #include <extensions/extensions.h>
 
@@ -62,7 +62,6 @@ enum
   PROP_CHANNEL,
   PROP_CONTACT,
   PROP_IS_INCOMING,
-  PROP_HAS_DTMF,
   PROP_STATUS,
   PROP_AUDIO_STREAM,
   PROP_VIDEO_STREAM
@@ -283,9 +282,6 @@ tp_call_member_added_cb (EmpathyTpGroup *group,
       g_object_notify (G_OBJECT (call), "is-incoming");
       g_object_notify (G_OBJECT (call), "contact");
       g_object_notify (G_OBJECT (call), "status");
-      tp_call_request_streams_for_capabilities (call,
-          EMPATHY_CAPABILITIES_AUDIO);
-
     }
 
   if (priv->status == EMPATHY_TP_CALL_STATUS_PENDING &&
@@ -573,10 +569,6 @@ tp_call_get_property (GObject *object,
     case PROP_IS_INCOMING:
       g_value_set_boolean (value, priv->is_incoming);
       break;
-    case PROP_HAS_DTMF:
-      g_value_set_boolean (value, tp_proxy_has_interface_by_id (priv->channel,
-          TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF));
-      break;
     case PROP_STATUS:
       g_value_set_uint (value, priv->status);
       break;
@@ -619,10 +611,6 @@ empathy_tp_call_class_init (EmpathyTpCallClass *klass)
       g_param_spec_boolean ("is-incoming", "Is media stream incoming",
       "Is media stream incoming", FALSE, G_PARAM_READABLE |
       G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-  g_object_class_install_property (object_class, PROP_HAS_DTMF,
-      g_param_spec_boolean ("has-dtmf", "Has the media channel DTMF",
-      "Has the media channel DTMF", FALSE, G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
   g_object_class_install_property (object_class, PROP_STATUS,
       g_param_spec_uint ("status", "Call status",
       "Call status", 0, 255, 0, G_PARAM_READABLE | G_PARAM_STATIC_NICK |
@@ -851,3 +839,14 @@ empathy_tp_call_stop_tone (EmpathyTpCall *call)
       "stoping tone", NULL, G_OBJECT (call));
 }
 
+gboolean
+empathy_tp_call_has_dtmf (EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE);
+
+  return tp_proxy_has_interface_by_id (priv->channel,
+      TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF);
+}
+