diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-03-06 19:51:42 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-03-06 19:51:42 +0800 |
| commit | e5e97bf1abebf43b7ca382463ab79f8277cd685e (patch) | |
| tree | 0b1f914cc2bdba9475ed1efc59f622a359348b0e | |
| parent | 90cd18fecbdf2491d80d298bb766d11f3eb1be0a (diff) | |
| download | gsoc2013-empathy-e5e97bf1abebf43b7ca382463ab79f8277cd685e.tar gsoc2013-empathy-e5e97bf1abebf43b7ca382463ab79f8277cd685e.tar.gz gsoc2013-empathy-e5e97bf1abebf43b7ca382463ab79f8277cd685e.tar.bz2 gsoc2013-empathy-e5e97bf1abebf43b7ca382463ab79f8277cd685e.tar.lz gsoc2013-empathy-e5e97bf1abebf43b7ca382463ab79f8277cd685e.tar.xz gsoc2013-empathy-e5e97bf1abebf43b7ca382463ab79f8277cd685e.tar.zst gsoc2013-empathy-e5e97bf1abebf43b7ca382463ab79f8277cd685e.zip | |
Fixed problems picked up when rebasing and cherry-picking.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=2585
| -rw-r--r-- | libempathy/empathy-log-manager.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c index c9b5a3049..2a1259659 100644 --- a/libempathy/empathy-log-manager.c +++ b/libempathy/empathy-log-manager.c @@ -47,14 +47,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) { EmpathyLogManagerPriv *priv; @@ -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 * |