]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-chatroom-manager.c
individual-menu: remove link-contacts-activated signal
[empathy.git] / libempathy / empathy-chatroom-manager.c
index 1ce7a6e5d1477c4daa0f006b9d10fd8de957bbad..9a9a7b25013163e0a066187c4e2c9d2f7c9cbd0e 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2004-2007 Imendio AB
- * Copyright (C) 2007-2009 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
 #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-client-factory.h"
 #include "empathy-tp-chat.h"
 #include "empathy-chatroom-manager.h"
-#include "empathy-account-manager.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 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;
   gchar *file;
-  EmpathyAccountManager *account_manager;
+  TpAccountManager *account_manager;
+
   /* source id of the autosave timer */
   gint save_timer_id;
+  gboolean ready;
+  GFileMonitor *monitor;
+  gboolean writing;
+
+  TpBaseClient *observer;
 } EmpathyChatroomManagerPriv;
 
 enum {
@@ -66,6 +86,7 @@ static guint signals[LAST_SIGNAL];
 enum
 {
   PROP_FILE = 1,
+  PROP_READY,
   LAST_PROPERTY
 };
 
@@ -78,50 +99,59 @@ G_DEFINE_TYPE (EmpathyChatroomManager, empathy_chatroom_manager, G_TYPE_OBJECT);
 static gboolean
 chatroom_manager_file_save (EmpathyChatroomManager *manager)
 {
-       EmpathyChatroomManagerPriv *priv;
-       xmlDocPtr                  doc;
-       xmlNodePtr                 root;
-       GList                     *l;
+  EmpathyChatroomManagerPriv *priv;
+  xmlDocPtr doc;
+  xmlNodePtr root;
+  GList *l;
 
-       priv = GET_PRIV (manager);
+  priv = GET_PRIV (manager);
 
-       doc = xmlNewDoc ("1.0");
-       root = xmlNewNode (NULL, "chatrooms");
-       xmlDocSetRootElement (doc, root);
+  priv->writing = TRUE;
 
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *chatroom;
-               xmlNodePtr       node;
-               const gchar     *account_id;
+  doc = xmlNewDoc ((const xmlChar *) "1.0");
+  root = xmlNewNode (NULL, (const xmlChar *) "chatrooms");
+  xmlDocSetRootElement (doc, root);
 
-               chatroom = l->data;
+  for (l = priv->chatrooms; l; l = l->next)
+    {
+      EmpathyChatroom *chatroom;
+      xmlNodePtr       node;
+      const gchar     *account_id;
 
-               if (!empathy_chatroom_is_favorite (chatroom)) {
-                       continue;
-               }
+      chatroom = l->data;
 
-               account_id = empathy_account_get_unique_name (
-                 empathy_chatroom_get_account (chatroom));
+      if (!empathy_chatroom_is_favorite (chatroom))
+        continue;
 
-               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");
-       }
+      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;
+  /* Make sure the XML is indented properly */
+  xmlIndentTreeOutput = 1;
 
-       DEBUG ("Saving file:'%s'", priv->file);
-       xmlSaveFormatFileEnc (priv->file, doc, "utf-8", 1);
-       xmlFreeDoc (doc);
+  DEBUG ("Saving file:'%s'", priv->file);
+  xmlSaveFormatFileEnc (priv->file, doc, "utf-8", 1);
+  xmlFreeDoc (doc);
 
-       xmlCleanupParser ();
-       xmlMemoryDump ();
+  xmlMemoryDump ();
 
-       return TRUE;
+  priv->writing = FALSE;
+  return TRUE;
 }
 
 static gboolean
@@ -141,9 +171,7 @@ reset_save_timeout (EmpathyChatroomManager *self)
   EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
 
   if (priv->save_timer_id > 0)
-    {
-      g_source_remove (priv->save_timer_id);
-    }
+    g_source_remove (priv->save_timer_id);
 
   priv->save_timer_id = g_timeout_add_seconds (SAVE_TIMER,
       (GSourceFunc) save_timeout, self);
@@ -151,164 +179,207 @@ reset_save_timeout (EmpathyChatroomManager *self)
 
 static void
 chatroom_changed_cb (EmpathyChatroom *chatroom,
-                     GParamSpec *spec,
-                     EmpathyChatroomManager *self)
+    GParamSpec *spec,
+    EmpathyChatroomManager *self)
 {
   reset_save_timeout (self);
 }
 
 static void
 add_chatroom (EmpathyChatroomManager *self,
-              EmpathyChatroom *chatroom)
+    EmpathyChatroom *chatroom)
 {
   EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
 
   priv->chatrooms = g_list_prepend (priv->chatrooms, g_object_ref (chatroom));
 
-  g_signal_connect (chatroom, "notify",
+  /* Watch only those properties which are exported in the save file */
+  g_signal_connect (chatroom, "notify::name",
+      G_CALLBACK (chatroom_changed_cb), self);
+  g_signal_connect (chatroom, "notify::room",
+      G_CALLBACK (chatroom_changed_cb), self);
+  g_signal_connect (chatroom, "notify::account",
+      G_CALLBACK (chatroom_changed_cb), self);
+  g_signal_connect (chatroom, "notify::auto-connect",
+      G_CALLBACK (chatroom_changed_cb), self);
+  g_signal_connect (chatroom, "notify::always_urgent",
       G_CALLBACK (chatroom_changed_cb), self);
 }
 
 static void
 chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager,
-                                xmlNodePtr             node)
+    xmlNodePtr node)
 {
-       EmpathyChatroomManagerPriv *priv;
-       EmpathyChatroom            *chatroom;
-       EmpathyAccount             *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 = empathy_account_manager_lookup (priv->account_manager, 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);
-       empathy_chatroom_set_favorite (chatroom, TRUE);
-       add_chatroom (manager, chatroom);
-       g_signal_emit (manager, signals[CHATROOM_ADDED], 0, chatroom);
-
-       g_object_unref (account);
-       g_free (name);
-       g_free (room);
-       g_free (account_id);
+  EmpathyChatroom *chatroom = NULL;
+  TpAccount *account;
+  xmlNodePtr child;
+  gchar *str;
+  gchar *name;
+  gchar *room;
+  gchar *account_id;
+  gboolean auto_connect;
+  gboolean always_urgent;
+  EmpathyClientFactory *factory;
+  GError *error = NULL;
+
+  /* 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 has to be a valid Account object path */
+  if (!tp_dbus_check_valid_object_path (account_id, NULL) ||
+      !g_str_has_prefix (account_id, TP_ACCOUNT_OBJECT_PATH_BASE))
+    goto out;
+
+  factory = empathy_client_factory_dup ();
+
+  account = tp_simple_client_factory_ensure_account (
+          TP_SIMPLE_CLIENT_FACTORY (factory), account_id, NULL, &error);
+  g_object_unref (factory);
+
+  if (account == NULL)
+    {
+      DEBUG ("Failed to create account: %s", error->message);
+      g_error_free (error);
+
+      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);
+
+out:
+  g_free (name);
+  g_free (room);
+  g_free (account_id);
+  tp_clear_object (&chatroom);
 }
 
 static gboolean
 chatroom_manager_file_parse (EmpathyChatroomManager *manager,
-                            const gchar           *filename)
+    const gchar *filename)
 {
-       EmpathyChatroomManagerPriv *priv;
-       xmlParserCtxtPtr           ctxt;
-       xmlDocPtr                  doc;
-       xmlNodePtr                 chatrooms;
-       xmlNodePtr                 node;
+  EmpathyChatroomManagerPriv *priv;
+  xmlParserCtxtPtr ctxt;
+  xmlDocPtr doc;
+  xmlNodePtr chatrooms;
+  xmlNodePtr node;
 
-       priv = GET_PRIV (manager);
+  priv = GET_PRIV (manager);
 
-       DEBUG ("Attempting to parse file:'%s'...", filename);
+  DEBUG ("Attempting to parse file:'%s'...", filename);
 
-       ctxt = xmlNewParserCtxt ();
+  ctxt = xmlNewParserCtxt ();
 
-       /* 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;
-       }
+  /* 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;
-       }
+  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);
+  /* 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);
-               }
-       }
+  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));
+  DEBUG ("Parsed %d chatrooms", g_list_length (priv->chatrooms));
 
-       xmlFreeDoc (doc);
-       xmlFreeParserCtxt (ctxt);
+  xmlFreeDoc (doc);
+  xmlFreeParserCtxt (ctxt);
 
-       return TRUE;
+  return TRUE;
 }
 
 static gboolean
 chatroom_manager_get_all (EmpathyChatroomManager *manager)
 {
-       EmpathyChatroomManagerPriv *priv;
+  EmpathyChatroomManagerPriv *priv;
+
+  priv = GET_PRIV (manager);
 
-       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;
 
-       /* 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;
+  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);
@@ -318,6 +389,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;
@@ -326,9 +400,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);
@@ -345,12 +419,52 @@ empathy_chatroom_manager_set_property (GObject *object,
     }
 }
 
+static void
+chatroom_manager_dispose (GObject *object)
+{
+  EmpathyChatroomManagerPriv *priv;
+
+  priv = GET_PRIV (object);
+
+  tp_clear_object (&priv->observer);
+  tp_clear_object (&priv->monitor);
+
+  (G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->dispose) (object);
+}
+
+static void
+clear_chatrooms (EmpathyChatroomManager *self)
+{
+  EmpathyChatroomManagerPriv *priv = GET_PRIV (self);
+  GList *l, *tmp;
+
+  tmp = priv->chatrooms;
+
+  /* Unreffing the chatroom may result in destroying the underlying
+   * EmpathyTpChat which will fire the invalidated signal and so make us
+   * re-call this function. We already set priv->chatrooms to NULL so we won't
+   * try to destroy twice the same objects. */
+  priv->chatrooms = NULL;
+
+  for (l = tmp; l != NULL; l = g_list_next (l))
+    {
+      EmpathyChatroom *chatroom = l->data;
+
+      g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
+          self);
+      g_signal_emit (self, signals[CHATROOM_REMOVED], 0, chatroom);
+
+      g_object_unref (chatroom);
+    }
+
+  g_list_free (tmp);
+}
+
 static void
 chatroom_manager_finalize (GObject *object)
 {
   EmpathyChatroomManager *self = EMPATHY_CHATROOM_MANAGER (object);
   EmpathyChatroomManagerPriv *priv;
-  GList *l;
 
   priv = GET_PRIV (object);
 
@@ -364,30 +478,85 @@ chatroom_manager_finalize (GObject *object)
       chatroom_manager_file_save (self);
     }
 
