* src/folder.c

        fix wrong position of NULL pointer check found
        by Sergey

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e653c0e2b20e14163960f14b2d10dcce67abfad1..ae8f674c1fe715127119b3522231c6e23455a5ab 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-11-14 [christoph] 0.8.5claws151
+
+       * src/folder.c
+               fix wrong position of NULL pointer check found
+               by Sergey
+

 2002-11-14 [christoph] 0.8.5claws150
 
        * src/folder.c
 2002-11-14 [christoph] 0.8.5claws150
 
        * src/folder.c

diff --git a/configure.in b/configure.in
index 43f5c3be54f1c043610e0f6b315fdd56a0080e67..cc9d596571c5165204f8769704e8f185798e4a8d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws150
+EXTRA_VERSION=claws151

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index 5f81a6f0fb10a60020ba88b1ecd4c9383f900689..1136b92624fd03af4c42ec81749921474a3b9cf4 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2011,10 +2011,10 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        Folder *folder;
        gint ret = 0;
 
        Folder *folder;
        gint ret = 0;
 

+       g_return_val_if_fail(item != NULL, -1);

        folder = item->folder;
        folder = item->folder;

+       g_return_val_if_fail(folder != NULL, -1);

 
 

-       g_return_val_if_fail(item != NULL, -1);
-       

        if (!item->cache) folder_item_read_cache(item);
 
        if (folder->remove_msgs) {
        if (!item->cache) folder_item_read_cache(item);
 
        if (folder->remove_msgs) {