diff options
| -rw-r--r-- | src/telepathy-logger.c | 8 | ||||
| -rw-r--r-- | telepathy-logger/channel-factory-internal.h | 10 | ||||
| -rw-r--r-- | telepathy-logger/channel-factory.c | 12 | ||||
| -rw-r--r-- | tests/twisted/main-debug.c | 4 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/telepathy-logger.c b/src/telepathy-logger.c index b7f5b0b..c15e5c1 100644 --- a/src/telepathy-logger.c +++ b/src/telepathy-logger.c @@ -165,16 +165,16 @@ main (int argc, g_log_set_default_handler (log_handler, NULL); #endif /* ENABLE_DEBUG */ - tpl_channel_factory_init (); + _tpl_channel_factory_init (); DEBUG ("Initialising TPL Channel Factory"); - tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.Text", + _tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.Text", (TplChannelConstructor) tpl_channel_text_new); DEBUG ("- TplChannelText registred."); observer = tpl_observer_new (); DEBUG ("Registering channel factory into TplObserver"); - tpl_observer_set_channel_factory (observer, tpl_channel_factory_build); + tpl_observer_set_channel_factory (observer, _tpl_channel_factory_build); if (!tp_base_client_register (TP_BASE_CLIENT (observer), &error)) { @@ -193,7 +193,7 @@ out: g_object_unref (observer); if (dbus_srv != NULL) g_object_unref (dbus_srv); - tpl_channel_factory_deinit (); + _tpl_channel_factory_deinit (); #ifdef ENABLE_DEBUG g_log_set_default_handler (g_log_default_handler, NULL); diff --git a/telepathy-logger/channel-factory-internal.h b/telepathy-logger/channel-factory-internal.h index 8c7dfc3..960c31f 100644 --- a/telepathy-logger/channel-factory-internal.h +++ b/telepathy-logger/channel-factory-internal.h @@ -45,12 +45,12 @@ typedef TplChannel* (*TplChannelFactory) (const gchar *chan_type, TpConnection *conn, const gchar *object_path, GHashTable *tp_chan_props, TpAccount *tp_acc, GError **error); -void tpl_channel_factory_init (void); -void tpl_channel_factory_deinit (void); -void tpl_channel_factory_add (const gchar *type, +void _tpl_channel_factory_init (void); +void _tpl_channel_factory_deinit (void); +void _tpl_channel_factory_add (const gchar *type, TplChannelConstructor constructor); -TplChannelConstructor tpl_channel_factory_lookup (const gchar *type); -TplChannel *tpl_channel_factory_build (const gchar *channel_type, +TplChannelConstructor _tpl_channel_factory_lookup (const gchar *type); +TplChannel * _tpl_channel_factory_build (const gchar *channel_type, TpConnection *conn, const gchar *object_path, GHashTable *tp_chan_props, TpAccount *tp_acc, GError **error); diff --git a/telepathy-logger/channel-factory.c b/telepathy-logger/channel-factory.c index 7289258..63ac917 100644 --- a/telepathy-logger/channel-factory.c +++ b/telepathy-logger/channel-factory.c @@ -33,7 +33,7 @@ static GHashTable *channel_table = NULL; void -tpl_channel_factory_init (void) +_tpl_channel_factory_init (void) { g_return_if_fail (channel_table == NULL); @@ -43,7 +43,7 @@ tpl_channel_factory_init (void) void -tpl_channel_factory_add (const gchar *type, +_tpl_channel_factory_add (const gchar *type, TplChannelConstructor constructor) { gchar *key; @@ -65,7 +65,7 @@ tpl_channel_factory_add (const gchar *type, TplChannelConstructor -tpl_channel_factory_lookup (const gchar *type) +_tpl_channel_factory_lookup (const gchar *type) { g_return_val_if_fail (!TPL_STR_EMPTY (type), NULL); g_return_val_if_fail (channel_table != NULL, NULL); @@ -74,7 +74,7 @@ tpl_channel_factory_lookup (const gchar *type) } void -tpl_channel_factory_deinit (void) +_tpl_channel_factory_deinit (void) { g_return_if_fail (channel_table != NULL); @@ -83,7 +83,7 @@ tpl_channel_factory_deinit (void) } TplChannel * -tpl_channel_factory_build (const gchar *channel_type, +_tpl_channel_factory_build (const gchar *channel_type, TpConnection *conn, const gchar *object_path, GHashTable *tp_chan_props, @@ -94,7 +94,7 @@ tpl_channel_factory_build (const gchar *channel_type, g_return_val_if_fail (channel_table != NULL, NULL); - chan_constructor = tpl_channel_factory_lookup (channel_type); + chan_constructor = _tpl_channel_factory_lookup (channel_type); if (chan_constructor == NULL) { g_set_error (error, TPL_CHANNEL_FACTORY_ERROR, diff --git a/tests/twisted/main-debug.c b/tests/twisted/main-debug.c index c3f04ac..48213ad 100644 --- a/tests/twisted/main-debug.c +++ b/tests/twisted/main-debug.c @@ -36,8 +36,8 @@ tpl_init (void) g_type_init (); - tpl_channel_factory_init (); - tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.Text", + _tpl_channel_factory_init (); + _tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.Text", (TplChannelConstructor) tpl_channel_test_new); observer = tpl_observer_new (); |