From a0306ae7d7849bd4c1a845f3dec56dbf0d4df912 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 10 Dec 2007 18:53:01 +0000 Subject: [PATCH] 2007-12-10 [colin] 3.1.0cvs72 * src/folder.c Don't crash when setting batch mode on no folder --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index afecbdaf7..c9a5e6030 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-10 [colin] 3.1.0cvs72 + + * src/folder.c + Don't crash when setting batch mode on no folder + 2007-12-10 [colin] 3.1.0cvs71 * src/common/utils.c diff --git a/PATCHSETS b/PATCHSETS index 13a537ab1..7d1094fd1 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3129,3 +3129,4 @@ ( cvs diff -u -r 1.14.2.13 -r 1.14.2.14 src/vcard.c; ) > 3.1.0cvs69.patchset ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_receive.c; ) > 3.1.0cvs70.patchset ( cvs diff -u -r 1.36.2.130 -r 1.36.2.131 src/common/utils.c; ) > 3.1.0cvs71.patchset +( cvs diff -u -r 1.213.2.172 -r 1.213.2.173 src/folder.c; ) > 3.1.0cvs72.patchset diff --git a/configure.ac b/configure.ac index b7984d1dc..08bc512c8 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=1 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=71 +EXTRA_VERSION=72 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index ce0b7f8e3..23362597c 100644 --- a/src/folder.c +++ b/src/folder.c @@ -4240,6 +4240,8 @@ gboolean folder_want_synchronise(Folder *folder) void folder_item_set_batch (FolderItem *item, gboolean batch) { + if (!item || !item->folder) + return; if (item->folder->klass->set_batch) { item->folder->klass->set_batch(item->folder, item, batch); } -- 2.25.1