2007-10-01 [colin] 3.0.1cvs12-stable

	* src/folder.c
		From 3.0.1cvs38
		Fix bug 1337, 'crash on pressing Send button'

diff --git a/ChangeLog b/ChangeLog
index 91be9fe2c106d5d13c47aa5973b3f6165f49804f..a6a7ad825d035e7b6931e4eec915c0ca42802fa5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-01 [colin]     3.0.1cvs12-stable
+
+       * src/folder.c
+               From 3.0.1cvs38
+               Fix bug 1337, 'crash on pressing Send button'
+
 2007-10-01 [colin]     3.0.1cvs11-stable
 
        * src/prefs_folder_item.c

diff --git a/PATCHSETS b/PATCHSETS
index 671d7854866cc18190572c49569fc258a65bd078..7c03792644290e086d052859353332f017645070 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2869,3 +2869,4 @@
 ( cvs diff -u -r 1.149.2.80.2.2 -r 1.149.2.80.2.3 src/inc.c;  ) > 3.0.1cvs9-stable.patchset
 ( cvs diff -u -r 1.1.2.76.2.1 -r 1.1.2.76.2.2 src/gtk/quicksearch.c;  ) > 3.0.1cvs10-stable.patchset
 ( cvs diff -u -r 1.52.2.48 -r 1.52.2.49 src/prefs_folder_item.c;  ) > 3.0.1cvs11-stable.patchset
+( cvs diff -u -r 1.213.2.158.2.3 -r 1.213.2.158.2.4 src/folder.c;  ) > 3.0.1cvs12-stable.patchset

diff --git a/configure.ac b/configure.ac
index a5fdc70e011012904f008e4c3fe5404a0983e002..eaa6d23aa44d92ef8158c1bab63cf3785887b8d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=-stable
 

diff --git a/src/folder.c b/src/folder.c
index 02c5afb36e0ac6f86d68ea82491b12c1d85a079a..bc1836c392712dce8e9951ba57ef6c58418d3fa0 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -3477,7 +3477,7 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
        if (!item->cache) folder_item_read_cache(item);
 
        msginfo = msgcache_get_msg(item->cache, num);
-       if (MSG_IS_LOCKED(msginfo->flags)) {
+       if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
                procmsg_msginfo_free(msginfo);
                return -1;
        }
@@ -3513,7 +3513,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        }
        while (ret == 0 && msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
-               if (MSG_IS_LOCKED(msginfo->flags)) {
+               if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
                        msglist = msglist->next;
                        continue;
                }