diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-07-04 13:45:07 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-07-04 17:25:15 +0200 |
| commit | 48824e96b9ccb1b08bf421b248277e382c102f28 (patch) | |
| tree | 03ae4b5386effb6fecddbcfe57162e3f281a14e3 /src | |
| parent | 83321bc4095d064652a0dd2b537e171b5f6fedd5 (diff) | |
| download | telepathy-logger-48824e96b9ccb1b08bf421b248277e382c102f28.tar.gz | |
Stop using TplChannelFactory, reply on TplClientFactory instead
Give a TplClientFactory to the TplObserver, so we get already prepared
TplTextChannel and TplCallChannel subclasses.
Diffstat (limited to 'src')
| -rw-r--r-- | src/telepathy-logger.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/telepathy-logger.c b/src/telepathy-logger.c index aaf0e2e..9f63bdf 100644 --- a/src/telepathy-logger.c +++ b/src/telepathy-logger.c @@ -24,11 +24,8 @@ #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-logger/channel-factory-internal.h> -#include <telepathy-logger/text-channel-internal.h> #include <telepathy-logger/observer-internal.h> #include <telepathy-logger/dbus-service-internal.h> -#include <telepathy-logger/call-channel-internal.h> #define DEBUG_FLAG TPL_DEBUG_MAIN #include <telepathy-logger/debug-internal.h> @@ -153,18 +150,6 @@ main (int argc, g_log_set_default_handler (log_handler, NULL); #endif /* ENABLE_DEBUG */ - _tpl_channel_factory_init (); - - DEBUG ("Initialising TPL Channel Factory"); - - _tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.Text", - (TplChannelConstructor) _tpl_text_channel_new); - DEBUG ("- TplTextChannel registered."); - - _tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.Call1", - (TplChannelConstructor) _tpl_call_channel_new); - DEBUG ("- TplCallChannel registered."); - observer = _tpl_observer_dup (&error); if (observer == NULL) { @@ -173,9 +158,6 @@ main (int argc, goto out; } - DEBUG ("Registering channel factory into TplObserver"); - _tpl_observer_set_channel_factory (observer, _tpl_channel_factory_build); - if (!tp_base_client_register (TP_BASE_CLIENT (observer), &error)) { g_critical ("Error during D-Bus registration: %s", error->message); @@ -193,7 +175,6 @@ out: g_object_unref (observer); if (dbus_srv != NULL) g_object_unref (dbus_srv); - _tpl_channel_factory_deinit (); #ifdef ENABLE_DEBUG g_log_set_default_handler (g_log_default_handler, NULL); |