]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-chatroom-manager.c
Merge branch 'sasl'
[empathy.git] / libempathy / empathy-chatroom-manager.c
index fdc6f3c0c95397d6e071b3497509ebbc017890ac..10b74d22a326dd3a4e90f7aacc2235a09fafdc3e 100644 (file)
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2004-2007 Imendio AB
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2010 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,8 +14,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
  *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  *          Martyn Russell <martyn@imendio.com>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/simple-observer.h>
+#include <telepathy-glib/util.h>
+
 #include "empathy-tp-chat.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-utils.h"
 
 static EmpathyChatroomManager *chatroom_manager_singleton = NULL;
 
+static void observe_channels_cb (TpSimpleObserver *observer,
+    TpAccount *account,
+    TpConnection *connection,
+    GList *channels,
+    TpChannelDispatchOperation *dispatch_operation,
+    GList *requests,
+    TpObserveChannelsContext *context,
+    gpointer user_data);
+
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroomManager)
-typedef struct {
-       GList      *chatrooms;
+typedef struct
+{
+  GList *chatrooms;
   gchar *file;
+  TpAccountManager *account_manager;
+
   /* source id of the autosave timer */
   gint save_timer_id;
-} EmpathyChatroomManagerPriv;
+  gboolean ready;
+  GFileMonitor *monitor;
+  gboolean writing;
 
-static void     chatroom_manager_finalize          (GObject                    *object);
-static gboolean chatroom_manager_get_all           (EmpathyChatroomManager      *manager);
-static gboolean chatroom_manager_file_parse        (EmpathyChatroomManager      *manager,
-                                                   const gchar                *filename);
-static void     chatroom_manager_parse_chatroom    (EmpathyChatroomManager      *manager,
-                                                   xmlNodePtr                  node);
-static gboolean chatroom_manager_file_save         (EmpathyChatroomManager      *manager);
-static void reset_save_timeout (EmpathyChatroomManager *self);
+  TpBaseClient *observer;
+} EmpathyChatroomManagerPriv;
 
 enum {
-       CHATROOM_ADDED,
-       CHATROOM_REMOVED,
-       LAST_SIGNAL
+  CHATROOM_ADDED,
+  CHATROOM_REMOVED,
+  LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL];
@@ -73,16 +85,278 @@ static guint signals[LAST_SIGNAL];
 enum
 {
   PROP_FILE = 1,
+  PROP_READY,
   LAST_PROPERTY
 };
 
 G_DEFINE_TYPE (EmpathyChatroomManager, empathy_chatroom_manager, G_TYPE_OBJECT);
 
