aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 16:16:29 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:09 +0800
commita59b409850d16d6612e1d1e02e9d67969b00d988 (patch)
treee7177e14e9d0565015620f092a11374f871c1960
parent70f3ecbecff1194994e950e0e34eaf45bab8a1b2 (diff)
downloadgsoc2013-empathy-a59b409850d16d6612e1d1e02e9d67969b00d988.tar
gsoc2013-empathy-a59b409850d16d6612e1d1e02e9d67969b00d988.tar.gz
gsoc2013-empathy-a59b409850d16d6612e1d1e02e9d67969b00d988.tar.bz2
gsoc2013-empathy-a59b409850d16d6612e1d1e02e9d67969b00d988.tar.lz
gsoc2013-empathy-a59b409850d16d6612e1d1e02e9d67969b00d988.tar.xz
gsoc2013-empathy-a59b409850d16d6612e1d1e02e9d67969b00d988.tar.zst
gsoc2013-empathy-a59b409850d16d6612e1d1e02e9d67969b00d988.zip
Port empathy-call to GtkApplication
Based on the changes to empathy-av.
-rw-r--r--src/empathy-call.c112
1 files changed, 46 insertions, 66 deletions
diff --git a/src/empathy-call.c b/src/empathy-call.c
index ce415b5dc..f9e216522 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -43,76 +43,61 @@
/* Exit after $TIMEOUT seconds if not displaying any call window */
#define TIMEOUT 60
-static guint nb_windows = 0;
-static guint timeout_id = 0;
-static gboolean use_timer = TRUE;
+#define EMPATHY_CALL_DBUS_NAME "org.gnome.Empathy.Call"
-static gboolean
-timeout_cb (gpointer data)
-{
- DEBUG ("Timing out; exiting");
+static GtkApplication *app = NULL;
+static gboolean activated = FALSE;
+static gboolean use_timer = TRUE;
- gtk_main_quit ();
- return FALSE;
-}
+static EmpathyCallFactory *call_factory = NULL;
static void
-start_timer (void)
+new_call_handler_cb (EmpathyCallFactory *factory,
+ EmpathyCallHandler *handler,
+ gboolean outgoing,
+ gpointer user_data)
{
- if (!use_timer)
- return;
-
- if (timeout_id != 0)
- return;
+ EmpathyCallWindow *window;
- DEBUG ("Start timer");
+ DEBUG ("Create a new call window");
- timeout_id = g_timeout_add_seconds (TIMEOUT, timeout_cb, NULL);
-}
+ window = empathy_call_window_new (handler);
-static void
-stop_timer (void)
-{
- if (timeout_id == 0)
- return;
+ g_application_hold (G_APPLICATION (app));
- DEBUG ("Stop timer");
+ g_signal_connect_swapped (window, "destroy",
+ G_CALLBACK (g_application_release), app);
- g_source_remove (timeout_id);
- timeout_id = 0;
+ gtk_widget_show (GTK_WIDGET (window));
}
static void
-call_window_destroy_cb (EmpathyCallWindow *window,
- gpointer user_data)
+activate_cb (GApplication *application)
{
- nb_windows--;
+ GError *error = NULL;
- if (nb_windows > 0)
+ if (activated)
return;
- start_timer ();
-}
-
-static void
-new_call_handler_cb (EmpathyCallFactory *factory,
- EmpathyCallHandler *handler,
- gboolean outgoing,
- gpointer user_data)
-{
- EmpathyCallWindow *window;
-
- DEBUG ("Create a new call window");
+ activated = TRUE;
- window = empathy_call_window_new (handler);
+ if (!use_timer)
+ {
+ /* keep a 'ref' to the application */
+ g_application_hold (G_APPLICATION (app));
+ }
- nb_windows++;
- stop_timer ();
+ g_assert (call_factory == NULL);
+ call_factory = empathy_call_factory_initialise ();
- g_signal_connect (window, "destroy",
- G_CALLBACK (call_window_destroy_cb), NULL);
+ g_signal_connect (G_OBJECT (call_factory), "new-call-handler",
+ G_CALLBACK (new_call_handler_cb), NULL);
- gtk_widget_show (GTK_WIDGET (window));
+ if (!empathy_call_factory_register (call_factory, &error))
+ {
+ g_critical ("Failed to register Handler: %s", error->message);
+ g_error_free (error);
+ }
}
int
@@ -126,8 +111,8 @@ main (int argc,
#ifdef ENABLE_DEBUG
TpDebugSender *debug_sender;
#endif
- EmpathyCallFactory *call_factory;
GError *error = NULL;
+ gint retval;
/* Init */
g_thread_init (NULL);
@@ -156,24 +141,15 @@ main (int argc,
gtk_window_set_default_icon_name ("empathy");
textdomain (GETTEXT_PACKAGE);
+ app = gtk_application_new (EMPATHY_CALL_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+ g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
+
#ifdef ENABLE_DEBUG
/* Set up debug sender */
debug_sender = tp_debug_sender_dup ();
g_log_set_default_handler (tp_debug_sender_log_handler, G_LOG_DOMAIN);
#endif
- call_factory = empathy_call_factory_initialise ();
-
- g_signal_connect (G_OBJECT (call_factory), "new-call-handler",
- G_CALLBACK (new_call_handler_cb), NULL);
-
- if (!empathy_call_factory_register (call_factory, &error))
- {
- g_critical ("Failed to register Handler: %s", error->message);
- g_error_free (error);
- return EXIT_FAILURE;
- }
-
if (g_getenv ("EMPATHY_PERSIST") != NULL)
{
DEBUG ("Disable timer");
@@ -181,15 +157,19 @@ main (int argc,
use_timer = FALSE;
}
- start_timer ();
+ /* 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);
+ g_application_release (G_APPLICATION (app));
- gtk_main ();
+ retval = g_application_run (G_APPLICATION (app), argc, argv);
- g_object_unref (call_factory);
+ g_object_unref (app);
+ tp_clear_object (&call_factory);
#ifdef ENABLE_DEBUG
g_object_unref (debug_sender);
#endif
- return EXIT_SUCCESS;
+ return retval;
}