From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Wed, 3 Nov 2010 15:49:52 +0000 (-0700)
Subject: Always set up the call factory in empathy-av.
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=588c9672d3530294f3ce1308754a7121681a6fa0

Always set up the call factory in empathy-av.
---

diff --git a/src/empathy-av.c b/src/empathy-av.c
index f6d1f526..5b46307c 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 ();