Don't override the constructor. (Jonny Lamb)

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

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index 54e9a62f3290d6e64ee34655913b5f0e8c9edf5d..abd4d75151805cd81f1ec99a1cfa1600effb306a 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -91,9 +91,6 @@ log_manager_constructor (GType type,
 
       priv = GET_PRIV (manager_singleton);
 
-      manager_singleton = EMPATHY_LOG_MANAGER (retval);
-      g_object_add_weak_pointer (retval, (gpointer), &manager_singleton);
-
       priv->sources = g_list_append (priv->sources,
           empathy_log_source_empathy_get_source ());
     }
@@ -107,11 +104,25 @@ empathy_log_manager_class_init (EmpathyLogManagerClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = log_manager_finalize;
-  object_class->constructor = log_manager_constructor;
 
   g_type_class_add_private (object_class, sizeof (EmpathyLogManagerPriv));
 }
 
+static void
+empathy_log_manager_init (EmpathyLogManager *manager)
+{
+  EmpathyLogManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+      EMPATHY_TYPE_LOG_MANAGER, EmpathyLogManagerPriv);
+
+  priv->sources = g_list_append (priv->sources,
+      empathy_log_source_empathy_get_source ());
+
+  manager->priv = priv;
+
+  priv->sources = g_list_append (priv->sources,
+      empathy_log_source_empathy_get_source ());
+}
+
 EmpathyLogManager *
 empathy_log_manager_dup_singleton (void)
 {