Merge branch 'gnome-3-8'

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

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 73d8ce87c58c9ea2283097d04ba4c86d5faed750..e6e8b1b3b886a538dc7794e36361dccba268cb14 100644 (file)
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -20,25 +20,19 @@
  *          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 <telepathy-glib/debug-sender.h>
-
-#include <libempathy/empathy-presence-manager.h>
-
-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.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"
 
 #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
@@ -52,7 +46,7 @@ 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)
 {
@@ -81,8 +75,8 @@ activate_cb (GApplication *application)
   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));
+  g_signal_connect (chat_mgr, "displayed-chats-changed",
+      G_CALLBACK (displayed_chats_changed_cb), GUINT_TO_POINTER (1));
 }
 
 int
@@ -93,6 +87,7 @@ main (int argc,
   GOptionEntry options[] = {
       { NULL }
   };
+  GResource *resource;
 #ifdef ENABLE_DEBUG
   TpDebugSender *debug_sender;
 #endif
@@ -101,12 +96,10 @@ main (int argc,
   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_main_entries (optcontext, options, GETTEXT_PACKAGE);
+  g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
 
   if (!g_option_context_parse (optcontext, &argc, &argv, &error))
     {
@@ -128,6 +121,9 @@ main (int argc,
 
   notify_init (_(PACKAGE_NAME));
 
+  resource = empathy_chat_get_resource ();
+  g_resources_register (resource);
+
   app = gtk_application_new (EMPATHY_CHAT_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
 
@@ -168,6 +164,9 @@ main (int argc,
   g_object_unref (debug_sender);
 #endif
 
+  g_resources_unregister (resource);
+  g_resource_unref (resource);
+
   notify_uninit ();
 
   return retval;