From 955b36d048ad2ee76672d67129c879b2d3cd86f7 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Mon, 24 Aug 2009 11:18:33 +0200 Subject: [PATCH] Fixes NB#134642, crash when closing the headers window --- src/hildon2/modest-header-window.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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)) { -- 1.7.9.5