diff options
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 9 | ||||
| -rw-r--r-- | libempathy/empathy-call-factory.c | 3 | ||||
| -rw-r--r-- | libempathy/empathy-call-factory.h | 3 | ||||
| -rw-r--r-- | libempathy/empathy-call-handler.c | 4 |
4 files changed, 6 insertions, 13 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 7c18694ae..9094c6854 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -245,10 +245,8 @@ static void empathy_contact_audio_call_menu_item_activated (GtkMenuItem *item, EmpathyContact *contact) { - EmpathyCallFactory *factory; - factory = empathy_call_factory_get (); - empathy_call_factory_new_call_with_streams (factory, contact, TRUE, FALSE, + empathy_call_factory_new_call_with_streams (contact, TRUE, FALSE, gtk_get_current_event_time (), NULL, NULL); } @@ -278,10 +276,7 @@ static void empathy_contact_video_call_menu_item_activated (GtkMenuItem *item, EmpathyContact *contact) { - EmpathyCallFactory *factory; - - factory = empathy_call_factory_get (); - empathy_call_factory_new_call_with_streams (factory, contact, TRUE, TRUE, + empathy_call_factory_new_call_with_streams (contact, TRUE, TRUE, gtk_get_current_event_time (), NULL, NULL); } diff --git a/libempathy/empathy-call-factory.c b/libempathy/empathy-call-factory.c index 65ab88359..ab32d06ad 100644 --- a/libempathy/empathy-call-factory.c +++ b/libempathy/empathy-call-factory.c @@ -203,8 +203,7 @@ empathy_call_factory_get (void) * Initiate a new call with @contact. */ void -empathy_call_factory_new_call_with_streams (EmpathyCallFactory *factory, - EmpathyContact *contact, +empathy_call_factory_new_call_with_streams (EmpathyContact *contact, gboolean initial_audio, gboolean initial_video, gint64 timestamp, diff --git a/libempathy/empathy-call-factory.h b/libempathy/empathy-call-factory.h index b9b812b8d..56d430ed4 100644 --- a/libempathy/empathy-call-factory.h +++ b/libempathy/empathy-call-factory.h @@ -65,8 +65,7 @@ EmpathyCallFactory *empathy_call_factory_initialise (void); EmpathyCallFactory *empathy_call_factory_get (void); -void empathy_call_factory_new_call_with_streams (EmpathyCallFactory *factory, - EmpathyContact *contact, +void empathy_call_factory_new_call_with_streams (EmpathyContact *contact, gboolean initial_audio, gboolean initial_video, gint64 timestamp, diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c index 9ba115a60..1f9ab7213 100644 --- a/libempathy/empathy-call-handler.c +++ b/libempathy/empathy-call-handler.c @@ -484,8 +484,8 @@ empathy_call_handler_start_call (EmpathyCallHandler *handler, * will be used to create a new EmpathyTpCall. */ g_assert (priv->contact != NULL); - empathy_call_factory_new_call_with_streams (empathy_call_factory_get (), - priv->contact, priv->initial_audio, priv->initial_video, timestamp, + empathy_call_factory_new_call_with_streams (priv->contact, + priv->initial_audio, priv->initial_video, timestamp, empathy_call_handler_request_cb, handler); } |