2006-08-28 [paul] 2.4.0cvs106
authorPaul Mangan <paul@claws-mail.org>
Mon, 28 Aug 2006 13:50:15 +0000 (13:50 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 28 Aug 2006 13:50:15 +0000 (13:50 +0000)
* src/mh.c
revert change in 2.4.0cvs104, it breaks
stuff

ChangeLog
PATCHSETS
configure.ac
src/mh.c

index cf98717..c5c619d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-28 [paul]      2.4.0cvs106
+
+       * src/mh.c
+               revert change in 2.4.0cvs104, it breaks
+               stuff
+
 2006-08-28 [paul]      2.4.0cvs105
 
        * src/plugins/spamassassin/spamassassin.c
index a07a716..a1a3f13 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 2.4.0cvs103.patchset
 ( cvs diff -u -r 1.79.2.39 -r 1.79.2.40 src/mh.c;  cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/prefs_spelling.c;  cvs diff -u -r 1.5.2.34 -r 1.5.2.35 src/gtk/pluginwindow.c;  ) > 2.4.0cvs104.patchset
 ( cvs diff -u -r 1.18.2.37 -r 1.18.2.38 src/plugins/spamassassin/spamassassin.c;  ) > 2.4.0cvs105.patchset
+( cvs diff -u -r 1.79.2.40 -r 1.79.2.41 src/mh.c;  ) > 2.4.0cvs106.patchset
index 994f3e4..359cebf 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=105
+EXTRA_VERSION=106
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d88d2f6..93df162 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -644,8 +644,6 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
 
        for (cur = msglist; cur; cur = cur->next) {
                MsgInfo *msginfo = (MsgInfo *)cur->data;
-               GTuples *tuples;
-               gint num;
                if (msginfo == NULL)
                        continue;
                if (MSG_IS_MOVE(msginfo->flags) && MSG_IS_MOVE_DONE(msginfo->flags)) {
@@ -659,13 +657,6 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
                        curnum++;
                }
 
-               if (relation) {
-                       tuples = g_relation_select(relation, msginfo, 0);
-                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
-                       g_tuples_destroy(tuples);
-                       if (num <= 0)
-                               continue;
-               }
                file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msginfo->msgnum), NULL);
                if (file == NULL)
                        continue;