-  for (l = priv->chatrooms; l != NULL; l = g_list_next (l))
+  clear_chatrooms (self);
+
+  g_free (priv->file);
+
+  (G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->finalize) (object);
+}
+
+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);
+
+  if (event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
+    return;
+
+  if (priv->writing)
+    return;
+
+  DEBUG ("chatrooms file changed; reloading list");
+
+  clear_chatrooms (self);
+  chatroom_manager_get_all (self);
+}
+
+static void
+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 (!tp_proxy_prepare_finish (manager, result, &error))
     {
-      EmpathyChatroom *chatroom = l->data;
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      goto out;
+    }
 
-      g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb,
-          self);
+  chatroom_manager_get_all (self);
 
-      g_object_unref (chatroom);
+  /* Set up file monitor */
+  file = g_file_new_for_path (priv->file);
+
+  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_error_free (error);
+      goto out;
     }
 
-  g_list_free (priv->chatrooms);
-  g_free (priv->file);
+  g_signal_connect (priv->monitor, "changed", G_CALLBACK (file_changed_cb),
+      self);
 
-  (G_OBJECT_CLASS (empathy_chatroom_manager_parent_class)->finalize) (object);
+out:
+  tp_clear_object (&file);
+  g_object_unref (self);
 }
 
 static GObject *
 empathy_chatroom_manager_constructor (GType type,
-                                      guint n_props,
-                                      GObjectConstructParam *props)
+    guint n_props,
+    GObjectConstructParam *props)
 {
   GObject *obj;
   EmpathyChatroomManager *self;
   EmpathyChatroomManagerPriv *priv;
+  GError *error = NULL;
 
   if (chatroom_manager_singleton != NULL)
     return g_object_ref (chatroom_manager_singleton);
@@ -399,17 +568,22 @@ empathy_chatroom_manager_constructor (GType type,
   self = EMPATHY_CHATROOM_MANAGER (obj);
   priv = GET_PRIV (self);
 
+  priv->ready = FALSE;
+
   chatroom_manager_singleton = self;
   g_object_add_weak_pointer (obj, (gpointer) &chatroom_manager_singleton);
 
-  priv->account_manager = empathy_account_manager_dup_singleton ();
+  priv->account_manager = tp_account_manager_dup ();
+
+  tp_proxy_prepare_async (priv->account_manager, NULL,
+      account_manager_ready_cb, g_object_ref (self));
 
   if (priv->file == NULL)
     {
       /* 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);
 
@@ -417,7 +591,24 @@ empathy_chatroom_manager_constructor (GType type,
       g_free (dir);
     }
 
-  chatroom_manager_get_all (self);
+  /* Setup a room observer */
+  priv->observer = tp_simple_observer_new_with_am (priv->account_manager, TRUE,
+      "Empathy.ChatroomManager", TRUE, observe_channels_cb, self, 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 (!tp_base_client_register (priv->observer, &error))
+    {
+      g_critical ("Failed to register Observer: %s", error->message);
+
+      g_error_free (error);
+    }
+
   return obj;
 }
 
@@ -430,7 +621,8 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
   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;
+  object_class->dispose = chatroom_manager_dispose;
+  object_class->finalize = chatroom_manager_finalize;
 
   param_spec = g_param_spec_string (
       "file",
@@ -444,11 +636,19 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
       G_PARAM_STATIC_BLURB);
   g_object_class_install_property (object_class, PROP_FILE, param_spec);
 
+  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_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_CHATROOM);
 
@@ -456,7 +656,7 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_CHATROOM);
 
@@ -481,15 +681,11 @@ empathy_chatroom_manager_dup_singleton (const gchar *file)
 
 gboolean
 empathy_chatroom_manager_add (EmpathyChatroomManager *manager,
-                            EmpathyChatroom        *chatroom)
+    EmpathyChatroom *chatroom)
 {
-  EmpathyChatroomManagerPriv *priv;
-
   g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), FALSE);
   g_return_val_if_fail (EMPATHY_IS_CHATROOM (chatroom), FALSE);
 
