From: Colin Leroy <colin@colino.net>
Date: Thu, 10 Feb 2005 09:50:19 +0000 (+0000)
Subject: 2005-02-10 [colin]	1.0.1cvs3.1
X-Git-Tag: rel_1_9_6~55
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=14b3f8da2219f25394e1c8302cfe6bed5fe0fa96

2005-02-10 [colin]	1.0.1cvs3.1

	* src/mainwindow.c
		Sync with HEAD
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 91835a06c..d8e330747 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-02-10 [colin]	1.0.1cvs3.1
+
+	* src/mainwindow.c
+		Sync with HEAD
+
 2005-02-10 [colin]	1.0.1cvs2.1
 
 	* src/messageview.c
diff --git a/PATCHSETS b/PATCHSETS
index 96dc4a836..0debab51f 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -367,3 +367,4 @@
 ( cvs diff -u -r 1.65.2.21 -r 1.65.2.22 src/codeconv.c; ) > 1.0.1cvs1.2.patchset
 ( cvs diff -u -r 1.96.2.42 -r 1.96.2.43 src/textview.c; cvs diff -u -r 1.12.2.3 -r 1.12.2.4 src/textview.h; ) > 1.0.1cvs1.3.patchset
 ( cvs diff -u -r 1.94.2.43 -r 1.94.2.44 src/messageview.c; ) > 1.0.1cvs2.1.patchset
+( cvs diff -u -r 1.274.2.30 -r 1.274.2.31 src/mainwindow.c; ) > 1.0.1cvs3.1.patchset
diff --git a/configure.ac b/configure.ac
index 6aadb381e..8ff225b99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 8525b86fe..94bd360ba 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1123,6 +1123,7 @@ void main_window_destroy(MainWindow *mainwin)
 {
 	/* TODO : destroy other component */
 	messageview_destroy(mainwin->messageview);
+	mainwin->messageview = NULL;	
 }
 
 void main_window_update_actions_menu(MainWindow *mainwin)
@@ -1492,6 +1493,12 @@ void main_window_get_size(MainWindow *mainwin)
 {
 	GtkAllocation *allocation;
 
+	if (mainwin->messageview == NULL) {
+		debug_print("called after messageview "
+			    "has been deallocated!\n");
+		return;
+	}
+
 	allocation = &(GTK_WIDGET_PTR(mainwin->summaryview)->allocation);
 
 	if (allocation->width > 1 && allocation->height > 1) {