+/*
+ * API to save/load and parse the chatrooms file.
+ */
+
+static gboolean
+chatroom_manager_file_save (EmpathyChatroomManager *manager)
+{
+  EmpathyChatroomManagerPriv *priv;
+  xmlDocPtr doc;
+  xmlNodePtr root;
+  GList *l;
+
+  priv = GET_PRIV (manager);
+
+  priv->writing = TRUE;
+
+  doc = xmlNewDoc ((const xmlChar *) "1.0");
+  root = xmlNewNode (NULL, (const xmlChar *) "chatrooms");
+  xmlDocSetRootElement (doc, root);
+
+  for (l = priv->chatrooms; l; l = l->next)
+    {
+      EmpathyChatroom *chatroom;
+      xmlNodePtr       node;
+      const gchar     *account_id;
+
+      chatroom = l->data;
+
+      if (!empathy_chatroom_is_favorite (chatroom))
+        continue;
+
+      account_id = tp_proxy_get_object_path (empathy_chatroom_get_account (
+            chatroom));
+
+      node = xmlNewChild (root, NULL, (const xmlChar *) "chatroom", NULL);
+      xmlNewTextChild (node, NULL, (const xmlChar *) "name",
+        (const xmlChar *) empathy_chatroom_get_name (chatroom));
+      xmlNewTextChild (node, NULL, (const xmlChar *) "room",
+        (const xmlChar *) empathy_chatroom_get_room (chatroom));
+      xmlNewTextChild (node, NULL, (const xmlChar *) "account",
+        (const xmlChar *) account_id);
+      xmlNewTextChild (node, NULL, (const xmlChar *) "auto_connect",
+        empathy_chatroom_get_auto_connect (chatroom) ?
+        (const xmlChar *) "yes" : (const xmlChar *) "no");
+      xmlNewTextChild (node, NULL, (const xmlChar *) "always_urgent",
+        empathy_chatroom_is_always_urgent (chatroom) ?
+        (const xmlChar *) "yes" : (const xmlChar *) "no");
+    }
+
+  /* Make sure the XML is indented properly */
+  xmlIndentTreeOutput = 1;
+
+  DEBUG ("Saving file:'%s'", priv->file);
+  xmlSaveFormatFileEnc (priv->file, doc, "utf-8", 1);
+  xmlFreeDoc (doc);
+
+  xmlMemoryDump ();
+
+  priv->writing = FALSE;
+  return TRUE;
+}
+
+static gboolean
+save_timeout (EmpathyChatroomManager *self)
+{
+  EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+
+  priv->save_timer_id = 0;
+  chatroom_manager_file_save (self);
+
+  return FALSE;
+}
+
+static void
+reset_save_timeout (EmpathyChatroomManager *self)
+{
+  EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+
+  if (priv->save_timer_id > 0)
+    g_source_remove (priv->save_timer_id);
+
+  priv->save_timer_id = g_timeout_add_seconds (SAVE_TIMER,
+      (GSourceFunc) save_timeout, self);
+}
+
+static void
+chatroom_changed_cb (EmpathyChatroom *chatroom,
+    GParamSpec *spec,
+    EmpathyChatroomManager *self)
+{
+  reset_save_timeout (self);
+}
+
+static void
+add_chatroom (EmpathyChatroomManager *self,
+    EmpathyChatroom *chatroom)
+{
+  EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+
+  priv->chatrooms = g_list_prepend (priv->chatrooms, g_object_ref (chatroom));
+
+  g_signal_connect (chatroom, "notify",
+      G_CALLBACK (chatroom_changed_cb), self);
+}
+
+static void
+chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager,
+    xmlNodePtr node)
+{
+  EmpathyChatroomManagerPriv *priv;
+  EmpathyChatroom *chatroom;
+  TpAccount *account;
+  xmlNodePtr child;
+  gchar *str;
+  gchar *name;
+  gchar *room;
+  gchar *account_id;
+  gboolean auto_connect;
+  gboolean always_urgent;
+
+  priv = GET_PRIV (manager);
+
+  /* default values. */
+  name = NULL;
+  room = NULL;
+  auto_connect = TRUE;
+  always_urgent = FALSE;
+  account_id = NULL;
+
+  for (child = node->children; child; child = child->next)
+    {
+      gchar *tag;
+
+      if (xmlNodeIsText (child))
+        continue;
+
+      tag = (gchar *) child->name;
+      str = (gchar *) xmlNodeGetContent (child);
+
+      if (strcmp (tag, "name") == 0)
+        {
+          name = g_strdup (str);
+        }
+      else if (strcmp (tag, "room") == 0)
+        {
+          room = g_strdup (str);
+        }
+      else if (strcmp (tag, "auto_connect") == 0)
+        {
+          if (strcmp (str, "yes") == 0)
+            auto_connect = TRUE;
+          else
+            auto_connect = FALSE;
+        }
+      else if (!tp_strdiff (tag, "always_urgent"))
+        {
+          if (strcmp (str, "yes") == 0)
+            always_urgent = TRUE;
+          else
+            always_urgent = FALSE;
+        }
+      else if (strcmp (tag, "account") == 0)
+        {
+          account_id = g_strdup (str);
+        }
+
+      xmlFree (str);
+    }
+
+  account = tp_account_manager_ensure_account (priv->account_manager,
+    account_id);
+  if (account == NULL)
+    {
+      g_free (name);
+      g_free (room);
+      g_free (account_id);
+      return;
+    }
+
+  chatroom = empathy_chatroom_new_full (account, room, name, auto_connect);
+  empathy_chatroom_set_favorite (chatroom, TRUE);
+  empathy_chatroom_set_always_urgent (chatroom, always_urgent);
+  add_chatroom (manager, chatroom);
+  g_signal_emit (manager, signals[CHATROOM_ADDED], 0, chatroom);
+
+  g_free (name);
+  g_free (room);
+  g_free (account_id);
+}
+
+static gboolean
+chatroom_manager_file_parse (EmpathyChatroomManager *manager,
+    const gchar *filename)
+{
+  EmpathyChatroomManagerPriv *priv;
+  xmlParserCtxtPtr ctxt;
+  xmlDocPtr doc;
+  xmlNodePtr chatrooms;
+  xmlNodePtr node;
+
+  priv = GET_PRIV (manager);
+
+  DEBUG ("Attempting to parse file:'%s'...", filename);
+
+  ctxt = xmlNewParserCtxt ();
+
+  /* Parse and validate the file. */
+  doc = xmlCtxtReadFile (ctxt, filename, NULL, 0);
+  if (doc == NULL)
+    {
+      g_warning ("Failed to parse file:'%s'", filename);
+      xmlFreeParserCtxt (ctxt);
+      return FALSE;
+    }
+
+  if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME))
+    {
+      g_warning ("Failed to validate file:'%s'", filename);
+      xmlFreeDoc (doc);
+      xmlFreeParserCtxt (ctxt);
+      return FALSE;
+    }
+
+  /* The root node, chatrooms. */
+  chatrooms = xmlDocGetRootElement (doc);
+
+  for (node = chatrooms->children; node; node = node->next)
+    {
+      if (strcmp ((gchar *) node->name, "chatroom") == 0)
+        chatroom_manager_parse_chatroom (manager, node);
+    }
+
+  DEBUG ("Parsed %d chatrooms", g_list_length (priv->chatrooms));
+
+  xmlFreeDoc (doc);
+  xmlFreeParserCtxt (ctxt);
+
+  return TRUE;
+}
+
+static gboolean
+chatroom_manager_get_all (EmpathyChatroomManager *manager)
+{
+  EmpathyChatroomManagerPriv *priv;
+
+  priv = GET_PRIV (manager);
+
+  /* read file in */
+  if (g_file_test (priv->file, G_FILE_TEST_EXISTS) &&
+      !chatroom_manager_file_parse (manager, priv->file))
+    return FALSE;
+
+  if (!priv->ready)
+    {
+      priv->ready = TRUE;
+      g_object_notify (G_OBJECT (manager), "ready");
+    }
+
+  return TRUE;
+}
+
 static void
 empathy_chatroom_manager_get_property (GObject *object,
-                                       guint property_id,
-                                       GValue *value,
-                                       GParamSpec *pspec)
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
 {
   EmpathyChatroomManager *self = EMPATHY_CHATROOM_MANAGER (object);
   EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
@@ -92,6 +366,9 @@ empathy_chatroom_manager_get_property (GObject *object,
       case PROP_FILE:
         g_value_set_string (value, priv->file);
         break;
+      case PROP_READY:
+        g_value_set_boolean (value, priv->ready);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -100,9 +377,9 @@ empathy_chatroom_manager_get_property (GObject *object,
 
 static void
 empathy_chatroom_manager_set_property (GObject *object,
-                                       guint property_id,
-                                       const GValue *value,
-                                       GParamSpec *pspec)
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
 {
   EmpathyChatroomManager *self = EMPATHY_CHATROOM_MANAGER (object);
   EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
@@ -119,116 +396,49 @@ empathy_chatroom_manager_set_property (GObject *object,
     }
 }
 
-static GObject *
-empathy_chatroom_manager_constructor (GType type,
-                                      guint n_props,
-                                      GObjectConstructParam *props)
+static void
+chatroom_manager_dispose (GObject *object)
 {
-  GObject *obj;
-  EmpathyChatroomManager *self;
   EmpathyChatroomManagerPriv *priv;
 
-  if (chatroom_manager_singleton != NULL)
-    return g_object_ref (chatroom_manager_singleton);
+  priv = GET_PRIV (object);
 
-  /* Parent constructor chain */
-  obj = G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->
-        constructor (type, n_props, props);
-
-  self = EMPATHY_CHATROOM_MANAGER (obj);
-  priv = GET_PRIV (self);
-
-  chatroom_manager_singleton = self;
-  g_object_add_weak_pointer (obj, (gpointer *) &chatroom_manager_singleton);
+  tp_clear_object (&priv->observer);
+  tp_clear_object (&priv->monitor);
 
-  if (priv->file == NULL)
-    {
-      /* Set the default file path */
-      gchar *dir;
-
-      dir = g_build_filename (g_get_home_dir (), ".gnome2", 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);
-
-      priv->file = g_build_filename (dir, CHATROOMS_XML_FILENAME, NULL);
-      g_free (dir);
-    }
-
-  chatroom_manager_get_all (self);
-  return obj;
+  (G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->dispose) (object);
 }
 
 static void
-empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
+clear_chatrooms (EmpathyChatroomManager *self)
 {
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  object_class->constructor = empathy_chatroom_manager_constructor;
-  object_class->get_property = empathy_chatroom_manager_get_property;
-  object_class->set_property = empathy_chatroom_manager_set_property;
-       object_class->finalize = chatroom_manager_finalize;
-
-  param_spec = g_param_spec_string (
-      "file",
-      "path of the favorite file",
-      "The path of the XML file containing user's favorites",
-      NULL,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_FILE, param_spec);
+  EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+  GList *l;
 
-       signals[CHATROOM_ADDED] =
-               g_signal_new ("chatroom-added",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, EMPATHY_TYPE_CHATROOM);
-       signals[CHATROOM_REMOVED] =
-               g_signal_new ("chatroom-removed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, EMPATHY_TYPE_CHATROOM);
-
-       g_type_class_add_private (object_class,
-                                 sizeof (EmpathyChatroomManagerPriv));
-}
+  for (l = priv->chatrooms; l != NULL; l = g_list_next (l))
+    {
+      EmpathyChatroom *chatroom = l->data;
 
-static void
-empathy_chatroom_manager_init (EmpathyChatroomManager *manager)
-{
-       EmpathyChatroomManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
-               EMPATHY_TYPE_CHATROOM_MANAGER, EmpathyChatroomManagerPriv);
+      g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
+          self);
+      g_signal_emit (self, signals[CHATROOM_REMOVED], 0, chatroom);
 
-       manager->priv = priv;
-}
+      g_object_unref (chatroom);
+    }
 
-static void
-chatroom_changed_cb (EmpathyChatroom *chatroom,
-                     GParamSpec *spec,
-                     EmpathyChatroomManager *self)
-{
-  reset_save_timeout (self);
+  g_list_free (priv->chatrooms);
+  priv->chatrooms = NULL;
 }
 
 static void
 chatroom_manager_finalize (GObject *object)
 {
   EmpathyChatroomManager *self = EMPATHY_CHATROOM_MANAGER (object);
-       EmpathyChatroomManagerPriv *priv;
-  GList *l;
+  EmpathyChatroomManagerPriv *priv;
+
+  priv = GET_PRIV (object);
 
-       priv = GET_PRIV (object);
+  g_object_unref (priv->account_manager);
 
   if (priv->save_timer_id > 0)
     {
@@ -238,504 +448,455 @@ chatroom_manager_finalize (GObject *object)
       chatroom_manager_file_save (self);
     }
 
-  for (l = priv->chatrooms; l != NULL; l = g_list_next (l))
-    {
-      EmpathyChatroom *chatroom = l->data;
+  clear_chatrooms (self);
 
-      g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
-          self);
-
-      g_object_unref (chatroom);
-    }
-
-       g_list_free (priv->chatrooms);
   g_free (priv->file);
 
-       (G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->finalize) (object);
+  (G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->finalize) (object);
 }
 
-EmpathyChatroomManager *
-empathy_chatroom_manager_dup_singleton (const gchar *file)
-{
-       return EMPATHY_CHATROOM_MANAGER (g_object_new (EMPATHY_TYPE_CHATROOM_MANAGER,
-               "file", file, NULL));
-}
-
-static gboolean
-save_timeout (EmpathyChatroomManager *self)
+static void
+file_changed_cb (GFileMonitor *monitor,
+    GFile *file,
+    GFile *other_file,
+    GFileMonitorEvent event_type,
+    gpointer user_data)
 {
+  EmpathyChatroomManager *self = user_data;
   EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
 
-  priv->save_timer_id = 0;
-  chatroom_manager_file_save (self);
+  if (event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
+    return;
 
-  return FALSE;
+  if (priv->writing)
+    return;
+
+  DEBUG ("chatrooms file changed; reloading list");
+
+  clear_chatrooms (self);
+  chatroom_manager_get_all (self);
 }
 
 static void
-reset_save_timeout (EmpathyChatroomManager *self)
+account_manager_ready_cb (GObject *source_object,
+    GAsyncResult *result,
+    gpointer user_data)
 {
+  EmpathyChatroomManager *self = EMPATHY_CHATROOM_MANAGER (user_data);
   EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+  TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
+  GFile *file = NULL;
 
-  if (priv->save_timer_id > 0)
+  if (!tp_account_manager_prepare_finish (manager, result, &error))
     {
-      g_source_remove (priv->save_timer_id);
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      goto out;
     }
 
-  priv->save_timer_id = g_timeout_add_seconds (SAVE_TIMER,
-      (GSourceFunc) save_timeout, self);
-}
+  chatroom_manager_get_all (self);
 
-static void
-add_chatroom (EmpathyChatroomManager *self,
-              EmpathyChatroom *chatroom)
-{
-  EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+  /* Set up file monitor */
+  file = g_file_new_for_path (priv->file);
 
-  priv->chatrooms = g_list_prepend (priv->chatrooms, g_object_ref (chatroom));
+  priv->monitor = g_file_monitor (file, 0, NULL, &error);
+  if (priv->monitor == NULL)
+    {
+      DEBUG ("Failed to create file monitor on %s: %s", priv->file,
+          error->message);
 
-  g_signal_connect (chatroom, "notify",
-      G_CALLBACK (chatroom_changed_cb), self);
+      g_error_free (error);
+      goto out;
+    }
+
+  g_signal_connect (priv->monitor, "changed", G_CALLBACK (file_changed_cb),
+      self);
+
+out:
+  tp_clear_object (&file);
+  g_object_unref (self);
 }
 
-gboolean
-empathy_chatroom_manager_add (EmpathyChatroomManager *manager,
-                            EmpathyChatroom        *chatroom)
+static GObject *
+empathy_chatroom_manager_constructor (GType type,
+    guint n_props,
+    GObjectConstructParam *props)
 {
-       EmpathyChatroomManagerPriv *priv;
-
-       g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), FALSE);
-       g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
+  GObject *obj;
+  EmpathyChatroomManager *self;
+  EmpathyChatroomManagerPriv *priv;
+  GError *error = NULL;
+  TpDBusDaemon *dbus;
 
-       priv = GET_PRIV (manager);
+  if (chatroom_manager_singleton != NULL)
+    return g_object_ref (chatroom_manager_singleton);
 
-       /* don't add more than once */
-       if (!empathy_chatroom_manager_find (manager,
-                                          empathy_chatroom_get_account (chatroom),
-                                          empathy_chatroom_get_room (chatroom))) {
-      gboolean favorite;
+  /* Parent constructor chain */
+  obj = G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->
+        constructor (type, n_props, props);
 
-      g_object_get (chatroom, "favorite", &favorite, NULL);
+  self = EMPATHY_CHATROOM_MANAGER (obj);
+  priv = GET_PRIV (self);
 
-    add_chatroom (manager, chatroom);
+  priv->ready = FALSE;
 
-    if (favorite)
-      {
-        reset_save_timeout (manager);
-      }
+  chatroom_manager_singleton = self;
+  g_object_add_weak_pointer (obj, (gpointer) &chatroom_manager_singleton);
 
-               g_signal_emit (manager, signals[CHATROOM_ADDED], 0, chatroom);
+  priv->account_manager = tp_account_manager_dup ();
 
-               return TRUE;
-       }
+  tp_account_manager_prepare_async (priv->account_manager, NULL,
+      account_manager_ready_cb, g_object_ref (self));
 
-       return FALSE;
-}
+  if (priv->file == NULL)
+    {
+      /* Set the default file path */
+      gchar *dir;
 
-void
-empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
-                               EmpathyChatroom        *chatroom)
-{
-       EmpathyChatroomManagerPriv *priv;
-       GList                     *l;
+      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);
 
