X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-chat.c;h=b35480dc912b92c3b359e4aa782e79b9cdbe9a26;hp=9bfc6b8163dc297f1b590b32501b59a15ff74e57;hb=15aa6a83ff96fad9f959762f2b57646f9e735cd1;hpb=779b303df490ffa5a044b36c44777e2e0f24cf8c

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 9bfc6b81..b35480dc 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -20,33 +20,33 @@
  *          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 <telepathy-glib/debug-sender.h>
-
-#include <libempathy/empathy-idle.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include <libnotify/notify.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;
 
+static EmpathyChatManager *chat_mgr = NULL;
+
 static void
-handled_chats_changed_cb (EmpathyChatManager *mgr,
+displayed_chats_changed_cb (EmpathyChatManager *mgr,
     guint nb_chats,
     gpointer user_data)
 {
@@ -61,12 +61,25 @@ handled_chats_changed_cb (EmpathyChatManager *mgr,
 static void
 activate_cb (GApplication *application)
 {
-  if (!use_timer && !activated)
+  if (activated)
+    return;
+
+  activated = TRUE;
+  empathy_gtk_init ();
+
+  if (!use_timer)
     {
       /* keep a 'ref' to the application */
       g_application_hold (G_APPLICATION (application));
-      activated = TRUE;
     }
+
+  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));
 }
 
 int
@@ -77,20 +90,19 @@ main (int argc,
   GOptionEntry options[] = {
       { NULL }
   };
+  GResource *resource;
 #ifdef ENABLE_DEBUG
   TpDebugSender *debug_sender;
 #endif
   GError *error = NULL;
-  EmpathyChatManager *chat_mgr;
-  EmpathyIdle *idle;
+  EmpathyPresenceManager *presence_mgr;
+  EmpathyThemeManager *theme_mgr;
   gint retval;
 
-  /* Init */
-  g_thread_init (NULL);
-
   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);
 
   if (!g_option_context_parse (optcontext, &argc, &argv, &error))
     {
@@ -103,12 +115,19 @@ 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");
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
-  app = gtk_application_new (EMPATHY_CHAT_DBUS_NAME, G_APPLICATION_IS_SERVICE);
+  notify_init (_(PACKAGE_NAME));
+
+  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
@@ -118,12 +137,10 @@ main (int argc,
 #endif
 
   /* Setting up Idle */
-  idle = empathy_idle_dup_singleton ();
+  presence_mgr = empathy_presence_manager_dup_singleton ();
 
-  chat_mgr = empathy_chat_manager_dup_singleton ();
-
-  g_signal_connect (chat_mgr, "handled-chats-changed",
-      G_CALLBACK (handled_chats_changed_cb), GUINT_TO_POINTER (1));
+  /* Keep the theme manager alive as it does some caching */
+  theme_mgr = empathy_theme_manager_dup_singleton ();
 
   if (g_getenv ("EMPATHY_PERSIST") != NULL)
     {
@@ -142,12 +159,18 @@ main (int argc,
   retval = g_application_run (G_APPLICATION (app), argc, argv);
 
   g_object_unref (app);
-  g_object_unref (idle);
-  g_object_unref (chat_mgr);
+  g_object_unref (presence_mgr);
+  g_object_unref (theme_mgr);
+  tp_clear_object (&chat_mgr);
 
 #ifdef ENABLE_DEBUG
   g_object_unref (debug_sender);
 #endif
 
+  g_resources_unregister (resource);
+  g_resource_unref (resource);
+
+  notify_uninit ();
+
   return retval;
 }