Clean up #include directives in source files

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

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 6a163aaae8e3dd5707a91e938ee938cb237fc006..02ed0d9492945d7572771381033accb4e033881d 100644 (file)
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -18,24 +18,18 @@
  */
 
 #include "config.h"
+#include "empathy-chat-manager.h"
 
-#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 <libempathy-gtk/empathy-ui-utils.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-chat-manager.h"
-
-#include <extensions/extensions.h>
+#include "empathy-debug.h"
 
 enum {
   CLOSED_CHATS_CHANGED,
@@ -70,6 +64,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) \
@@ -151,6 +150,20 @@ join_cb (GObject *source,
     }
 }
 
+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,
@@ -160,6 +173,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))
@@ -203,7 +217,15 @@ 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))
     {
@@ -308,6 +330,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);
 }