empathy r2581 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Mar  6 11:51:28 2009
New Revision: 2581
URL: http://svn.gnome.org/viewvc/empathy?rev=2581&view=rev

Log:
Don't override the constructor. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy/empathy-log-manager.c

Modified: trunk/libempathy/empathy-log-manager.c
==============================================================================
--- trunk/libempathy/empathy-log-manager.c	(original)
+++ trunk/libempathy/empathy-log-manager.c	Fri Mar  6 11:51:28 2009
@@ -91,9 +91,6 @@
 
       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 @@
   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)
 {