aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-16 19:38:56 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-27 21:28:49 +0800
commit8049ff3dad3ea95b56a3be923ca5a51370d9cc82 (patch)
tree00bd1e81450a06abedc6c34247b4850c3d5ab9ce /src
parent6d4cd24b722c8fc9ca63e24447b40892b84054de (diff)
downloadgsoc2013-empathy-8049ff3dad3ea95b56a3be923ca5a51370d9cc82.tar
gsoc2013-empathy-8049ff3dad3ea95b56a3be923ca5a51370d9cc82.tar.gz
gsoc2013-empathy-8049ff3dad3ea95b56a3be923ca5a51370d9cc82.tar.bz2
gsoc2013-empathy-8049ff3dad3ea95b56a3be923ca5a51370d9cc82.tar.lz
gsoc2013-empathy-8049ff3dad3ea95b56a3be923ca5a51370d9cc82.tar.xz
gsoc2013-empathy-8049ff3dad3ea95b56a3be923ca5a51370d9cc82.tar.zst
gsoc2013-empathy-8049ff3dad3ea95b56a3be923ca5a51370d9cc82.zip
show_borders: check if video_output still exists before using it
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 4e7e31ccf..476bce572 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2930,10 +2930,15 @@ show_borders (EmpathyCallWindow *window, gboolean set_fullscreen)
set_fullscreen ? 0 : CONTENT_HBOX_BORDER_WIDTH);
gtk_box_set_spacing (GTK_BOX (priv->content_hbox),
set_fullscreen ? 0 : CONTENT_HBOX_SPACING);
- gtk_box_set_child_packing (GTK_BOX (priv->content_hbox),
- priv->video_output, TRUE, TRUE,
- set_fullscreen ? 0 : CONTENT_HBOX_CHILDREN_PACKING_PADDING,
- GTK_PACK_START);
+
+ if (priv->video_output != NULL)
+ {
+ gtk_box_set_child_packing (GTK_BOX (priv->content_hbox),
+ priv->video_output, TRUE, TRUE,
+ set_fullscreen ? 0 : CONTENT_HBOX_CHILDREN_PACKING_PADDING,
+ GTK_PACK_START);
+ }
+
gtk_box_set_child_packing (GTK_BOX (priv->content_hbox),
priv->vbox, TRUE, TRUE,
set_fullscreen ? 0 : CONTENT_HBOX_CHILDREN_PACKING_PADDING,