-       g_return_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager));
-       g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+      priv->file = g_build_filename (dir, CHATROOMS_XML_FILENAME, NULL);
+      g_free (dir);
+    }
 
-       priv = GET_PRIV (manager);
+  dbus = tp_dbus_daemon_dup (&error);
+  if (dbus == NULL)
+    {
+      g_warning ("Failed to get TpDBusDaemon: %s", error->message);
 
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *this_chatroom;
+      g_error_free (error);
+      return obj;
+    }
 
-               this_chatroom = l->data;
+  /* Setup a room observer */
+  priv->observer = tp_simple_observer_new (dbus, TRUE,
+      "Empathy.ChatroomManager", TRUE, observe_channels_cb, self, NULL);
 
-               if (this_chatroom == chatroom ||
-        empathy_chatroom_equal (chatroom, this_chatroom)) {
-        gboolean favorite;
-                       priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
+  g_object_unref (dbus);
 
-      g_object_get (chatroom, "favorite", &favorite, NULL);
+  tp_base_client_take_observer_filter (priv->observer, tp_asv_new (
+      TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+        TP_IFACE_CHANNEL_TYPE_TEXT,
+      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_HANDLE_TYPE_ROOM,
+      NULL));
 
-      if (favorite)
-        {
-          reset_save_timeout (manager);
-        }
+  tp_base_client_add_connection_features_varargs (priv->observer,
+      TP_CONNECTION_FEATURE_CAPABILITIES, NULL);
 
-                       g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, this_chatroom);
+  if (!tp_base_client_register (priv->observer, &error))
+    {
+      g_critical ("Failed to register Observer: %s", error->message);
 
-      g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
-          manager);
+      g_error_free (error);
+    }
 
