From 8049ff3dad3ea95b56a3be923ca5a51370d9cc82 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 16 Sep 2010 13:38:56 +0200 Subject: show_borders: check if video_output still exists before using it --- src/empathy-call-window.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/empathy-call-window.c') 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, -- cgit v1.2.3