From af4c6527665fa7246459cae1269cd48830998469 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 8 Aug 2005 16:52:01 +0000 Subject: [PATCH] 2005-08-08 [colin] 1.9.13cvs26 * src/folder.c Fix shameful bugs (and bug #779) --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index b5542712c..17c750176 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-08-08 [colin] 1.9.13cvs26 + + * src/folder.c + Fix shameful bugs (and bug #779) + 2005-08-08 [colin] 1.9.13cvs25 * src/folder.c diff --git a/PATCHSETS b/PATCHSETS index c16d3cea1..0ab5dcdf4 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -711,3 +711,4 @@ ( cvs diff -u -r 1.382.2.148 -r 1.382.2.149 src/compose.c; cvs diff -u -r 1.213.2.45 -r 1.213.2.46 src/folder.c; cvs diff -u -r 1.87.2.14 -r 1.87.2.15 src/folder.h; cvs diff -u -r 1.26.2.18 -r 1.26.2.19 src/foldersel.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/folderutils.c; cvs diff -u -r 1.207.2.53 -r 1.207.2.54 src/folderview.c; cvs diff -u -r 1.179.2.57 -r 1.179.2.58 src/imap.c; cvs diff -u -r 1.274.2.52 -r 1.274.2.53 src/mainwindow.c; cvs diff -u -r 1.94.2.60 -r 1.94.2.61 src/messageview.c; cvs diff -u -r 1.79.2.15 -r 1.79.2.16 src/mh.c; cvs diff -u -r 1.16.2.23 -r 1.16.2.24 src/msgcache.c; cvs diff -u -r 1.49.2.52 -r 1.49.2.53 src/procmime.c; cvs diff -u -r 1.395.2.105 -r 1.395.2.106 src/summaryview.c; ) > 1.9.13cvs23.patchset ( cvs diff -u -r 1.213.2.46 -r 1.213.2.47 src/folder.c; ) > 1.9.13cvs24.patchset ( cvs diff -u -r 1.213.2.47 -r 1.213.2.48 src/folder.c; cvs diff -u -r 1.87.2.15 -r 1.87.2.16 src/folder.h; cvs diff -u -r 1.207.2.54 -r 1.207.2.55 src/folderview.c; cvs diff -u -r 1.150.2.33 -r 1.150.2.34 src/procmsg.c; cvs diff -u -r 1.60.2.13 -r 1.60.2.14 src/procmsg.h; cvs diff -u -r 1.395.2.106 -r 1.395.2.107 src/summaryview.c; cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/plugins/Makefile.am; ) > 1.9.13cvs25.patchset +( cvs diff -u -r 1.213.2.48 -r 1.213.2.49 src/folder.c; ) > 1.9.13cvs26.patchset diff --git a/configure.ac b/configure.ac index b6192eece..d0897a208 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=13 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=25 +EXTRA_VERSION=26 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index af1983312..fd2b70d43 100644 --- a/src/folder.c +++ b/src/folder.c @@ -2321,7 +2321,7 @@ static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file) return 0; if ((folder_has_parent_of_type(dest, F_QUEUE)) || - (folder_has_parent_of_type(msginfo->folder, F_DRAFT))) + (folder_has_parent_of_type(dest, F_DRAFT))) while (fgets(buf, sizeof(buf), fp) != NULL) if (buf[0] == '\r' || buf[0] == '\n') break; @@ -3561,7 +3561,7 @@ gboolean folder_has_parent_of_type(FolderItem *item, FolderItem *cur = item; while (cur) { if (cur->stype == type || cur->parent_stype == type) { - item->parent_stype == type; + item->parent_stype = type; return TRUE; } cur = folder_item_parent(cur); -- 2.25.1