use a single window, with tabs

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

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 4da3f0aacb741eb8f43376e9aa59d527b71227cf..b35480dc912b92c3b359e4aa782e79b9cdbe9a26 100644 (file)
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -20,30 +20,25 @@
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include <libnotify/notify.h>
 
-#include <libempathy/empathy-presence-manager.h>
-#include <libempathy/empathy-individual-manager.h>
-
-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
+#include "empathy-bus-names.h"
 #include "empathy-chat-manager.h"
+#include "empathy-chat-resources.h"
+#include "empathy-presence-manager.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
 
-#define EMPATHY_CHAT_DBUS_NAME "org.gnome.Empathy.Chat"
-
 static GtkApplication *app = NULL;
 static gboolean activated = FALSE;
 static gboolean use_timer = TRUE;
@@ -70,6 +65,7 @@ activate_cb (GApplication *application)
     return;
 
   activated = TRUE;
+  empathy_gtk_init ();
 
   if (!use_timer)
     {
@@ -80,6 +76,8 @@ activate_cb (GApplication *application)
   g_assert (chat_mgr == NULL);
   chat_mgr = empathy_chat_manager_dup_singleton ();
 
+  empathy_chat_window_present_chat(NULL, 0);
+
   g_signal_connect (chat_mgr, "displayed-chats-changed",
       G_CALLBACK (displayed_chats_changed_cb), GUINT_TO_POINTER (1));
 }
@@ -92,6 +90,7 @@ main (int argc,
   GOptionEntry options[] = {
       { NULL }
   };
+  GResource *resource;
 #ifdef ENABLE_DEBUG
   TpDebugSender *debug_sender;
 #endif
@@ -99,10 +98,9 @@ main (int argc,
   EmpathyPresenceManager *presence_mgr;
   EmpathyThemeManager *theme_mgr;
   gint retval;
-  EmpathyIndividualManager *individual_mgr;
 
   optcontext = g_option_context_new (N_("- Empathy Chat Client"));
-  g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+  g_option_context_add_group (optcontext, gtk_get_option_group (FALSE));
   g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
   g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
 
@@ -117,7 +115,7 @@ main (int argc,
 
   g_option_context_free (optcontext);
 
-  empathy_gtk_init ();
+  empathy_init ();
 
   /* Make empathy and empathy-chat appear as the same app in gnome-shell */
   gdk_set_program_class ("Empathy");
@@ -126,7 +124,10 @@ main (int argc,
 
   notify_init (_(PACKAGE_NAME));
 
-  app = gtk_application_new (EMPATHY_CHAT_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+  resource = empathy_chat_get_resource ();
+  g_resources_register (resource);
+
+  app = gtk_application_new (EMPATHY_CHAT_BUS_NAME, G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
 
 #ifdef ENABLE_DEBUG
@@ -141,17 +142,6 @@ main (int argc,
   /* Keep the theme manager alive as it does some caching */
   theme_mgr = empathy_theme_manager_dup_singleton ();
 
-  /* Keep the individual manager alive so we won't fetch everything from Folks
-   * each time we need to use it. The individual manager (and so Folks) is
-   * needed to know to which FolksIndividual a TpContact belongs, including:
-   * - empathy_chat_get_contact_menu: to list all the personas of the contact
-   * - empathy_display_individual_info: to invoke gnome-contacts with the
-   *   FolksIndividual.id of the contact
-   * - chat-window:drag_data_received_individual_id: to find the individual
-   *   associated with the ID we received from the DnD in order to invite him.
-   */
-  individual_mgr = empathy_individual_manager_dup_singleton ();
-
   if (g_getenv ("EMPATHY_PERSIST") != NULL)
     {
       DEBUG ("Disable timer");
@@ -172,12 +162,14 @@ main (int argc,
   g_object_unref (presence_mgr);
   g_object_unref (theme_mgr);
   tp_clear_object (&chat_mgr);
-  g_object_unref (individual_mgr);
 
 #ifdef ENABLE_DEBUG
   g_object_unref (debug_sender);
 #endif
 
+  g_resources_unregister (resource);
+  g_resource_unref (resource);
+
   notify_uninit ();
 
   return retval;