diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-09 20:57:08 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 18:27:57 +0800 |
| commit | 3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8 (patch) | |
| tree | 519e25b7370d2bc6774ef7abaf5ce20c9c682635 | |
| parent | 82ffd1da38bd5e6b81d757d5218b41cde85d77ae (diff) | |
| download | gsoc2013-empathy-3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8.tar gsoc2013-empathy-3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8.tar.gz gsoc2013-empathy-3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8.tar.bz2 gsoc2013-empathy-3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8.tar.lz gsoc2013-empathy-3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8.tar.xz gsoc2013-empathy-3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8.tar.zst gsoc2013-empathy-3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8.zip | |
empathy_call_factory_new_call_with_streams: remove callback arg
If you want to handle the channel yourself then use TpAccountChannelRequest.
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-menu.c | 4 | ||||
| -rw-r--r-- | libempathy/empathy-call-factory.c | 3 | ||||
| -rw-r--r-- | libempathy/empathy-call-factory.h | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 9094c6854..a75fe8fab 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -247,7 +247,7 @@ empathy_contact_audio_call_menu_item_activated (GtkMenuItem *item, { empathy_call_factory_new_call_with_streams (contact, TRUE, FALSE, - gtk_get_current_event_time (), NULL, NULL); + gtk_get_current_event_time (), NULL); } GtkWidget * @@ -277,7 +277,7 @@ empathy_contact_video_call_menu_item_activated (GtkMenuItem *item, EmpathyContact *contact) { empathy_call_factory_new_call_with_streams (contact, TRUE, TRUE, - gtk_get_current_event_time (), NULL, NULL); + gtk_get_current_event_time (), NULL); } GtkWidget * diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index d3770d115..c3edf06c7 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -284,7 +284,7 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item, g_return_if_fail (EMPATHY_IS_CONTACT (contact)); empathy_call_factory_new_call_with_streams (contact, TRUE, FALSE, - gtk_get_current_event_time (), NULL, NULL); + gtk_get_current_event_time (), NULL); g_object_unref (contact); } @@ -327,7 +327,7 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item, g_return_if_fail (EMPATHY_IS_CONTACT (contact)); empathy_call_factory_new_call_with_streams (contact, TRUE, TRUE, - gtk_get_current_event_time (), NULL, NULL); + gtk_get_current_event_time (), NULL); g_object_unref (contact); } diff --git a/libempathy/empathy-call-factory.c b/libempathy/empathy-call-factory.c index 8d46310be..06029c4bd 100644 --- a/libempathy/empathy-call-factory.c +++ b/libempathy/empathy-call-factory.c @@ -220,7 +220,6 @@ empathy_call_factory_new_call_with_streams (EmpathyContact *contact, gboolean initial_audio, gboolean initial_video, gint64 timestamp, - EmpathyDispatcherRequestCb callback, gpointer user_data) { EmpathyDispatcher *dispatcher; @@ -232,7 +231,7 @@ empathy_call_factory_new_call_with_streams (EmpathyContact *contact, dispatcher = empathy_dispatcher_dup_singleton (); empathy_dispatcher_create_channel (dispatcher, - empathy_contact_get_connection (contact), request, timestamp, callback, + empathy_contact_get_connection (contact), request, timestamp, NULL, user_data); g_object_unref (dispatcher); diff --git a/libempathy/empathy-call-factory.h b/libempathy/empathy-call-factory.h index aa2175a2d..10b911f82 100644 --- a/libempathy/empathy-call-factory.h +++ b/libempathy/empathy-call-factory.h @@ -69,7 +69,6 @@ void empathy_call_factory_new_call_with_streams (EmpathyContact *contact, gboolean initial_audio, gboolean initial_video, gint64 timestamp, - EmpathyDispatcherRequestCb callback, gpointer user_data); gboolean empathy_call_factory_register (EmpathyCallFactory *self, |