[empathy] empathy_call_factory_new_call_with_streams: remove callback arg



commit 3f28e2304aab16ad6d68054a19dcbfdd5c75e7c8
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Aug 9 14:57:08 2010 +0200

    empathy_call_factory_new_call_with_streams: remove callback arg
    
    If you want to handle the channel yourself then use TpAccountChannelRequest.

 libempathy-gtk/empathy-contact-menu.c    |    4 ++--
 libempathy-gtk/empathy-individual-menu.c |    4 ++--
 libempathy/empathy-call-factory.c        |    3 +--
 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 9094c68..a75fe8f 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 d3770d1..c3edf06 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 8d46310..06029c4 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 aa2175a..10b911f 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,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]