talons

commit 62e63074d8fc58b5a6b2a7b8eaebc196080ba544
parent 21de5ccd1fe7bb1df899255a7cd1e27e73944d13
Author: Paul Mangan <paul@claws-mail.org>
Date:   Tue, 27 Jan 2009 09:08:50 +0000

2009-01-27 [paul]	3.7.0cvs43

	* src/folder.c
		fix crash when right-clicking in summaryview when
		processing is active

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/folder.c
 | 
2
++

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-27 [paul]	3.7.0cvs43
+
+	* src/folder.c
+		fix crash when right-clicking in summaryview when
+		processing is active
+
 2009-01-22 [colin]	3.7.0cvs42
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3704,3 +3704,4 @@
 ( cvs diff -u -r 1.61.2.92 -r 1.61.2.93 src/account.c;  cvs diff -u -r 1.60.2.129 -r 1.60.2.130 src/addressbook.c;  ) > 3.7.0cvs40.patchset
 ( cvs diff -u -r 1.18.2.15 -r 1.18.2.16 src/addressbook.h;  ) > 3.7.0cvs41.patchset
 ( cvs diff -u -r 1.382.2.495 -r 1.382.2.496 src/compose.c;  cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/privacy.c;  cvs diff -u -r 1.10.2.19 -r 1.10.2.20 src/privacy.h;  ) > 3.7.0cvs42.patchset
+( cvs diff -u -r 1.213.2.187 -r 1.213.2.188 src/folder.c;  ) > 3.7.0cvs43.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
@@ -4428,6 +4428,8 @@ gboolean folder_has_parent_of_type(FolderItem *item,
 {
 	FolderItem *cur = item;
 
+	if (!item)
+		return FALSE;
 	/* if we already know it, make it short */
 	if (item->parent_stype != -1) {
 		return (item->parent_stype == type);