[empathy] Always set up the call factory in empathy-av.
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Always set up the call factory in empathy-av.
- Date: Wed, 3 Nov 2010 16:16:13 +0000 (UTC)
commit 588c9672d3530294f3ce1308754a7121681a6fa0
Author: Travis Reitter <travis reitter collabora co uk>
Date: Wed Nov 3 08:49:52 2010 -0700
Always set up the call factory in empathy-av.
src/empathy-av.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/empathy-av.c b/src/empathy-av.c
index f6d1f52..5b46307 100644
--- a/src/empathy-av.c
+++ b/src/empathy-av.c
@@ -72,12 +72,15 @@ new_call_handler_cb (EmpathyCallFactory *factory,
static void
activate_cb (GApplication *application)
{
- if (!use_timer && !activated)
+ if (!activated)
{
GError *error = NULL;
- /* keep a 'ref' to the application */
- g_application_hold (G_APPLICATION (app));
+ if (!use_timer)
+ {
+ /* keep a 'ref' to the application */
+ g_application_hold (G_APPLICATION (app));
+ }
g_assert (call_factory == NULL);
call_factory = empathy_call_factory_initialise ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]