From 255122bf7551636726abccf659e68a9c9e1b6bd7 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Fri, 6 Mar 2009 11:51:28 +0000 Subject: [PATCH] Don't override the constructor. (Jonny Lamb) Signed-off-by: Jonny Lamb svn path=/trunk/; revision=2581 --- libempathy/empathy-log-manager.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c index 54e9a62f..abd4d751 100644 --- 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) { -- 2.39.2