diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-03-06 19:51:28 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-03-06 19:51:28 +0800 |
| commit | 255122bf7551636726abccf659e68a9c9e1b6bd7 (patch) | |
| tree | 88c660d41e7a21d471c6eac9db33089f66943be9 | |
| parent | 997336d0f9c77afa7bd229d96e60979fb4eaf23c (diff) | |
| download | gsoc2013-empathy-255122bf7551636726abccf659e68a9c9e1b6bd7.tar gsoc2013-empathy-255122bf7551636726abccf659e68a9c9e1b6bd7.tar.gz gsoc2013-empathy-255122bf7551636726abccf659e68a9c9e1b6bd7.tar.bz2 gsoc2013-empathy-255122bf7551636726abccf659e68a9c9e1b6bd7.tar.lz gsoc2013-empathy-255122bf7551636726abccf659e68a9c9e1b6bd7.tar.xz gsoc2013-empathy-255122bf7551636726abccf659e68a9c9e1b6bd7.tar.zst gsoc2013-empathy-255122bf7551636726abccf659e68a9c9e1b6bd7.zip | |
Don't override the constructor. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=2581
| -rw-r--r-- | libempathy/empathy-log-manager.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c index 54e9a62f3..abd4d7515 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) { |