Use the new empathy_call_create_call_request thoroughly

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 68ba2b2ba8fc6ca2e6acc28dd6f9d7b09f4c4035..029f8eca7c5a015195a6fbb766d0c6a104787420 100644 (file)
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -203,24 +203,6 @@ empathy_call_factory_get (void)
   return EMPATHY_CALL_FACTORY (call_factory);
 }
 
-GHashTable *
-empathy_call_factory_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);
-}
-
 static void
 create_call_channel_cb (GObject *source,
     GAsyncResult *result,
@@ -256,7 +238,7 @@ empathy_call_factory_new_call_with_streams (EmpathyContact *contact,
   TpAccount *account;
   TpAccountChannelRequest *call_req;
 
-  call_request = empathy_call_factory_create_call_request (contact,
+  call_request = empathy_call_create_call_request (contact,
       initial_audio, initial_video);
 
   account = empathy_contact_get_account (contact);

diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h
index 665d981560376f17cfcac07bc808fdd54c35f7e2..121e93b6425ddd73c23db645f872a07f0c3a410d 100644 (file)
--- a/src/empathy-call-factory.h
+++ b/src/empathy-call-factory.h
@@ -70,11 +70,6 @@ void empathy_call_factory_new_call_with_streams (EmpathyContact *contact,
 gboolean empathy_call_factory_register (EmpathyCallFactory *self,
     GError **error);
 
-GHashTable * empathy_call_factory_create_call_request (
-    EmpathyContact *contact,
-    gboolean initial_audio,
-    gboolean initial_video);
-
 G_END_DECLS
 
 #endif /* #ifndef __EMPATHY_CALL_FACTORY_H__*/

diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index a99bf61e5cb90983543c85fbb2bcd12e976bd099..5dd5482298d199f2d9f94f93cc97e91b6701d89b 100644 (file)
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -893,7 +893,7 @@ empathy_call_handler_start_call (EmpathyCallHandler *handler,
   g_assert (priv->contact != NULL);
 
   account = empathy_contact_get_account (priv->contact);
-  request = empathy_call_factory_create_call_request (priv->contact,
+  request = empathy_call_create_call_request (priv->contact,
       priv->initial_audio, priv->initial_video);
 
   req = tp_account_channel_request_new (account, request, timestamp);