diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-10 00:48:34 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-10 17:24:55 +0800 |
| commit | 2104fdf4bd3b020e2dca0d397ce445423f463704 (patch) | |
| tree | 70b7c1d771c95828322c2254f199e4759fd3db6f /libempathy-gtk | |
| parent | f22e466ab6e525a148145f66aed3ce4a0f23128a (diff) | |
| download | gsoc2013-empathy-2104fdf4bd3b020e2dca0d397ce445423f463704.tar gsoc2013-empathy-2104fdf4bd3b020e2dca0d397ce445423f463704.tar.gz gsoc2013-empathy-2104fdf4bd3b020e2dca0d397ce445423f463704.tar.bz2 gsoc2013-empathy-2104fdf4bd3b020e2dca0d397ce445423f463704.tar.lz gsoc2013-empathy-2104fdf4bd3b020e2dca0d397ce445423f463704.tar.xz gsoc2013-empathy-2104fdf4bd3b020e2dca0d397ce445423f463704.tar.zst gsoc2013-empathy-2104fdf4bd3b020e2dca0d397ce445423f463704.zip | |
Move a couple of call-related functions to empathy-utils.h
Since the rest of the call stuff will only be compiled for
empathy-av so we don't link every binary against farsight.
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 9 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-menu.c | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index ac5d98f48..cff1bf4e5 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -27,7 +27,6 @@ #include <gtk/gtk.h> #include <telepathy-logger/log-manager.h> -#include <libempathy/empathy-streamed-media-factory.h> #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-utils.h> @@ -248,8 +247,8 @@ empathy_contact_audio_call_menu_item_activated (GtkMenuItem *item, EmpathyContact *contact) { - empathy_streamed_media_factory_new_call_with_streams (contact, TRUE, FALSE, - gtk_get_current_event_time (), NULL); + empathy_call_new_with_streams (contact, TRUE, FALSE, + gtk_get_current_event_time ()); } GtkWidget * @@ -279,8 +278,8 @@ static void empathy_contact_video_call_menu_item_activated (GtkMenuItem *item, EmpathyContact *contact) { - empathy_streamed_media_factory_new_call_with_streams (contact, TRUE, TRUE, - gtk_get_current_event_time (), NULL); + empathy_call_new_with_streams (contact, TRUE, TRUE, + gtk_get_current_event_time ()); } GtkWidget * diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index faa4ff6aa..1dc463330 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -31,7 +31,6 @@ #include <folks/folks.h> #include <folks/folks-telepathy.h> -#include <libempathy/empathy-streamed-media-factory.h> #include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-chatroom-manager.h> @@ -543,8 +542,8 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item, { g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - empathy_streamed_media_factory_new_call_with_streams (contact, TRUE, FALSE, - gtk_get_current_event_time (), NULL); + empathy_call_new_with_streams (contact, TRUE, FALSE, + gtk_get_current_event_time ()); } GtkWidget * @@ -585,8 +584,8 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item, { g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - empathy_streamed_media_factory_new_call_with_streams (contact, TRUE, TRUE, - gtk_get_current_event_time (), NULL); + empathy_call_new_with_streams (contact, TRUE, TRUE, + gtk_get_current_event_time ()); } GtkWidget * |