aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-chatroom-manager.c8
-rw-r--r--libempathy/empathy-chatroom-manager.h2
-rw-r--r--libempathy/empathy-dispatcher.c2
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 *