From: Christoph Hohmann Date: Fri, 10 Jan 2003 14:58:10 +0000 (+0000) Subject: 0.8.8claws75 X-Git-Tag: rel_0_8_9~73 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=fd1412593ee3bac1a3fbe61eba22d4795b8344c4 0.8.8claws75 * src/folder.c don't accept 0 as a valid uid returned by copy and move functions. 0 means the message was copied or moved but the new uid could not be fetched. It is not an error condition for the copy or move operation. --- diff --git a/ChangeLog.claws b/ChangeLog.claws index 2824d6411..b98c22cc9 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,4 +1,12 @@ -2003-01-10 [paul] 0.8..8claws74 +2003-01-10 [christoph] 0.8.8claws75 + + * src/folder.c + don't accept 0 as a valid uid returned by copy and move + functions. 0 means the message was copied or moved but the + new uid could not be fetched. It is not an error condition + for the copy or move operation. + +2003-01-10 [paul] 0.8.8claws74 * src/prefs_filtering.c change English used in Alert when entry is not diff --git a/configure.in b/configure.in index 86c25bcdf..f7e10f916 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=8 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws74 +EXTRA_VERSION=claws75 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/folder.c b/src/folder.c index 6b6507874..eaae52915 100644 --- a/src/folder.c +++ b/src/folder.c @@ -1682,7 +1682,7 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo) num = folder->copy_msg(folder, dest, msginfo); - if (num != -1) { + if (num > 0) { MsgInfo *newmsginfo; /* Add new msginfo to dest folder */ @@ -1796,7 +1796,7 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist) num = GPOINTER_TO_INT(l2->data); - if (num != -1) { + if (num > 0) { MsgInfo *newmsginfo; newmsginfo = folder->get_msginfo(folder, dest, num); @@ -1838,7 +1838,7 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist) num = GPOINTER_TO_INT(l2->data); - if (num != -1) { + if (num > 0) { item->folder->remove_msg(item->folder, msginfo->folder, msginfo->msgnum); @@ -1901,7 +1901,7 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo) if (!dest->cache) folder_item_read_cache(dest); num = folder->copy_msg(folder, dest, msginfo); - if (num != -1) { + if (num > 0) { MsgInfo *newmsginfo; if (NULL != (newmsginfo = folder->get_msginfo(folder, dest, num))) { @@ -1993,7 +1993,7 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist) num = GPOINTER_TO_INT(l2->data); - if (num != -1) { + if (num > 0) { MsgInfo *newmsginfo; newmsginfo = folder->get_msginfo(folder, dest, num);