Merge branch 'sasl'

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

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 9bfc6b8163dc297f1b590b32501b59a15ff74e57..7d8fcd323c9dedd11385f05e20ecf112cd2e1ebb 100644 (file)
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -26,6 +26,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+#include <libnotify/notify.h>
+
 #include <telepathy-glib/debug-sender.h>
 
 #include <libempathy/empathy-idle.h>
@@ -45,6 +47,8 @@ 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,
     guint nb_chats,
@@ -61,12 +65,22 @@ handled_chats_changed_cb (EmpathyChatManager *mgr,
 static void
 activate_cb (GApplication *application)
 {
-  if (!use_timer && !activated)
+  if (activated)
+    return;
+
+  activated = TRUE;
+
+  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 ();
+
+  g_signal_connect (chat_mgr, "handled-chats-changed",
+      G_CALLBACK (handled_chats_changed_cb), GUINT_TO_POINTER (1));
 }
 
 int
@@ -81,7 +95,6 @@ main (int argc,
   TpDebugSender *debug_sender;
 #endif
   GError *error = NULL;
-  EmpathyChatManager *chat_mgr;
   EmpathyIdle *idle;
   gint retval;
 
@@ -108,7 +121,9 @@ main (int argc,
   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));
+
+  app = gtk_application_new (EMPATHY_CHAT_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
 
 #ifdef ENABLE_DEBUG
@@ -120,11 +135,6 @@ main (int argc,
   /* Setting up Idle */
   idle = empathy_idle_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));
-
   if (g_getenv ("EMPATHY_PERSIST") != NULL)
     {
       DEBUG ("Disable timer");
@@ -143,11 +153,13 @@ main (int argc,
 
   g_object_unref (app);
   g_object_unref (idle);
-  g_object_unref (chat_mgr);
+  tp_clear_object (&chat_mgr);
 
 #ifdef ENABLE_DEBUG
   g_object_unref (debug_sender);
 #endif
 
+  notify_uninit ();
+
   return retval;
 }