]> git.0d.be Git - empathy.git/commitdiff
Always set up the call factory in empathy-av.
authorTravis Reitter <travis.reitter@collabora.co.uk>
Wed, 3 Nov 2010 15:49:52 +0000 (08:49 -0700)
committerTravis Reitter <travis.reitter@collabora.co.uk>
Wed, 3 Nov 2010 16:02:20 +0000 (09:02 -0700)
src/empathy-av.c

index f6d1f5268d60d145a012cbb660b5a8020d199e29..5b46307ccf93fbf790c00200897f413100f969fd 100644 (file)
@@ -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 ();