diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-19 01:05:33 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-02-23 22:50:44 +0800 |
| commit | 2507d4632deeadc3f52500549d40634ba6e113f6 (patch) | |
| tree | 658d55ae7bde17b8a3ac9151e368025893a8902f | |
| parent | c777e8e659a70fc418fdd99caa7f4771dad93163 (diff) | |
| download | gsoc2013-empathy-2507d4632deeadc3f52500549d40634ba6e113f6.tar gsoc2013-empathy-2507d4632deeadc3f52500549d40634ba6e113f6.tar.gz gsoc2013-empathy-2507d4632deeadc3f52500549d40634ba6e113f6.tar.bz2 gsoc2013-empathy-2507d4632deeadc3f52500549d40634ba6e113f6.tar.lz gsoc2013-empathy-2507d4632deeadc3f52500549d40634ba6e113f6.tar.xz gsoc2013-empathy-2507d4632deeadc3f52500549d40634ba6e113f6.tar.zst gsoc2013-empathy-2507d4632deeadc3f52500549d40634ba6e113f6.zip | |
Use the new empathy_call_create_call_request thoroughly
| -rw-r--r-- | src/empathy-call-factory.c | 20 | ||||
| -rw-r--r-- | src/empathy-call-factory.h | 5 | ||||
| -rw-r--r-- | src/empathy-call-handler.c | 2 |
3 files changed, 2 insertions, 25 deletions
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index 1f5170e4a..73631ca5e 100644 --- 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 d4cb04e49..d739b4802 100644 --- a/src/empathy-call-factory.h +++ b/src/empathy-call-factory.h @@ -72,11 +72,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 a99bf61e5..5dd548229 100644 --- 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); |