empathy r1542 - in trunk: libempathy src

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Oct 13 07:53:43 2008
New Revision: 1542
URL: http://svn.gnome.org/viewvc/empathy?rev=1542&view=rev

Log:
add the file path as arg to empathy_chatroom_manager_new

Modified:
   trunk/libempathy/empathy-chatroom-manager.c
   trunk/libempathy/empathy-chatroom-manager.h
   trunk/libempathy/empathy-dispatcher.c
   trunk/src/empathy-chatrooms-window.c
   trunk/src/empathy-main-window.c

Modified: trunk/libempathy/empathy-chatroom-manager.c
==============================================================================
--- trunk/libempathy/empathy-chatroom-manager.c	(original)
+++ trunk/libempathy/empathy-chatroom-manager.c	Mon Oct 13 07:53:43 2008
@@ -65,7 +65,7 @@
 /* properties */
 enum
 {
-  PROP_FILE =1,
+  PROP_FILE = 1,
   LAST_PROPERTY
 };
 
@@ -215,12 +215,14 @@
 }
 
 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 {

Modified: trunk/libempathy/empathy-chatroom-manager.h
==============================================================================
--- trunk/libempathy/empathy-chatroom-manager.h	(original)
+++ trunk/libempathy/empathy-chatroom-manager.h	Mon Oct 13 07:53:43 2008
@@ -53,7 +53,7 @@
 };
 
 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,

Modified: trunk/libempathy/empathy-dispatcher.c
==============================================================================
--- trunk/libempathy/empathy-dispatcher.c	(original)
+++ trunk/libempathy/empathy-dispatcher.c	Mon Oct 13 07:53:43 2008
@@ -752,7 +752,7 @@
 	}
 	g_list_free (accounts);
 
-  priv->chatroom_mgr = empathy_chatroom_manager_new ();
+  priv->chatroom_mgr = empathy_chatroom_manager_new (NULL);
 }
 
 EmpathyDispatcher *

Modified: trunk/src/empathy-chatrooms-window.c
==============================================================================
--- trunk/src/empathy-chatrooms-window.c	(original)
+++ trunk/src/empathy-chatrooms-window.c	Mon Oct 13 07:53:43 2008
@@ -144,7 +144,7 @@
 	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),

Modified: trunk/src/empathy-main-window.c
==============================================================================
--- trunk/src/empathy-main-window.c	(original)
+++ trunk/src/empathy-main-window.c	Mon Oct 13 07:53:43 2008
@@ -619,7 +619,7 @@
 {
 	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));