X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-header-window.c;h=cc14434d2b5ca81bd46a69b53353e70e4a7ccddf;hb=9211e18ed28607d16a40bdcc39ab0a343fc52624;hp=36c78df57a8556b5d1f8ee492b134f6cca49f454;hpb=c87b080ad757bc0b4264453362533aacfabc3ed5;p=modest

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 36c78df..cc14434 100644
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -268,8 +268,6 @@ modest_header_window_finalize (GObject *obj)
 		g_object_unref (folder);
 	}
 
-	/* Sanity check: shouldn't be needed, the window mgr should
-	   call this function before */
 	modest_header_window_disconnect_signals (MODEST_WINDOW (obj));
 
 	g_object_unref (priv->header_view);
@@ -540,8 +538,14 @@ static void
 on_header_view_model_destroyed (gpointer user_data,
 				GObject *model)
 {
-	ModestHeaderWindow *self = (ModestHeaderWindow *) user_data;
-	ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+	ModestHeaderWindow *self;
+	ModestHeaderWindowPrivate *priv;
+
+	self = (ModestHeaderWindow *) user_data;
+	if (!GTK_IS_WIDGET (self))
+		return;
+
+	priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
 
 	if (g_signal_handler_is_connected (G_OBJECT (model),
 					   priv->sort_column_handler)) {