-                       g_object_unref (this_chatroom);
-                       break;
-               }
-       }
+  return obj;
 }
 
-EmpathyChatroom *
-empathy_chatroom_manager_find (EmpathyChatroomManager *manager,
-                             McAccount             *account,
-                             const gchar           *room)
+static void
+empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
 {
-       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);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GParamSpec *param_spec;
 
-       priv = GET_PRIV (manager);
+  object_class->constructor = empathy_chatroom_manager_constructor;
+  object_class->get_property = empathy_chatroom_manager_get_property;
+  object_class->set_property = empathy_chatroom_manager_set_property;
+  object_class->dispose = chatroom_manager_dispose;
+  object_class->finalize = chatroom_manager_finalize;
 
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *chatroom;
-               McAccount      *this_account;
-               const gchar    *this_room;
+  param_spec = g_param_spec_string (
+      "file",
+      "path of the favorite file",
+      "The path of the XML file containing user's favorites",
+      NULL,
+      G_PARAM_CONSTRUCT_ONLY |
+      G_PARAM_READWRITE |
+      G_PARAM_STATIC_NAME |
+      G_PARAM_STATIC_NICK |
+      G_PARAM_STATIC_BLURB);
+  g_object_class_install_property (object_class, PROP_FILE, param_spec);
 
