aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-10-14 12:27:12 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-10-14 12:28:58 +0800
commit7b6b8da406493311445f6c2470a005a542972693 (patch)
treeaf24567e32ff889b0fb382bec0397598b8f1872d /src
parent1180b055b932a8f1a1a6b207093e81b412e62da2 (diff)
parent2f9a520747ceacc89e5d6d923ed0cda8da22b95c (diff)
downloadgsoc2013-empathy-7b6b8da406493311445f6c2470a005a542972693.tar
gsoc2013-empathy-7b6b8da406493311445f6c2470a005a542972693.tar.gz
gsoc2013-empathy-7b6b8da406493311445f6c2470a005a542972693.tar.bz2
gsoc2013-empathy-7b6b8da406493311445f6c2470a005a542972693.tar.lz
gsoc2013-empathy-7b6b8da406493311445f6c2470a005a542972693.tar.xz
gsoc2013-empathy-7b6b8da406493311445f6c2470a005a542972693.tar.zst
gsoc2013-empathy-7b6b8da406493311445f6c2470a005a542972693.zip
Merge remote-tracking branch 'pochu/misc-fixes'
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 0a130c4f8..2a92e9471 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2260,13 +2260,14 @@ empathy_call_window_constructed (GObject *object)
EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object);
EmpathyCallWindowPriv *priv = GET_PRIV (self);
TpyCallChannel *call;
+ TpyCallState state;
g_assert (priv->handler != NULL);
g_object_get (priv->handler, "call-channel", &call, NULL);
- priv->outgoing = (call == NULL);
- if (call != NULL)
- g_object_unref (call);
+ state = tpy_call_channel_get_state (call, NULL, NULL);
+ priv->outgoing = (state == TPY_CALL_STATE_PENDING_INITIATOR);
+ tp_clear_object (&call);
g_object_get (priv->handler, "target-contact", &priv->contact, NULL);
g_assert (priv->contact != NULL);