Merge commit 'upstream/master' into mc5

[empathy.git] / libempathy / empathy-chatroom-manager.c

diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 44416670e4c948d4aeddd1e93377a2e132fdc6a4..649dcc9cfb2767ea62a69f8142685da9ed667270 100644 (file)
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -30,6 +30,8 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+#include <telepathy-glib/interfaces.h>
+
 #include "empathy-tp-chat.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-account-manager.h"
@@ -100,7 +102,8 @@ chatroom_manager_file_save (EmpathyChatroomManager *manager)
                        continue;
                }
 
-               account_id = mc_account_get_unique_name (empathy_chatroom_get_account (chatroom));
+               account_id = empathy_account_get_unique_name (
+                 empathy_chatroom_get_account (chatroom));
 
                node = xmlNewChild (root, NULL, "chatroom", NULL);
                xmlNewTextChild (node, NULL, "name", empathy_chatroom_get_name (chatroom));
@@ -174,7 +177,7 @@ chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager,
 {
        EmpathyChatroomManagerPriv *priv;
        EmpathyChatroom            *chatroom;
-       McAccount                 *account;
+       EmpathyAccount             *account;
        xmlNodePtr                 child;
        gchar                     *str;
        gchar                     *name;
@@ -220,7 +223,7 @@ chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager,
                xmlFree (str);
        }
 
-       account = mc_account_lookup (account_id);
+       account = empathy_account_manager_lookup (priv->account_manager, account_id);
        if (!account) {
                g_free (name);
                g_free (room);
@@ -408,7 +411,7 @@ empathy_chatroom_manager_constructor (GType type,
       /* Set the default file path */
       gchar *dir;
 
-      dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+      dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
       if (!g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))
         g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
 
@@ -520,10 +523,11 @@ chatroom_manager_remove_link (EmpathyChatroomManager *manager,
   if (empathy_chatroom_is_favorite (chatroom))
     reset_save_timeout (manager);
 
+  priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
+
   g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, chatroom);
   g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb, manager);
 
-  priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
   g_object_unref (chatroom);
 }
 
@@ -556,21 +560,20 @@ empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
 
 EmpathyChatroom *
 empathy_chatroom_manager_find (EmpathyChatroomManager *manager,
-                               McAccount *account,
+                               EmpathyAccount *account,
                                const gchar *room)
 {
        EmpathyChatroomManagerPriv *priv;
        GList                     *l;
 
        g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
-       g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
        g_return_val_if_fail (room != NULL, NULL);
 
        priv = GET_PRIV (manager);
 
        for (l = priv->chatrooms; l; l = l->next) {
                EmpathyChatroom *chatroom;
-               McAccount      *this_account;
+               EmpathyAccount *this_account;
                const gchar    *this_room;
 
                chatroom = l->data;
@@ -589,7 +592,7 @@ empathy_chatroom_manager_find (EmpathyChatroomManager *manager,
 
 GList *
 empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
-                                      McAccount             *account)
+                                      EmpathyAccount *account)
 {
        EmpathyChatroomManagerPriv *priv;
        GList                     *chatrooms, *l;
@@ -619,7 +622,7 @@ empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
 
 guint
 empathy_chatroom_manager_get_count (EmpathyChatroomManager *manager,
-                                  McAccount             *account)
+                                  EmpathyAccount *account)
 {
        EmpathyChatroomManagerPriv *priv;
        GList                     *l;
@@ -686,7 +689,7 @@ chatroom_manager_observe_channel_cb (EmpathyDispatcher *dispatcher,
   const gchar *roomname;
   GQuark channel_type;
   TpHandleType handle_type;
-  McAccount *account;
+  EmpathyAccount *account;
   TpConnection *connection;
 
   channel_type = empathy_dispatch_operation_get_channel_type_id (operation);