individual_view_drag_end: remove the auto scroll

[empathy.git] / libempathy-gtk / empathy-call-utils.c

diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index a30e0808fe051fc1be14e5c678f2336f7084cdb9..16526d3544d4e5b6aa945703d257fe9da099605c 100644 (file)
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -55,6 +55,8 @@ get_error_display_message (GError *error)
         return _("The specified contact is not valid");
       case TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED:
         return _("Emergency calls are not supported on this protocol");
+      case TP_ERROR_INSUFFICIENT_BALANCE:
+        return _("You don't have enough credit in order to place this call");
     }
 
   return _("There was an error starting the call");
@@ -132,6 +134,7 @@ create_streamed_media_channel_cb (GObject *source,
     }
 }
 
+#ifdef HAVE_CALL
 static void
 create_call_channel_cb (GObject *source,
     GAsyncResult *result,
@@ -201,6 +204,35 @@ call_new_with_streams (const gchar *contact,
   g_object_unref (call_req);
 }
 
+#else /* HAVE_CALL */
+
+static void
+sm_new_with_streams (const gchar *contact,
+    TpAccount *account,
+    gboolean initial_audio,
+    gboolean initial_video,
+    gint64 timestamp)
+{
+  GHashTable *streamed_media_request;
+  TpAccountChannelRequest *streamed_media_req;
+
+  /* StreamedMedia */
+  streamed_media_request = empathy_call_create_streamed_media_request (
+      contact, initial_audio, initial_video);
+
+  streamed_media_req = tp_account_channel_request_new (account,
+      streamed_media_request,
+      timestamp);
+
+  g_hash_table_unref (streamed_media_request);
+
+  tp_account_channel_request_create_channel_async (streamed_media_req,
+      EMPATHY_AV_BUS_NAME, NULL, create_streamed_media_channel_cb, NULL);
+
+  g_object_unref (streamed_media_req);
+}
+#endif /* HAVE_CALL */
+
 void
 empathy_call_new_with_streams (const gchar *contact,
     TpAccount *account,
@@ -208,27 +240,38 @@ empathy_call_new_with_streams (const gchar *contact,
     gboolean initial_video,
     gint64 timestamp)
 {
+#ifdef HAVE_CALL
   call_new_with_streams (contact, account, initial_audio, initial_video,
       timestamp);
+#else
+  sm_new_with_streams (contact, account, initial_audio, initial_video,
+      timestamp);
+#endif
 }
 
 void
-empathy_call_set_stream_properties (GstElement *element)
+empathy_call_set_stream_properties (GstElement *element,
+  gboolean echo_cancellation)
 {
   GstStructure *props;
   GSettings *gsettings_call;
-  gboolean echo_cancellation;
+  gboolean echo_cancellation_setting;
 
   gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
 
-  echo_cancellation = g_settings_get_boolean (gsettings_call,
+  echo_cancellation_setting = g_settings_get_boolean (gsettings_call,
       EMPATHY_PREFS_CALL_ECHO_CANCELLATION);
 
+  DEBUG ("Echo cancellation: element allowed: %s, user enabled: %s",
+    echo_cancellation ? " yes" : "no",
+    echo_cancellation_setting ? " yes" : "no");
+
+
   props = gst_structure_new ("props",
       PA_PROP_MEDIA_ROLE, G_TYPE_STRING, "phone",
       NULL);
 
-  if (echo_cancellation)
+  if (echo_cancellation && echo_cancellation_setting)
     {
       gst_structure_set (props,
           "filter.want", G_TYPE_STRING, "echo-cancel",