talons

commit 3d4b08fe446dce93193e36b334782fb7101fc8b2
parent c384f9e3999035f80701e38ce3c3e59f79cae103
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Mon, 13 Feb 2012 18:31:11 +0000

2012-02-13 [pawel]	3.8.0cvs29

	* src/messageview.c
		Fix crasher when double clicking on IMAP message and
		MessageView is not shown introduced in cvs21
		Patch by mones

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/messageview.c
 | 
3
+++

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-13 [pawel]	3.8.0cvs29
+
+	* src/messageview.c
+		Fix crasher when double clicking on IMAP message and
+		MessageView is not shown introduced in cvs21
+		Patch by mones
+
 2012-02-10 [pawel]	3.8.0cvs28
 
 	* src/filtering.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4345,3 +4345,4 @@
 ( cvs diff -u -r 1.115.2.246 -r 1.115.2.247 src/main.c;  cvs diff -u -r 1.274.2.342 -r 1.274.2.343 src/mainwindow.c;  cvs diff -u -r 1.94.2.226 -r 1.94.2.227 src/messageview.c;  cvs diff -u -r 1.19.2.27 -r 1.19.2.28 src/messageview.h;  cvs diff -u -r 1.204.2.207 -r 1.204.2.208 src/prefs_common.c;  cvs diff -u -r 1.103.2.136 -r 1.103.2.137 src/prefs_common.h;  cvs diff -u -r 1.150.2.121 -r 1.150.2.122 src/procmsg.c;  cvs diff -u -r 1.60.2.58 -r 1.60.2.59 src/procmsg.h;  cvs diff -u -r 1.395.2.443 -r 1.395.2.444 src/summaryview.c;  cvs diff -u -r 1.68.2.58 -r 1.68.2.59 src/summaryview.h;  ) > 3.8.0cvs26.patchset
 ( cvs diff -u -r 1.60.2.78 -r 1.60.2.79 src/prefs_actions.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/prefs_actions.h;  cvs diff -u -r 1.30.2.69 -r 1.30.2.70 src/prefs_toolbar.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/prefs_toolbar.h;  cvs diff -u -r 1.43.2.125 -r 1.43.2.126 src/toolbar.c;  cvs diff -u -r 1.19.2.33 -r 1.19.2.34 src/toolbar.h;  ) > 3.8.0cvs27.patchset
 ( cvs diff -u -r 1.60.2.60 -r 1.60.2.61 src/filtering.c;  ) > 3.8.0cvs28.patchset
+( cvs diff -u -r 1.94.2.227 -r 1.94.2.228 src/messageview.c;  ) > 3.8.0cvs29.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/messageview.c b/src/messageview.c
@@ -2898,6 +2898,9 @@ static gboolean messageview_msg_moved(gpointer source, gpointer data)
 	MsgInfo *msg_old = messageview->msginfo;
 	MsgInfo *msg_new = msginfo_update->msginfo;
 
+	if (msg_new == NULL || msg_old == NULL)
+		return FALSE;
+
 	if (strcmp2(msg_new->msgid, msg_old->msgid))
 		return FALSE;