From: Murray Cumming <murrayc@murrayc.com>
Date: Fri, 27 Apr 2007 14:34:10 +0000 (+0000)
Subject: 2007-04-27  Murray Cumming  <murrayc@murrayc.com>
X-Git-Tag: git_migration_finished~3763
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=f6a9c81359c94c3254d3c678b94f0e54c7e9a4f4;p=modest

2007-04-27  Murray Cumming  <murrayc@murrayc.com>

* src/maemo/modest-msg-view-window.c:
        (modest_msg_view_window_show_toolbar): Prevent hide/show of a NULL toolbar widget,
        when opening a message window.

pmo-trunk-r1696
---

diff --git a/ChangeLog2 b/ChangeLog2
index b96121d..a343192 100644
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,11 @@
 2007-04-27  Murray Cumming  <murrayc@murrayc.com>
 
+	* src/maemo/modest-msg-view-window.c:
+	(modest_msg_view_window_show_toolbar): Prevent hide/show of a NULL toolbar widget, 
+	when opening a message window.
+
+2007-04-27  Murray Cumming  <murrayc@murrayc.com>
+
 	* src/maemo/easysetup/modest-easysetup-wizard.c:
 	(create_page_custom_outgoing): Correct the position of the horizontal separator to 
 	match the UI spec.
diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 91067c7..49e042e 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -964,9 +964,11 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
 		gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
 	}
 
-
-	if (show_toolbar)
-		gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
-	else
-		gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+	/* TODO: Why is this sometimes NULL? murrayc */
+	if (parent_priv->toolbar) {
+		if (show_toolbar)
+			gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+		else
+			gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+	}
 }