empathy_call_factory_new_call_with_streams: remove callback arg

If you want to handle the channel yourself then use TpAccountChannelRequest.

diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 9094c68546974dfb126f2f56b737cb384635f1f4..a75fe8fabf17cb5e1a2712950a5549cf6c45077a 100644 (file)
--- 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 d3770d11538d117e2286afbb154e29f3f3f16770..c3edf06c7c4a48b56c782892f803ff6b8b67548a 100644 (file)
--- 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 8d46310be3cab5a60841354fe90a95b1606bb722..06029c4bd6298e30dcae12a69c66c4ba933ff716 100644 (file)
--- 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 aa2175a2d3e3408545bb326373947339283a42a7..10b911f8266d582b68e8fa7d28a8c7645735db93 100644 (file)
--- 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,