* 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 app_held = FALSE;
-static guint timeout_id = 0;
+static gboolean activated = FALSE;
static gboolean use_timer = TRUE;
+static EmpathyChatManager *chat_mgr = NULL;
+
static void
-start_timer (void)
+displayed_chats_changed_cb (EmpathyChatManager *mgr,
+ guint nb_chats,
+ gpointer user_data)
{
- if (!use_timer)
- return;
+ DEBUG ("New chat count: %u", nb_chats);
- DEBUG ("Start timer");
-
- if (app_held)
+ if (nb_chats == 0)
g_application_release (G_APPLICATION (app));
+ else
+ g_application_hold (G_APPLICATION (app));
}
static void
-stop_timer (void)
+activate_cb (GApplication *application)
{
- if (timeout_id == 0)
+ if (activated)
return;
- DEBUG ("Stop timer");
-
- g_application_hold (G_APPLICATION (app));
- app_held = TRUE;
-}
+ activated = TRUE;
+ empathy_gtk_init ();
-static void
-handled_chats_changed_cb (EmpathyChatManager *mgr,
- guint nb_chats,
- gpointer user_data)
-{
- if (nb_chats > 0)
- {
- stop_timer ();
- }
- else
+ if (!use_timer)
{
- start_timer ();
+ /* keep a 'ref' to the application */
+ g_application_hold (G_APPLICATION (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));
}
int
GOptionEntry options[] = {
{ NULL }
};
+ GResource *resource;
#ifdef ENABLE_DEBUG
TpDebugSender *debug_sender;
#endif
- EmpathyChatManager *chat_mgr;
GError *error = NULL;
- EmpathyIdle *idle;
-
- /* Init */
- g_thread_init (NULL);
+ EmpathyPresenceManager *presence_mgr;
+ EmpathyThemeManager *theme_mgr;
+ gint retval;
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)) {
- g_print ("%s\nRun '%s --help' to see a full list of available command "
- "line options.\n",
- error->message, argv[0]);
- g_warning ("Error in empathy-av init: %s", error->message);
- return EXIT_FAILURE;
- }
+ if (!g_option_context_parse (optcontext, &argc, &argv, &error))
+ {
+ g_print ("%s\nRun '%s --help' to see a full list of available command "
+ "line options.\n",
+ error->message, argv[0]);
+ g_warning ("Error in empathy-av init: %s", error->message);
+ return EXIT_FAILURE;
+ }
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
/* Set up debug sender */
#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), NULL);
+ /* Keep the theme manager alive as it does some caching */
+ theme_mgr = empathy_theme_manager_dup_singleton ();
if (g_getenv ("EMPATHY_PERSIST") != NULL)
{
/* the inactivity timeout can only be set while the application is held */
g_application_hold (G_APPLICATION (app));
g_application_set_inactivity_timeout (G_APPLICATION (app), TIMEOUT * 1000);
- if (use_timer)
- {
- g_application_release (G_APPLICATION (app));
- app_held = FALSE;
- }
- else
- app_held = TRUE;
-
- start_timer ();
+ g_application_release (G_APPLICATION (app));
DEBUG ("Waiting for text channels to handle");
- g_application_run (G_APPLICATION (app), argc, argv);
+ 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
- return EXIT_SUCCESS;
+ g_resources_unregister (resource);
+ g_resource_unref (resource);
+
+ notify_uninit ();
+
+ return retval;
}
projects / empathy.git / blobdiff