0.9.3claws36

* src/procmsg.c
        fix wrong flags in MsgInfo returned by
        procmsg_msginfo_get_full_info()

(closes Bug 221 Deleting messages from the Message View gives incorrect
 new/unread message counts in the folder view)

* src/plugins/spamassassin/spamassassin_gtk.c
        add gettext macro for prefs page title

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 465aba0d8fab6445d1b886d8605dcba6dd1cd401..ca3bb99a8bf978520adb25c130d86710970d9926 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,15 @@
+2003-07-20 [christoph] 0.9.3claws36
+
+       * src/procmsg.c
+               fix wrong flags in MsgInfo returned by
+               procmsg_msginfo_get_full_info()
+
+       (closes Bug 221 Deleting messages from the Message View gives incorrect
+        new/unread message counts in the folder view)
+
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               add gettext macro for prefs page title
+
 2003-07-20 [paul]      0.9.3claws35
 
        * src/mimeview.c

diff --git a/configure.ac b/configure.ac
index 9255411bd722d2886ed83abca845f19d7c926744..d74daa83277051e26b104df505c40c1794965de8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index 284b0664c07fbcac5998d189aed768f643ee478e..a49e1ff82414c95d9f366594e68fd552cbee8262 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1638,7 +1638,7 @@ static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo
 static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
 {
        if (!item->cache)
-           folder_item_read_cache(item);
+               folder_item_read_cache(item);
 
        if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                msginfo->folder->new_msgs--;
@@ -1965,7 +1965,7 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
 
                num = GPOINTER_TO_INT(l2->data);
                l2 = g_slist_next(l2);
-               
+
                if ((num >= 0) && (item->folder->klass->remove_msg != NULL)) {
                        item->folder->klass->remove_msg(item->folder,
                                                        msginfo->folder,

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index c52fa63ce04a757166ba3ce719a67c2f9a550082..f91725abf85aff9fae0d2abccc05bbedccf604a0 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -279,7 +279,7 @@ static struct SpamAssassinPage spamassassin_page;
 
 gint plugin_init(gchar **error)
 {
-       spamassassin_page.page.path = "Filtering/SpamAssassin";
+       spamassassin_page.page.path = _("Filtering/SpamAssassin");
        spamassassin_page.page.create_widget = spamassassin_create_widget_func;
        spamassassin_page.page.destroy_widget = spamassassin_destroy_widget_func;
        spamassassin_page.page.save_page = spamassassin_save_func;

diff --git a/src/procmsg.c b/src/procmsg.c
index e42b1cd21a60348938b8eddcca284f9605e7a1f0..48afc450f35d9368ba71cebfe8d02356ffb85c82 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -851,11 +851,21 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
 
 MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
 {
+#if 0
        MsgInfo *full_msginfo;
        gchar *file;
+#endif
 
        if (msginfo == NULL) return NULL;
 
+       /* 
+        * In Claws we simply return a new reference to the same msginfo.
+        * otherwise the new msginfo has wrong flags and causes incorrect
+        * msgcounts... TODO: fill in data from full_msginfo into msginfo,
+        * we can then keep the new data in the cache
+         */
+       return procmsg_msginfo_new_ref(msginfo);
+#if 0
        file = procmsg_get_message_file(msginfo);
        if (!file) {
                g_warning("procmsg_msginfo_get_full_info(): can't get message file.\n");
@@ -877,6 +887,7 @@ MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
        procmsg_msginfo_set_to_folder(full_msginfo, msginfo->to_folder);
 
        return full_msginfo;
+#endif
 }
 
 void procmsg_msginfo_free(MsgInfo *msginfo)