Merge remote-tracking branch 'pochu/misc-fixes'
[empathy.git] / libempathy-gtk / empathy-call-utils.c
index 0926230..adf4987 100644 (file)
@@ -134,6 +134,7 @@ create_streamed_media_channel_cb (GObject *source,
     }
 }
 
+#ifdef HAVE_CALL
 static void
 create_call_channel_cb (GObject *source,
     GAsyncResult *result,
@@ -165,8 +166,9 @@ create_call_channel_cb (GObject *source,
       NULL);
 }
 
-void
-empathy_call_new_with_streams (const gchar *contact,
+/* Try to request a Call channel and fallback to StreamedMedia if that fails */
+static void
+call_new_with_streams (const gchar *contact,
     TpAccount *account,
     gboolean initial_audio,
     gboolean initial_video,
@@ -175,28 +177,78 @@ empathy_call_new_with_streams (const gchar *contact,
   GHashTable *call_request, *streamed_media_request;
   TpAccountChannelRequest *call_req, *streamed_media_req;
 
+  /* Call */
   call_request = empathy_call_create_call_request (contact,
       initial_audio,
       initial_video);
 
+  call_req = tp_account_channel_request_new (account, call_request, timestamp);
+
+  g_hash_table_unref (call_request);
+
+  /* StreamedMedia */
   streamed_media_request = empathy_call_create_streamed_media_request (
       contact, initial_audio, initial_video);
 
-  call_req = tp_account_channel_request_new (account, call_request, timestamp);
   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 (call_req,
       EMPATHY_CALL_BUS_NAME, NULL,
       create_call_channel_cb,
       streamed_media_req);
 
-  g_hash_table_unref (call_request);
-  g_hash_table_unref (streamed_media_request);
   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,
+    gboolean initial_audio,
+    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)
 {