From 0754b2673f0189e892074189535d3dfb6fd2a662 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 22 Feb 2011 17:15:11 +0000 Subject: Move empathy_call_* util functions to libempathy-gtk Since we want to pop up a dialog when starting a call fails. Conflicts: libempathy/empathy-utils.c --- libempathy/empathy-utils.c | 133 --------------------------------------------- libempathy/empathy-utils.h | 12 ---- 2 files changed, 145 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 6bb7148a2..d35f4bced 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -46,10 +46,6 @@ #include #include -#if HAVE_CALL - #include -#endif - #include "empathy-utils.h" #include "empathy-contact-manager.h" #include "empathy-individual-manager.h" @@ -242,135 +238,6 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr node, return found; } -#if HAVE_CALL -GHashTable * -empathy_call_create_call_request (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video) -{ - return tp_asv_new ( - TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - TPY_IFACE_CHANNEL_TYPE_CALL, - TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, - TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, - empathy_contact_get_handle (contact), - TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, - initial_audio, - TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, - initial_video, - NULL); -} -#endif - -GHashTable * -empathy_call_create_streamed_media_request (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video) -{ - return 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, - TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, - empathy_contact_get_handle (contact), - TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, G_TYPE_BOOLEAN, - initial_audio, - TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, G_TYPE_BOOLEAN, - initial_video, - NULL); -} - -static void -create_streamed_media_channel_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - GError *error = NULL; - - if (!tp_account_channel_request_create_channel_finish (TP_ACCOUNT_CHANNEL_REQUEST (source), - result, - &error)) { - DEBUG ("Failed to create StreamedMedia channel: %s", error->message); - g_error_free (error); - } -} - -#if HAVE_CALL -static void -create_call_channel_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - TpAccountChannelRequest *streamed_media_req = user_data; - GError *error = NULL; - - if (tp_account_channel_request_create_channel_finish ( - TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) { - g_object_unref (streamed_media_req); - return; - } - - DEBUG ("Failed to create Call channel: %s", error->message); - DEBUG ("Let's try with an StreamedMedia channel"); - g_error_free (error); - tp_account_channel_request_create_channel_async (streamed_media_req, EMPATHY_AV_BUS_NAME, NULL, - create_streamed_media_channel_cb, - NULL); -} -#endif - -void -empathy_call_new_with_streams (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video, - gint64 timestamp) -{ -#if HAVE_CALL - GHashTable *call_request, *streamed_media_request; - TpAccount *account; - TpAccountChannelRequest *call_req, *streamed_media_req; - - call_request = empathy_call_create_call_request (contact, - initial_audio, - initial_video); - - streamed_media_request = empathy_call_create_streamed_media_request ( - contact, initial_audio, initial_video); - - account = empathy_contact_get_account (contact); - - call_req = tp_account_channel_request_new (account, call_request, timestamp); - streamed_media_req = tp_account_channel_request_new (account, - streamed_media_request, - timestamp); - - 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 - GHashTable *request; - TpAccountChannelRequest *req; - - request = empathy_call_create_streamed_media_request (contact, - initial_audio, - initial_video); - - req = tp_account_channel_request_new (account, request, timestamp); - - tp_account_channel_request_create_channel_async (req, EMPATHY_AV_BUS_NAME, NULL, - create_streamed_media_channel_cb, - NULL); - - g_hash_table_unref (request); - g_object_unref (req); -#endif -} - const gchar * empathy_presence_get_default_message (TpConnectionPresenceType presence) { diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index aa2786c73..9a2f3b924 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -66,18 +66,6 @@ xmlNodePtr empathy_xml_node_find_child_prop_value (xmlNodePtr node, const gchar *prop_name, const gchar *prop_value); -/* Calls */ -void empathy_call_new_with_streams (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video, - gint64 timestamp); -GHashTable * empathy_call_create_call_request (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video); -GHashTable * empathy_call_create_streamed_media_request (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video); - /* Others */ const gchar * empathy_presence_get_default_message (TpConnectionPresenceType presence); const gchar * empathy_presence_to_str (TpConnectionPresenceType presence); -- cgit v1.2.3