-               chatroom = l->data;
-               this_account = empathy_chatroom_get_account (chatroom);
-               this_room = empathy_chatroom_get_room (chatroom);
+  param_spec = g_param_spec_boolean (
+      "ready",
+      "whether the manager is ready yet",
+      "whether the manager is ready yet",
+      FALSE,
+      G_PARAM_READABLE);
+  g_object_class_install_property (object_class, PROP_READY, param_spec);
+
+  signals[CHATROOM_ADDED] = g_signal_new ("chatroom-added",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST,
+      0, NULL, NULL,
+      g_cclosure_marshal_VOID__OBJECT,
+      G_TYPE_NONE,
+      1, EMPATHY_TYPE_CHATROOM);
+
+  signals[CHATROOM_REMOVED] = g_signal_new ("chatroom-removed",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST,
+      0, NULL, NULL,
+      g_cclosure_marshal_VOID__OBJECT,
+      G_TYPE_NONE,
+      1, EMPATHY_TYPE_CHATROOM);
+
+  g_type_class_add_private (object_class, sizeof (EmpathyChatroomManagerPriv));
+}
 
-               if (this_account && this_room &&
-                   empathy_account_equal (account, this_account) &&
-                   strcmp (this_room, room) == 0) {
-                       return chatroom;
-               }
-       }
+static void
+empathy_chatroom_manager_init (EmpathyChatroomManager *manager)
+{
+  EmpathyChatroomManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+      EMPATHY_TYPE_CHATROOM_MANAGER, EmpathyChatroomManagerPriv);
 
-       return NULL;
+  manager->priv = priv;
 }
 
-GList *
-empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
-                                      McAccount             *account)
+EmpathyChatroomManager *
+empathy_chatroom_manager_dup_singleton (const gchar *file)
 {
-       EmpathyChatroomManagerPriv *priv;
-       GList                     *chatrooms, *l;
+  return EMPATHY_CHATROOM_MANAGER (g_object_new (EMPATHY_TYPE_CHATROOM_MANAGER,
+      "file", file, NULL));
+}
 
-       g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
+gboolean
+empathy_chatroom_manager_add (EmpathyChatroomManager *manager,
+    EmpathyChatroom *chatroom)
+{
+  EmpathyChatroomManagerPriv *priv;
 
-       priv = GET_PRIV (manager);
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), FALSE);
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
 
-       if (!account) {
-               return g_list_copy (priv->chatrooms);
-       }
+  priv = GET_PRIV (manager);
 