-  priv = GET_PRIV (manager);
-
   /* don't add more than once */
   if (!empathy_chatroom_manager_find (manager,
       empathy_chatroom_get_account (chatroom),
@@ -509,7 +705,7 @@ empathy_chatroom_manager_add (EmpathyChatroomManager *manager,
 
 static void
 chatroom_manager_remove_link (EmpathyChatroomManager *manager,
-                              GList *l)
+    GList *l)
 {
   EmpathyChatroomManagerPriv *priv;
   EmpathyChatroom *chatroom;
@@ -531,7 +727,7 @@ chatroom_manager_remove_link (EmpathyChatroomManager *manager,
 
 void
 empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
-                                 EmpathyChatroom        *chatroom)
+    EmpathyChatroom        *chatroom)
 {
   EmpathyChatroomManagerPriv *priv;
   GList *l;
@@ -558,98 +754,93 @@ empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
 
 EmpathyChatroom *
 empathy_chatroom_manager_find (EmpathyChatroomManager *manager,
-                               EmpathyAccount *account,
-                               const gchar *room)
+    TpAccount *account,
+    const gchar *room)
 {
-       EmpathyChatroomManagerPriv *priv;
-       GList                     *l;
+  EmpathyChatroomManagerPriv *priv;
+  GList *l;
 
-       g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
-       g_return_val_if_fail (room != NULL, NULL);
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
+  g_return_val_if_fail (room != NULL, NULL);
 
-       priv = GET_PRIV (manager);
+  priv = GET_PRIV (manager);
 
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *chatroom;
-               EmpathyAccount *this_account;
-               const gchar    *this_room;
+  for (l = priv->chatrooms; l; l = l->next)
+    {
+      EmpathyChatroom *chatroom;
+      TpAccount *this_account;
+      const gchar    *this_room;
 
-               chatroom = l->data;
-               this_account = empathy_chatroom_get_account (chatroom);
-               this_room = empathy_chatroom_get_room (chatroom);
+      chatroom = l->data;
+      this_account = empathy_chatroom_get_account (chatroom);
+      this_room = empathy_chatroom_get_room (chatroom);
 
-               if (this_account && this_room &&
-                   empathy_account_equal (account, this_account) &&
-                   strcmp (this_room, room) == 0) {
-                       return chatroom;
-               }
-       }
+      if (this_account && this_room && account == this_account
+          && strcmp (this_room, room) == 0)
+        return chatroom;
+    }
 
-       return NULL;
+  return NULL;
 }
 
-GList *
-empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
-                                      EmpathyAccount *account)
+EmpathyChatroom *
+empathy_chatroom_manager_ensure_chatroom (EmpathyChatroomManager *manager,
+    TpAccount *account,
+    const gchar *room,
+    const gchar *name)
 {
-       EmpathyChatroomManagerPriv *priv;
-       GList                     *chatrooms, *l;
-
-       g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
-
-       priv = GET_PRIV (manager);
-
-       if (!account) {
-               return g_list_copy (priv->chatrooms);
-       }
-
-       chatrooms = NULL;
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *chatroom;
-
-               chatroom = l->data;
+  EmpathyChatroom *chatroom;
 
-               if (empathy_account_equal (account,
-                                         empathy_chatroom_get_account (chatroom))) {
-                       chatrooms = g_list_append (chatrooms, chatroom);
-               }
-       }
+  chatroom = empathy_chatroom_manager_find (manager, account, room);
 
