* 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/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;
return;
activated = TRUE;
+ empathy_gtk_init ();
if (!use_timer)
{
GOptionEntry options[] = {
{ NULL }
};
+ GResource *resource;
#ifdef ENABLE_DEBUG
TpDebugSender *debug_sender;
#endif
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);
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");
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
/* 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. */
- individual_mgr = empathy_individual_manager_dup_singleton ();
-
if (g_getenv ("EMPATHY_PERSIST") != NULL)
{
DEBUG ("Disable timer");
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;