2007-06-17 [colin] 2.9.2cvs67

	* src/prefs_summaries.c
	* src/procmsg.c
		Don't set as read when forwarded, only replied to

diff --git a/ChangeLog b/ChangeLog
index 8846bb21252de21fffc13985c8390a48dc182201..d6d09f4cf34253a7653d850baf41235a6d38c57a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-17 [colin]     2.9.2cvs67
+
+       * src/prefs_summaries.c
+       * src/procmsg.c
+               Don't set as read when forwarded, only replied to
+

 2007-06-17 [paul]      2.9.2cvs66
 
        * src/alertpanel.c
 2007-06-17 [paul]      2.9.2cvs66
 
        * src/alertpanel.c

diff --git a/PATCHSETS b/PATCHSETS
index 68a6bbb402ca52e4067ecd7c78f8544e94fcd130..211fc8057e111d92b7ec11e839402c864ee9aaac 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2642,3 +2642,4 @@
 ( cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/gtk/authors.h;  ) > 2.9.2cvs64.patchset
 ( cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/prefs_summaries.c;  cvs diff -u -r 1.150.2.96 -r 1.150.2.97 src/procmsg.c;  ) > 2.9.2cvs65.patchset
 ( cvs diff -u -r 1.17.2.34 -r 1.17.2.35 src/alertpanel.c;  ) > 2.9.2cvs66.patchset
 ( cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/gtk/authors.h;  ) > 2.9.2cvs64.patchset
 ( cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/prefs_summaries.c;  cvs diff -u -r 1.150.2.96 -r 1.150.2.97 src/procmsg.c;  ) > 2.9.2cvs65.patchset
 ( cvs diff -u -r 1.17.2.34 -r 1.17.2.35 src/alertpanel.c;  ) > 2.9.2cvs66.patchset

+( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_summaries.c;  cvs diff -u -r 1.150.2.97 -r 1.150.2.98 src/procmsg.c;  ) > 2.9.2cvs67.patchset

diff --git a/configure.ac b/configure.ac
index 43214611812c8665ac31883d5f487a265b391f34..11314b12831aad2c3d38f784a196af4fba3566f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=66
+EXTRA_VERSION=67

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index b55ba0752506d87cf1b67caff81b3513e312f95e..04b0b54237f59d0ec528acedf9b984f96bf6d63d 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -463,7 +463,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_mark_as_read_on_newwin,
                 _("Only mark message as read when opened \n"
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_mark_as_read_on_newwin,
                 _("Only mark message as read when opened \n"

-                  "in a new window, replied to, or forwarded"));
+                  "in a new window, or replied to"));

                 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
                 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);

diff --git a/src/procmsg.c b/src/procmsg.c
index 4b9bf493444a47a5bd4c09473b4e8a904f6224a4..04b4b76f20e9e76c9a1846144157a43939a06b91 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1754,7 +1754,7 @@ send_mail:
                                        procmsg_msginfo_unset_flags(msginfo, to_unset|MSG_FORWARDED, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
                                }  else {
                                        procmsg_msginfo_unset_flags(msginfo, to_unset|MSG_FORWARDED, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
                                }  else {

-                                       procmsg_msginfo_unset_flags(msginfo, to_unset|MSG_REPLIED, 0);
+                                       procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);

                                        procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
                                }
                                procmsg_msginfo_free(msginfo);
                                        procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
                                }
                                procmsg_msginfo_free(msginfo);