aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-15 21:36:41 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-18 16:11:46 +0800
commit64b7bd12aa298e080047cace1918d19098509b0a (patch)
tree8f302eecbad62c12a56c07f2c1ebb3ebbffc591b
parent359fed84d5ee5b0fb82699cb927dbc3293c235cc (diff)
downloadgsoc2013-empathy-64b7bd12aa298e080047cace1918d19098509b0a.tar
gsoc2013-empathy-64b7bd12aa298e080047cace1918d19098509b0a.tar.gz
gsoc2013-empathy-64b7bd12aa298e080047cace1918d19098509b0a.tar.bz2
gsoc2013-empathy-64b7bd12aa298e080047cace1918d19098509b0a.tar.lz
gsoc2013-empathy-64b7bd12aa298e080047cace1918d19098509b0a.tar.xz
gsoc2013-empathy-64b7bd12aa298e080047cace1918d19098509b0a.tar.zst
gsoc2013-empathy-64b7bd12aa298e080047cace1918d19098509b0a.zip
empathy-av: use GtkApplication (#621339)
-rw-r--r--src/empathy-av.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/empathy-av.c b/src/empathy-av.c
index 9ef0fbf29..c937c2a44 100644
--- a/src/empathy-av.c
+++ b/src/empathy-av.c
@@ -41,6 +41,8 @@
/* Exit after $TIMEOUT seconds if not displaying any call window */
#define TIMEOUT 60
+#define EMPATHY_AV_DBUS_NAME "org.gnome.Empathy.AudioVideo"
+
static guint nb_windows = 0;
static guint timeout_id = 0;
static gboolean use_timer = TRUE;
@@ -126,6 +128,7 @@ main (int argc,
#endif
EmpathyCallFactory *call_factory;
GError *error = NULL;
+ GtkApplication *app;
/* Init */
g_thread_init (NULL);
@@ -152,6 +155,8 @@ main (int argc,
gtk_window_set_default_icon_name ("empathy");
textdomain (GETTEXT_PACKAGE);
+ app = gtk_application_new (EMPATHY_AV_DBUS_NAME, &argc, &argv);
+
#ifdef ENABLE_DEBUG
/* Set up debug sender */
debug_sender = tp_debug_sender_dup ();
@@ -179,8 +184,9 @@ main (int argc,
start_timer ();
- gtk_main ();
+ gtk_application_run (app);
+ g_object_unref (app);
g_object_unref (call_factory);
#ifdef ENABLE_DEBUG