chat-manager: define CHAT_MANAGER_PATH

[empathy.git] / src / empathy-chat-manager.c

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 5f19159c5aa29f70a46d0da4818d91b0f67f2a55..279d7d8ff43bcdf31716067920e6a55f93aec8bd 100644 (file)
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -17,23 +17,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/proxy-subclass.h>
-
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
+#include "config.h"
+#include "empathy-chat-manager.h"
 
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include <telepathy-glib/proxy-subclass.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
+#include "empathy-chatroom-manager.h"
 #include "empathy-chat-window.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
-#include "empathy-chat-manager.h"
-
-#include <extensions/extensions.h>
+#define CHAT_MANAGER_PATH "/org/gnome/Empathy/ChatManager"
 
 enum {
   CLOSED_CHATS_CHANGED,
@@ -68,6 +67,11 @@ struct _EmpathyChatManagerPriv
   GHashTable *messages;
 
   TpBaseClient *handler;
+
+  /* Cached to keep Folks in memory while empathy-chat is running; we don't
+   * want to reload it each time the last chat window is closed
+   * and re-opened. */
+  EmpathyIndividualManager *individual_mgr;
 };
 
 #define GET_PRIV(o) \
@@ -133,6 +137,36 @@ chat_destroyed_cb (gpointer data,
       priv->num_displayed_chat);
 }
 
+static void
+join_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  TpChannel *channel = TP_CHANNEL (source);
+  GError *error = NULL;
+
+  if (!tp_channel_join_finish (channel, result, &error))
+    {
+      DEBUG ("Failed to join chat (%s): %s",
+          tp_channel_get_identifier (channel), error->message);
+      g_error_free (error);
+    }
+}
+
+static void
+individual_mgr_cb (EmpathyChatWindow *window,
+    GParamSpec *spec,
+    EmpathyChatManager *self)
+{
+  EmpathyChatManagerPriv *priv = GET_PRIV (self);
+
+  if (priv->individual_mgr != NULL)
+    return;
+
+  priv->individual_mgr = empathy_chat_window_get_individual_manager (window);
+  g_object_ref (priv->individual_mgr);
+}
+
 static void
 process_tp_chat (EmpathyChatManager *self,
     EmpathyTpChat *tp_chat,
@@ -142,6 +176,7 @@ process_tp_chat (EmpathyChatManager *self,
   EmpathyChatManagerPriv *priv = GET_PRIV (self);
   EmpathyChat *chat = NULL;
   const gchar *id;
+  EmpathyChatWindow *window;
 
   id = empathy_tp_chat_get_id (tp_chat);
   if (!tp_str_empty (id))
@@ -185,13 +220,21 @@ process_tp_chat (EmpathyChatManager *self,
 
       g_object_weak_ref ((GObject *) chat, chat_destroyed_cb, self);
     }
-  empathy_chat_window_present_chat (chat, user_action_time);
+
+  window = empathy_chat_window_present_chat (chat, user_action_time);
+
+  if (priv->individual_mgr == NULL)
+    {
+      /* We want to cache it as soon it's created */
+      tp_g_signal_connect_object (window, "notify::individual-manager",
+        G_CALLBACK (individual_mgr_cb), self, 0);
+    }
 
   if (empathy_tp_chat_is_invited (tp_chat, NULL))
     {
       /* We have been invited to the room. Add ourself as member as this
        * channel has been approved. */
-      empathy_tp_chat_join (tp_chat);
+      tp_channel_join_async (TP_CHANNEL (tp_chat), "", join_cb, self);
     }
 }
 
@@ -290,6 +333,7 @@ empathy_chat_manager_finalize (GObject *object)
 
   tp_clear_object (&priv->handler);
   tp_clear_object (&priv->chatroom_mgr);
+  tp_clear_object (&priv->individual_mgr);
 
   G_OBJECT_CLASS (empathy_chat_manager_parent_class)->finalize (object);
 }
@@ -327,7 +371,7 @@ empathy_chat_manager_constructed (GObject *obj)
   if (dbus_daemon != NULL)
     {
       tp_dbus_daemon_register_object (dbus_daemon,
-          "/org/gnome/Empathy/ChatManager", obj);
+          CHAT_MANAGER_PATH, obj);
 
       g_object_unref (dbus_daemon);
     }
@@ -349,7 +393,7 @@ empathy_chat_manager_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__UINT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_UINT, NULL);
 
@@ -359,7 +403,7 @@ empathy_chat_manager_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__UINT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_UINT, NULL);
 
@@ -504,7 +548,7 @@ empathy_chat_manager_call_undo_closed_chat (void)
       "dbus-daemon", dbus_daemon,
       "dbus-connection", tp_proxy_get_dbus_connection (TP_PROXY (dbus_daemon)),
       "bus-name", EMPATHY_CHAT_BUS_NAME,
-      "object-path", "/org/gnome/Empathy/ChatManager",
+      "object-path", CHAT_MANAGER_PATH,
       NULL);
 
   tp_proxy_add_interface_by_id (proxy, EMP_IFACE_QUARK_CHAT_MANAGER);