Fixed problems picked up when rebasing and cherry-picking.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=2585

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index c9b5a304932c2c2265810ef666c3fb36bd1d364c..2a12596590ee2c1e2b825fb9732eadb3a74319ba 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -46,14 +46,6 @@ G_DEFINE_TYPE (EmpathyLogManager, empathy_log_manager, G_TYPE_OBJECT);
 
 static EmpathyLogManager * manager_singleton = NULL;
 
-static void
-empathy_log_manager_init (EmpathyLogManager *manager)
-{
-  EmpathyLogManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
-      EMPATHY_TYPE_LOG_MANAGER, EmpathyLogManagerPriv);
-  manager->priv = priv;
-}
-
 static void
 log_manager_finalize (GObject *object)
 {
@@ -104,6 +96,7 @@ empathy_log_manager_class_init (EmpathyLogManagerClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  object_class->constructor = log_manager_constructor;
   object_class->finalize = log_manager_finalize;
 
   g_type_class_add_private (object_class, sizeof (EmpathyLogManagerPriv));
@@ -118,13 +111,7 @@ empathy_log_manager_init (EmpathyLogManager *manager)
   priv->sources = g_list_append (priv->sources,
       g_object_new (EMPATHY_TYPE_LOG_SOURCE_EMPATHY, NULL));
 
-/*  priv->sources = g_list_append (priv->sources,
-      g_object_new (EMPATHY_LOG_SOURCE_PIDGIN, NULL));*/
-
   manager->priv = priv;
-
-  priv->sources = g_list_append (priv->sources,
-      empathy_log_source_empathy_get_source ());
 }
 
 EmpathyLogManager *