-       chatrooms = NULL;
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *chatroom;
+  /* don't add more than once */
+  if (!empathy_chatroom_manager_find (manager,
+      empathy_chatroom_get_account (chatroom),
+      empathy_chatroom_get_room (chatroom)))
+    {
+      add_chatroom (manager, chatroom);
 
-               chatroom = l->data;
+      if (empathy_chatroom_is_favorite (chatroom))
+        reset_save_timeout (manager);
 
-               if (empathy_account_equal (account,
-                                         empathy_chatroom_get_account (chatroom))) {
-                       chatrooms = g_list_append (chatrooms, chatroom);
-               }
-       }
+      g_signal_emit (manager, signals[CHATROOM_ADDED], 0, chatroom);
+      return TRUE;
+    }
 
-       return chatrooms;
+  return FALSE;
 }
 
-guint
-empathy_chatroom_manager_get_count (EmpathyChatroomManager *manager,
-                                  McAccount             *account)
+static void
+chatroom_manager_remove_link (EmpathyChatroomManager *manager,
+    GList *l)
 {
-       EmpathyChatroomManagerPriv *priv;
-       GList                     *l;
-       guint                      count = 0;
-
-       g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), 0);
+  EmpathyChatroomManagerPriv *priv;
+  EmpathyChatroom *chatroom;
 
-       priv = GET_PRIV (manager);
+  priv = GET_PRIV (manager);
 
-       if (!account) {
-               return g_list_length (priv->chatrooms);
-       }
+  chatroom = l->data;
 
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *chatroom;
+  if (empathy_chatroom_is_favorite (chatroom))
+    reset_save_timeout (manager);
 
-               chatroom = l->data;
+  priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
 
-               if (empathy_account_equal (account,
-                                         empathy_chatroom_get_account (chatroom))) {
-                       count++;
-               }
-       }
+  g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, chatroom);
+  g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb, manager);
 
-       return count;
+  g_object_unref (chatroom);
 }
 
-/*
- * API to save/load and parse the chatrooms file.
- */
-
-static gboolean
-chatroom_manager_get_all (EmpathyChatroomManager *manager)
+void
+empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
+    EmpathyChatroom        *chatroom)
 {
-       EmpathyChatroomManagerPriv *priv;
+  EmpathyChatroomManagerPriv *priv;
+  GList *l;
 
-       priv = GET_PRIV (manager);
+  g_return_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager));
+  g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
 
-       /* read file in */
-       if (g_file_test (priv->file, G_FILE_TEST_EXISTS) &&
-           !chatroom_manager_file_parse (manager, priv->file))
-    return FALSE;
+  priv = GET_PRIV (manager);
 
-       return TRUE;
-}
-
-static gboolean
-chatroom_manager_file_parse (EmpathyChatroomManager *manager,
-                            const gchar           *filename)
-{
-       EmpathyChatroomManagerPriv *priv;
-       xmlParserCtxtPtr           ctxt;
-       xmlDocPtr                  doc;
-       xmlNodePtr                 chatrooms;
-       xmlNodePtr                 node;
-
-       priv = GET_PRIV (manager);
+  for (l = priv->chatrooms; l; l = l->next)
+    {
+      EmpathyChatroom *this_chatroom;
 
-       DEBUG ("Attempting to parse file:'%s'...", filename);
+      this_chatroom = l->data;
 
-       ctxt = xmlNewParserCtxt ();
+      if (this_chatroom == chatroom ||
+          empathy_chatroom_equal (chatroom, this_chatroom))
+        {
+          chatroom_manager_remove_link (manager, l);
+          break;
+        }
+    }
+}
 
-       /* Parse and validate the file. */
-       doc = xmlCtxtReadFile (ctxt, filename, NULL, 0);
-       if (!doc) {
-               g_warning ("Failed to parse file:'%s'", filename);
-               xmlFreeParserCtxt (ctxt);
-               return FALSE;
-       }
+EmpathyChatroom *
+empathy_chatroom_manager_find (EmpathyChatroomManager *manager,
+    TpAccount *account,
+    const gchar *room)
+{
+  EmpathyChatroomManagerPriv *priv;
+  GList *l;
 
-       if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME)) {
-               g_warning ("Failed to validate file:'%s'", filename);
-               xmlFreeDoc(doc);
-               xmlFreeParserCtxt (ctxt);
-               return FALSE;
-       }
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
+  g_return_val_if_fail (room != NULL, NULL);
 
-       /* The root node, chatrooms. */
-       chatrooms = xmlDocGetRootElement (doc);
+  priv = GET_PRIV (manager);
 
-       for (node = chatrooms->children; node; node = node->next) {
-               if (strcmp ((gchar *) node->name, "chatroom") == 0) {
-                       chatroom_manager_parse_chatroom (manager, node);
-               }
-       }
+  for (l = priv->chatrooms; l; l = l->next)
+    {
+      EmpathyChatroom *chatroom;
+      TpAccount *this_account;
+      const gchar    *this_room;
 
-       DEBUG ("Parsed %d chatrooms", g_list_length (priv->chatrooms));
+      chatroom = l->data;
+      this_account = empathy_chatroom_get_account (chatroom);
+      this_room = empathy_chatroom_get_room (chatroom);
 
-       xmlFreeDoc(doc);
-       xmlFreeParserCtxt (ctxt);
+      if (this_account && this_room && account == this_account
+          && strcmp (this_room, room) == 0)
+        return chatroom;
+    }
 
-       return TRUE;
+  return NULL;
 }
 
