add the file path as arg to empathy_chatroom_manager_new

svn path=/trunk/; revision=1542

diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 6b47cd778db6be40a5e50d67b7350f1f0361ed76..839e5da8eb6be9dd61de921845c1192a22421e05 100644 (file)
--- 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 0b21b6509c67701244060ac9cb530a061f713a26..2d9b00977f937ad09e0e5160814d357f623d1e60 100644 (file)
--- 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 406be41fcaf8dc88a96b82b36da284496ade94c2..5f26eeeedd74dfd39db3a0d504884ee4e3442b59 100644 (file)
--- 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 *

diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index 52c6635bfba533134db641535aaac8c0511a01e4..fd2b3e4f6950c89207f68fb5ee17744766544df5 100644 (file)
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -144,7 +144,7 @@ empathy_chatrooms_window_show (GtkWindow *parent)
        g_object_add_weak_pointer (G_OBJECT (window->window), (gpointer) &window);
 
        /* Get the session and chat room manager */
-       window->manager = empathy_chatroom_manager_new ();
+       window->manager = empathy_chatroom_manager_new (NULL);
 
        g_signal_connect (window->manager, "chatroom-added",
                          G_CALLBACK (chatrooms_window_chatroom_added_cb),

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 52a88c548ca4a62b933b0ccf65565d2035a97861..c5437385ff0c4de8252da7f301436d9dac74ae72 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -619,7 +619,7 @@ main_window_favorite_chatroom_menu_setup (EmpathyMainWindow *window)
 {
        GList *chatrooms, *l;
 
-       window->chatroom_manager = empathy_chatroom_manager_new ();
+       window->chatroom_manager = empathy_chatroom_manager_new (NULL);
        chatrooms = empathy_chatroom_manager_get_chatrooms (window->chatroom_manager, NULL);
        window->room_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (window->room));