diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-10-13 15:53:43 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-10-13 15:53:43 +0800 |
| commit | fc8158f824770fc98f8170d686dd1d1f7a896712 (patch) | |
| tree | c8af613d8ab6ce4823756d4a6a9c78d0dd8c91af /libempathy | |
| parent | 844f5a7fa192a0805fb13394bff08a4de27aa025 (diff) | |
| download | gsoc2013-empathy-fc8158f824770fc98f8170d686dd1d1f7a896712.tar gsoc2013-empathy-fc8158f824770fc98f8170d686dd1d1f7a896712.tar.gz gsoc2013-empathy-fc8158f824770fc98f8170d686dd1d1f7a896712.tar.bz2 gsoc2013-empathy-fc8158f824770fc98f8170d686dd1d1f7a896712.tar.lz gsoc2013-empathy-fc8158f824770fc98f8170d686dd1d1f7a896712.tar.xz gsoc2013-empathy-fc8158f824770fc98f8170d686dd1d1f7a896712.tar.zst gsoc2013-empathy-fc8158f824770fc98f8170d686dd1d1f7a896712.zip | |
add the file path as arg to empathy_chatroom_manager_new
svn path=/trunk/; revision=1542
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-chatroom-manager.c | 8 | ||||
| -rw-r--r-- | libempathy/empathy-chatroom-manager.h | 2 | ||||
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index 6b47cd778..839e5da8e 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -65,7 +65,7 @@ static guint signals[LAST_SIGNAL]; /* properties */ enum { - PROP_FILE =1, + PROP_FILE = 1, LAST_PROPERTY }; @@ -215,12 +215,14 @@ chatroom_manager_finalize (GObject *object) } EmpathyChatroomManager * -empathy_chatroom_manager_new (void) +empathy_chatroom_manager_new (const gchar *file) { static EmpathyChatroomManager *manager = NULL; if (!manager) { - manager = g_object_new (EMPATHY_TYPE_CHATROOM_MANAGER, NULL); + manager = g_object_new (EMPATHY_TYPE_CHATROOM_MANAGER, + "file", file, + NULL); g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager); } else { diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h index 0b21b6509..2d9b00977 100644 --- a/libempathy/empathy-chatroom-manager.h +++ b/libempathy/empathy-chatroom-manager.h @@ -53,7 +53,7 @@ struct _EmpathyChatroomManagerClass { }; GType empathy_chatroom_manager_get_type (void) G_GNUC_CONST; -EmpathyChatroomManager *empathy_chatroom_manager_new (void); +EmpathyChatroomManager *empathy_chatroom_manager_new (const gchar *file); gboolean empathy_chatroom_manager_add (EmpathyChatroomManager *manager, EmpathyChatroom *chatroom); void empathy_chatroom_manager_remove (EmpathyChatroomManager *manager, diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 406be41fc..5f26eeeed 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -752,7 +752,7 @@ empathy_dispatcher_init (EmpathyDispatcher *dispatcher) } g_list_free (accounts); - priv->chatroom_mgr = empathy_chatroom_manager_new (); + priv->chatroom_mgr = empathy_chatroom_manager_new (NULL); } EmpathyDispatcher * |