aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTravis Reitter <travis.reitter@collabora.co.uk>2010-11-03 23:49:52 +0800
committerTravis Reitter <travis.reitter@collabora.co.uk>2010-11-04 00:02:20 +0800
commit588c9672d3530294f3ce1308754a7121681a6fa0 (patch)
tree4c1050ad12111d585bd3d1df97ab4dfcc92b662e /src
parent257e5241380c49fb5498093ccf3ebcced29c7fe1 (diff)
downloadgsoc2013-empathy-588c9672d3530294f3ce1308754a7121681a6fa0.tar
gsoc2013-empathy-588c9672d3530294f3ce1308754a7121681a6fa0.tar.gz
gsoc2013-empathy-588c9672d3530294f3ce1308754a7121681a6fa0.tar.bz2
gsoc2013-empathy-588c9672d3530294f3ce1308754a7121681a6fa0.tar.lz
gsoc2013-empathy-588c9672d3530294f3ce1308754a7121681a6fa0.tar.xz
gsoc2013-empathy-588c9672d3530294f3ce1308754a7121681a6fa0.tar.zst
gsoc2013-empathy-588c9672d3530294f3ce1308754a7121681a6fa0.zip
Always set up the call factory in empathy-av.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-av.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/empathy-av.c b/src/empathy-av.c
index f6d1f5268..5b46307cc 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 ();