diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-10 00:29:24 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-10 17:24:55 +0800 |
| commit | f22e466ab6e525a148145f66aed3ce4a0f23128a (patch) | |
| tree | 2a51ab5ca8aca531b5872f0d259041ec1409cc3e /src | |
| parent | e4d6dc647732a895dbf6c1b0983ccad39ed3a61c (diff) | |
| download | gsoc2013-empathy-f22e466ab6e525a148145f66aed3ce4a0f23128a.tar gsoc2013-empathy-f22e466ab6e525a148145f66aed3ce4a0f23128a.tar.gz gsoc2013-empathy-f22e466ab6e525a148145f66aed3ce4a0f23128a.tar.bz2 gsoc2013-empathy-f22e466ab6e525a148145f66aed3ce4a0f23128a.tar.lz gsoc2013-empathy-f22e466ab6e525a148145f66aed3ce4a0f23128a.tar.xz gsoc2013-empathy-f22e466ab6e525a148145f66aed3ce4a0f23128a.tar.zst gsoc2013-empathy-f22e466ab6e525a148145f66aed3ce4a0f23128a.zip | |
EmpathyCallFactory -> EmpathyStreamedMediaFactory
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-av.c | 12 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 1 | ||||
| -rw-r--r-- | src/empathy-streamed-media-window.c | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/empathy-av.c b/src/empathy-av.c index 6aef1fdd1..cfe71d1a5 100644 --- a/src/empathy-av.c +++ b/src/empathy-av.c @@ -28,7 +28,7 @@ #include <telepathy-glib/debug-sender.h> -#include <libempathy/empathy-call-factory.h> +#include <libempathy/empathy-streamed-media-factory.h> #include <libempathy-gtk/empathy-ui-utils.h> #include "empathy-streamed-media-window.h" @@ -47,17 +47,17 @@ static GtkApplication *app = NULL; static gboolean activated = FALSE; static gboolean use_timer = TRUE; -static EmpathyCallFactory *call_factory = NULL; +static EmpathyStreamedMediaFactory *call_factory = NULL; static void -new_call_handler_cb (EmpathyCallFactory *factory, +new_call_handler_cb (EmpathyStreamedMediaFactory *factory, EmpathyStreamedMediaHandler *handler, gboolean outgoing, gpointer user_data) { EmpathyStreamedMediaWindow *window; - DEBUG ("Create a new call window"); + DEBUG ("Create a new StreamedMedia window"); window = empathy_streamed_media_window_new (handler); @@ -86,12 +86,12 @@ activate_cb (GApplication *application) } g_assert (call_factory == NULL); - call_factory = empathy_call_factory_initialise (); + call_factory = empathy_streamed_media_factory_initialise (); g_signal_connect (G_OBJECT (call_factory), "new-streamed-media-handler", G_CALLBACK (new_call_handler_cb), NULL); - if (!empathy_call_factory_register (call_factory, &error)) + if (!empathy_streamed_media_factory_register (call_factory, &error)) { g_critical ("Failed to register Handler: %s", error->message); g_error_free (error); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index ffe8e597f..96950c5f9 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -36,7 +36,6 @@ #include <libempathy/empathy-tp-streamed-media.h> #include <libempathy/empathy-tp-file.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-call-factory.h> #include <libempathy/empathy-gsettings.h> #include <extensions/extensions.h> diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index c324d45c0..2408f975a 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -36,7 +36,6 @@ #include <gst/farsight/fs-element-added-notifier.h> #include <libempathy/empathy-tp-contact-factory.h> -#include <libempathy/empathy-call-factory.h> #include <libempathy/empathy-utils.h> #include <libempathy-gtk/empathy-avatar-image.h> #include <libempathy-gtk/empathy-video-widget.h> |