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 18:08:18 +0800 |
| commit | fd52278cc48cc8fb0a69d61d35eb59e96077e13a (patch) | |
| tree | 95765f9b23ecdd2c2031037eb8676adf784c15c7 /src | |
| parent | 42a6c594b066bb28ee7ccfe66837562caf72254d (diff) | |
| download | gsoc2013-empathy-fd52278cc48cc8fb0a69d61d35eb59e96077e13a.tar gsoc2013-empathy-fd52278cc48cc8fb0a69d61d35eb59e96077e13a.tar.gz gsoc2013-empathy-fd52278cc48cc8fb0a69d61d35eb59e96077e13a.tar.bz2 gsoc2013-empathy-fd52278cc48cc8fb0a69d61d35eb59e96077e13a.tar.lz gsoc2013-empathy-fd52278cc48cc8fb0a69d61d35eb59e96077e13a.tar.xz gsoc2013-empathy-fd52278cc48cc8fb0a69d61d35eb59e96077e13a.tar.zst gsoc2013-empathy-fd52278cc48cc8fb0a69d61d35eb59e96077e13a.zip | |
EmpathyCallFactory -> EmpathyStreamedMediaFactory
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-av.c | 10 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 1 | ||||
| -rw-r--r-- | src/empathy-streamed-media-window.c | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/empathy-av.c b/src/empathy-av.c index 2fd25570d..00fc1c614 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" @@ -93,7 +93,7 @@ call_window_destroy_cb (EmpathyStreamedMediaWindow *window, } static void -new_call_handler_cb (EmpathyCallFactory *factory, +new_call_handler_cb (EmpathyStreamedMediaFactory *factory, EmpathyStreamedMediaHandler *handler, gboolean outgoing, gpointer user_data) @@ -124,7 +124,7 @@ main (int argc, #ifdef ENABLE_DEBUG TpDebugSender *debug_sender; #endif - EmpathyCallFactory *call_factory; + EmpathyStreamedMediaFactory *call_factory; GError *error = NULL; /* Init */ @@ -158,12 +158,12 @@ main (int argc, g_log_set_default_handler (tp_debug_sender_log_handler, G_LOG_DOMAIN); #endif - 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 bbb9dc603..15c08dcbf 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 0b8ff7d3a..189537f7c 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> |