diff options
| -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 | ||||
| -rw-r--r-- | src/empathy-chatrooms-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 2 |
5 files changed, 9 insertions, 7 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 * diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c index 52c6635bf..fd2b3e4f6 100644 --- 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 52a88c548..c5437385f 100644 --- 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)); |