[empathy] empathy-av: use GtkApplication (#621339)
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] empathy-av: use GtkApplication (#621339)
- Date: Mon, 18 Oct 2010 08:16:52 +0000 (UTC)
commit 64b7bd12aa298e080047cace1918d19098509b0a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Fri Oct 15 15:36:41 2010 +0200
empathy-av: use GtkApplication (#621339)
src/empathy-av.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/empathy-av.c b/src/empathy-av.c
index 9ef0fbf..c937c2a 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]