-       return chatrooms;
+  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;
+    }
 }
 
-guint
-empathy_chatroom_manager_get_count (EmpathyChatroomManager *manager,
-                                  EmpathyAccount *account)
+GList *
+empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
+    TpAccount *account)
 {
-       EmpathyChatroomManagerPriv *priv;
-       GList                     *l;
-       guint                      count = 0;
+  EmpathyChatroomManagerPriv *priv;
+  GList *chatrooms, *l;
 
-       g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), 0);
+  g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
 
-       priv = GET_PRIV (manager);
+  priv = GET_PRIV (manager);
 
-       if (!account) {
-               return g_list_length (priv->chatrooms);
-       }
+  if (!account)
+    return g_list_copy (priv->chatrooms);
 
-       for (l = priv->chatrooms; l; l = l->next) {
-               EmpathyChatroom *chatroom;
+  chatrooms = NULL;
+  for (l = priv->chatrooms; l; l = l->next)
+    {
+      EmpathyChatroom *chatroom;
 
-               chatroom = l->data;
+      chatroom = l->data;
 
-               if (empathy_account_equal (account,
-                                          empathy_chatroom_get_account (chatroom))) {
-                       count++;
-               }
-       }
+      if (account == empathy_chatroom_get_account (chatroom))
+        chatrooms = g_list_append (chatrooms, chatroom);
+    }
 
