From: Claudio Saavedra <csaavedra@igalia.com>
Date: Thu, 2 Apr 2009 14:41:08 +0000 (+0000)
Subject: 2009-04-02 Claudio Saavedra <csaavedra@igalia.com>
X-Git-Tag: 2.1.66-1~25
X-Git-Url: http://git.maemo.org/git/?p=hildon;a=commitdiff_plain;h=1a00b325bd3b50fa154dd181f8d1574b7ab22c21

2009-04-02 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-window.c (hildon_window_map): Check for vbox to be
	not NULL.  Avoids a (very unlikely) crasher. See related NB#103301
	browser crash.
---

diff --git a/ChangeLog b/ChangeLog
index c6e6ac9..4d87810 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,12 @@
 
 2009-04-02  Claudio Saavedra  <csaavedra@igalia.com>
 
+	* src/hildon-window.c (hildon_window_map): Check for vbox to be
+	not NULL.  Avoids a (very unlikely) crasher. See related NB#103301
+	browser crash.
+
+2009-04-02  Claudio Saavedra  <csaavedra@igalia.com>
+
 	* debian/control: Depend on osso-system-lock localization package.
 	* src/hildon-code-dialog.c: Obtain the secu_application_title
 	translation from osso-system-lock.
diff --git a/src/hildon-window.c b/src/hildon-window.c
index ee1a08a..d0a85b3 100644
--- a/src/hildon-window.c
+++ b/src/hildon-window.c
@@ -482,7 +482,7 @@ hildon_window_map                             (GtkWidget *widget)
   if (GTK_WIDGET_CLASS (hildon_window_parent_class)->map)
     GTK_WIDGET_CLASS (hildon_window_parent_class)->map (widget);
 
-  if (GTK_WIDGET_VISIBLE (priv->vbox))
+  if (priv->vbox != NULL && GTK_WIDGET_VISIBLE (priv->vbox))
     gtk_widget_map (priv->vbox);
 
   if (priv->edit_toolbar != NULL && GTK_WIDGET_VISIBLE (priv->edit_toolbar))