aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-03-23 23:00:08 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:08 +0800
commite9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49 (patch)
treecbaffdb72ad4d37b7b0c55a8fde740a9de4ccf7e /src
parent9b68b6c2bd3a55a817857575814d43145644f419 (diff)
downloadgsoc2013-empathy-e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49.tar
gsoc2013-empathy-e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49.tar.gz
gsoc2013-empathy-e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49.tar.bz2
gsoc2013-empathy-e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49.tar.lz
gsoc2013-empathy-e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49.tar.xz
gsoc2013-empathy-e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49.tar.zst
gsoc2013-empathy-e9d88fb3832f3014e8ed9aaf2ce5bb1f4b96fd49.zip
Minimize the scope in which we use TpyCallChannel
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index f16e6d4d6..af47e2a2d 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2545,9 +2545,6 @@ static void
start_call (EmpathyCallWindow *self)
{
EmpathyCallWindowPriv *priv = GET_PRIV (self);
- TpyCallChannel *call;
-
- g_object_get (priv->handler, "call-channel", &call, NULL);
priv->call_started = TRUE;
empathy_call_handler_start_call (priv->handler,
@@ -2555,7 +2552,11 @@ start_call (EmpathyCallWindow *self)
if (empathy_call_handler_has_initial_video (priv->handler))
{
- TpySendingState s = tpy_call_channel_get_video_state (call);
+ TpyCallChannel *call;
+ TpySendingState s;
+
+ g_object_get (priv->handler, "call-channel", &call, NULL);
+ s = tpy_call_channel_get_video_state (call);
if (s == TPY_SENDING_STATE_PENDING_SEND ||
s == TPY_SENDING_STATE_SENDING)
@@ -2577,9 +2578,9 @@ start_call (EmpathyCallWindow *self)
add_video_preview_to_pipeline (self);
}
}
- }
- g_object_unref (call);
+ g_object_unref (call);
+ }
}
static gboolean