-       return count;
+  return chatrooms;
 }
 
 static void
-chatroom_manager_chat_destroyed_cb (EmpathyTpChat *chat,
+chatroom_manager_chat_invalidated_cb (EmpathyTpChat *chat,
+  guint domain,
+  gint code,
+  gchar *message,
   gpointer manager)
 {
   EmpathyChatroomManagerPriv *priv = GET_PRIV (manager);
@@ -677,65 +868,47 @@ chatroom_manager_chat_destroyed_cb (EmpathyTpChat *chat,
 }
 
 static void
-chatroom_manager_observe_channel_cb (EmpathyDispatcher *dispatcher,
-  EmpathyDispatchOperation *operation, gpointer manager)
+observe_channels_cb (TpSimpleObserver *observer,
+    TpAccount *account,
+    TpConnection *connection,
+    GList *channels,
+    TpChannelDispatchOperation *dispatch_operation,
+    GList *requests,
+    TpObserveChannelsContext *context,
+    gpointer user_data)
 {
-  EmpathyChatroomManagerPriv *priv = GET_PRIV (manager);
-  EmpathyChatroom *chatroom;
-  TpChannel *channel;
-  EmpathyTpChat *chat;
-  const gchar *roomname;
-  GQuark channel_type;
-  TpHandleType handle_type;
-  EmpathyAccount *account;
-  TpConnection *connection;
-
-  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))
+    {
+      EmpathyTpChat *tp_chat = l->data;
+      const gchar *roomname;
+      EmpathyChatroom *chatroom;
 
-  if (handle_type != TP_HANDLE_TYPE_ROOM)
-    return;
+      if (tp_proxy_get_invalidated ((TpChannel *) tp_chat) != NULL)
+        continue;
 
-  chat = EMPATHY_TP_CHAT (
-    empathy_dispatch_operation_get_channel_wrapper (operation));
-  connection = empathy_tp_chat_get_connection (chat);
-  account = empathy_account_manager_get_account (priv->account_manager,
-      connection);
+      if (!EMPATHY_IS_TP_CHAT (tp_chat))
+        continue;
 
-  roomname = empathy_tp_chat_get_id (chat);
+      roomname = empathy_tp_chat_get_id (tp_chat);
+      chatroom = empathy_chatroom_manager_find (self, account, roomname);
 
-  chatroom = empathy_chatroom_manager_find (manager, account, roomname);
+      if (chatroom == NULL)
+        {
+          chatroom = empathy_chatroom_new_full (account, roomname, roomname,
+            FALSE);
+          empathy_chatroom_manager_add (self, chatroom);
+          g_object_unref (chatroom);
+        }
 
-  if (chatroom == NULL)
-    {
-      chatroom = empathy_chatroom_new_full (account, roomname, roomname,
-        FALSE);
-      empathy_chatroom_set_tp_chat (chatroom, chat);
-      empathy_chatroom_manager_add (manager, chatroom);
-      g_object_unref (chatroom);
-    }
-  else
-    {
-        empathy_chatroom_set_tp_chat (chatroom, chat);
-    }
+      empathy_chatroom_set_tp_chat (chatroom, tp_chat);
 
-  /* 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);
-}
+      g_signal_connect (tp_chat, "invalidated",
+        G_CALLBACK (chatroom_manager_chat_invalidated_cb),
+        self);
+    }
 
-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);
 }