-static void
-chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager,
-                                xmlNodePtr             node)
+EmpathyChatroom *
+empathy_chatroom_manager_ensure_chatroom (EmpathyChatroomManager *manager,
+    TpAccount *account,
+    const gchar *room,
+    const gchar *name)
 {
-       EmpathyChatroomManagerPriv *priv;
-       EmpathyChatroom            *chatroom;
-       McAccount                 *account;
-       xmlNodePtr                 child;
-       gchar                     *str;
-       gchar                     *name;
-       gchar                     *room;
-       gchar                     *account_id;
-       gboolean                   auto_connect;
-
-       priv = GET_PRIV (manager);
-
-       /* default values. */
-       name = NULL;
-       room = NULL;
-       auto_connect = TRUE;
-       account_id = NULL;
-
-       for (child = node->children; child; child = child->next) {
-               gchar *tag;
-
-               if (xmlNodeIsText (child)) {
-                       continue;
-               }
-
-               tag = (gchar *) child->name;
-               str = (gchar *) xmlNodeGetContent (child);
-
-               if (strcmp (tag, "name") == 0) {
-                       name = g_strdup (str);
-               }
-               else if (strcmp (tag, "room") == 0) {
-                       room = g_strdup (str);
-               }
-               else if (strcmp (tag, "auto_connect") == 0) {
-                       if (strcmp (str, "yes") == 0) {
-                               auto_connect = TRUE;
-                       } else {
-                               auto_connect = FALSE;
-                       }
-               }
-               else if (strcmp (tag, "account") == 0) {
-                       account_id = g_strdup (str);
-               }
-
-               xmlFree (str);
-       }
-
-       account = mc_account_lookup (account_id);
-       if (!account) {
-               g_free (name);
-               g_free (room);
-               g_free (account_id);
-               return;
-       }
-
-       chatroom = empathy_chatroom_new_full (account, room, name, auto_connect);
-  g_object_set (chatroom, "favorite", TRUE, NULL);
-  add_chatroom (manager, chatroom);
-       g_signal_emit (manager, signals[CHATROOM_ADDED], 0, chatroom);
+  EmpathyChatroom *chatroom;
 
-       g_object_unref (account);
-       g_free (name);
-       g_free (room);
-       g_free (account_id);
+  chatroom = empathy_chatroom_manager_find (manager, account, room);
+
+  if (chatroom)
+    {
+      return g_object_ref (chatroom);
+    }
+  else
+    {
+      chatroom = empathy_chatroom_new_full (account,
+        room,
+        name,
+        FALSE);
+      empathy_chatroom_manager_add (manager, chatroom);
+      return chatroom;
+    }
 }
 
-static gboolean
-chatroom_manager_file_save (EmpathyChatroomManager *manager)
+GList *
+empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
+    TpAccount *account)
 {
-       EmpathyChatroomManagerPriv *priv;
-       xmlDocPtr                  doc;
-       xmlNodePtr                 root;
-       GList                     *l;
-
-       priv = GET_PRIV (manager);
-
-       doc = xmlNewDoc ("1.0");
-       root = xmlNewNode (NULL, "chatrooms");
-       xmlDocSetRootElement (doc, root);
-
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *chatroom;
-               xmlNodePtr      node;
-               const gchar    *account_id;
-    gboolean favorite;
-
-               chatroom = l->data;
+  EmpathyChatroomManagerPriv *priv;
+  GList *chatrooms, *l;
 
-    g_object_get (chatroom, "favorite", &favorite, NULL);
-    if (!favorite)
-      continue;
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
 
-               account_id = mc_account_get_unique_name (empathy_chatroom_get_account (chatroom));
+  priv = GET_PRIV (manager);
 
-               node = xmlNewChild (root, NULL, "chatroom", NULL);
-               xmlNewTextChild (node, NULL, "name", empathy_chatroom_get_name (chatroom));
-               xmlNewTextChild (node, NULL, "room", empathy_chatroom_get_room (chatroom));
-               xmlNewTextChild (node, NULL, "account", account_id);
-               xmlNewTextChild (node, NULL, "auto_connect", empathy_chatroom_get_auto_connect (chatroom) ? "yes" : "no");
-       }
+  if (!account)
+    return g_list_copy (priv->chatrooms);
 
-       /* Make sure the XML is indented properly */
-       xmlIndentTreeOutput = 1;
+  chatrooms = NULL;
+  for (l = priv->chatrooms; l; l = l->next)
+    {
+      EmpathyChatroom *chatroom;
 
-       DEBUG ("Saving file:'%s'", priv->file);
-       xmlSaveFormatFileEnc (priv->file, doc, "utf-8", 1);
-       xmlFreeDoc (doc);
+      chatroom = l->data;
 
-       xmlCleanupParser ();
-       xmlMemoryDump ();
+      if (account == empathy_chatroom_get_account (chatroom))
+        chatrooms = g_list_append (chatrooms, chatroom);
+    }
 
-       return TRUE;
+  return chatrooms;
 }
 
 static void
 chatroom_manager_chat_destroyed_cb (EmpathyTpChat *chat,
-  gpointer user_data)
+  gpointer manager)
 {
-  EmpathyChatroomManager *manager = EMPATHY_CHATROOM_MANAGER (user_data);
-  McAccount *account = empathy_tp_chat_get_account (chat);
-  EmpathyChatroom *chatroom;
-  const gchar *roomname;
-  gboolean favorite;
+  EmpathyChatroomManagerPriv *priv = GET_PRIV (manager);
+  GList *l;
+
+  for (l = priv->chatrooms; l; l = l->next)
+    {
+      EmpathyChatroom *chatroom = l->data;
 
-  roomname = empathy_tp_chat_get_id (chat);
-  chatroom = empathy_chatroom_manager_find (manager, account, roomname);
+      if (empathy_chatroom_get_tp_chat (chatroom) != chat)
+        continue;
 
-  if (chatroom == NULL)
-    return;
+      empathy_chatroom_set_tp_chat (chatroom, NULL);
 
-  g_object_set (chatroom, "tp-chat", NULL, NULL);
-  g_object_get (chatroom, "favorite", &favorite, NULL);
+      if (!empathy_chatroom_is_favorite (chatroom))
+        {
+          /* Remove the chatroom from the list, unless it's in the list of
+           * favourites..
+           * FIXME this policy should probably not be in libempathy */
+          chatroom_manager_remove_link (manager, l);
+        }
 
-  if (!favorite)
-    {
-      /* Remove the chatroom from the list, unless it's in the list of
-       * favourites..
-       * FIXME this policy should probably not be in libempathy */
-      empathy_chatroom_manager_remove (manager, chatroom);
+      break;
     }
 }
 
 static void
-chatroom_manager_observe_channel_cb (EmpathyDispatcher *dispatcher,
-  EmpathyDispatchOperation *operation, gpointer user_data)
+observe_channels_cb (TpSimpleObserver *observer,
+    TpAccount *account,
+    TpConnection *connection,
+    GList *channels,
+    TpChannelDispatchOperation *dispatch_operation,
+    GList *requests,
+    TpObserveChannelsContext *context,
+    gpointer user_data)
 {
-  EmpathyChatroomManager *manager = EMPATHY_CHATROOM_MANAGER (user_data);
-  EmpathyChatroom *chatroom;
-  TpChannel *channel;
-  EmpathyTpChat *chat;
-  const gchar *roomname;
-  GQuark channel_type;
-  TpHandleType handle_type;
-  McAccount *account;
-
-  channel_type = empathy_dispatch_operation_get_channel_type_id (operation);
-
-  /* Observe Text channels to rooms only */
-  if (channel_type != TP_IFACE_QUARK_CHANNEL_TYPE_TEXT)
-    return;
+  EmpathyChatroomManager *self = user_data;
+  GList *l;
 
-  channel = empathy_dispatch_operation_get_channel (operation);
-  tp_channel_get_handle (channel, &handle_type);
+  for (l = channels; l != NULL; l = g_list_next (l))
+    {
+      TpChannel *channel = l->data;
+      EmpathyTpChat *tp_chat;
+      const gchar *roomname;
+      EmpathyChatroom *chatroom;
 
-  if (handle_type != TP_HANDLE_TYPE_ROOM)
-    return;
+      if (tp_proxy_get_invalidated (channel) != NULL)
+        continue;
 
-  chat = EMPATHY_TP_CHAT (
-    empathy_dispatch_operation_get_channel_wrapper (operation));
-  account = empathy_tp_chat_get_account (chat);
+      tp_chat = empathy_tp_chat_new (account, channel);
+      roomname = empathy_tp_chat_get_id (tp_chat);
+      chatroom = empathy_chatroom_manager_find (self, account, roomname);
 
-  roomname = empathy_tp_chat_get_id (chat);
+      if (chatroom == NULL)
+        {
+          chatroom = empathy_chatroom_new_full (account, roomname, roomname,
+            FALSE);
+          empathy_chatroom_manager_add (self, chatroom);
+          g_object_unref (chatroom);
+        }
 
-  chatroom = empathy_chatroom_manager_find (manager, account, roomname);
+      empathy_chatroom_set_tp_chat (chatroom, tp_chat);
+      g_object_unref (tp_chat);
 
-  if (chatroom == NULL)
-    {
-      chatroom = empathy_chatroom_new_full (account, roomname, roomname,
-        FALSE);
-      g_object_set (G_OBJECT (chatroom), "tp-chat", chat, NULL);
-      empathy_chatroom_manager_add (manager, chatroom);
-      g_object_unref (chatroom);
-    }
-  else
-    {
-      g_object_set (G_OBJECT (chatroom), "tp-chat", chat, NULL);
+      /* A TpChat is always destroyed as it only gets unreffed after the channel
+       * has been invalidated in the dispatcher..  */
+      g_signal_connect (tp_chat, "destroy",
+        G_CALLBACK (chatroom_manager_chat_destroyed_cb),
+        self);
     }
 
-  /* A TpChat is always destroyed as it only gets unreffed after the channel
-   * has been invalidated in the dispatcher..  */
-  g_signal_connect (chat, "destroy",
-    G_CALLBACK (chatroom_manager_chat_destroyed_cb),
-    manager);
-}
-
-void
-empathy_chatroom_manager_observe (EmpathyChatroomManager *manager,
-  EmpathyDispatcher *dispatcher)
-{
-  g_signal_connect (dispatcher, "observe",
-    G_CALLBACK (chatroom_manager_observe_channel_cb), manager);
+  tp_observe_channels_context_accept (context);
 }