2007-06-16 [colin] 2.9.2cvs65

	* src/prefs_summaries.c
	* src/procmsg.c
		Change the pref "Only mark as read when opened
		in new window" to "..., replied to or forwarded".
		Based on a patch by Paul Rolland.

diff --git a/ChangeLog b/ChangeLog
index 342619170195cfbcbbd22663fbf1931f8c5df423..68a4ffacfa9a7ddeaeed10310a871ade00ab1322 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-16 [colin]     2.9.2cvs65
+
+       * src/prefs_summaries.c
+       * src/procmsg.c
+               Change the pref "Only mark as read when opened
+               in new window" to "..., replied to or forwarded".
+               Based on a patch by Paul Rolland.
+
 2007-06-16 [paul]      2.9.2cvs64
 
        * src/gtk/authors.h

diff --git a/PATCHSETS b/PATCHSETS
index de6cdcc0ecd26d5e25d08adb6b41c7ce6a371fda..a8e7d6a6c6dfb182937f10c976efd6c1a30443cd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2640,3 +2640,4 @@
 ( cvs diff -u -r 1.94.2.134 -r 1.94.2.135 src/messageview.c;  ) > 2.9.2cvs62.patchset
 ( cvs diff -u -r 1.100.2.49 -r 1.100.2.50 AUTHORS;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/gtk/authors.h;  ) > 2.9.2cvs63.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

diff --git a/configure.ac b/configure.ac
index 8dc9ca80b9960e09682f41f7ac57bb73e90f4976..a20eb11fd67e17d496aaa82418482efdc58cfb3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=64
+EXTRA_VERSION=65
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 48d3d605a7e0858fc8807965fcf476d35c7310a3..b55ba0752506d87cf1b67caff81b3513e312f95e 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -462,7 +462,8 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
                             NULL);
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_mark_as_read_on_newwin,
-                _("Only mark message as read when opened in a new window"));
+                _("Only mark message as read when opened \n"
+                  "in a new window, replied to, or forwarded"));
                 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);

diff --git a/src/procmsg.c b/src/procmsg.c
index d010cfa1761c57614135c374070db8bb567bb369..4b9bf493444a47a5bd4c09473b4e8a904f6224a4 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1745,11 +1745,16 @@ send_mail:
                        }
                        
                        if (msginfo != NULL) {
+                               MsgPermFlags to_unset = 0;
+
+                               if (prefs_common.mark_as_read_on_new_window)
+                                       to_unset = (MSG_NEW|MSG_UNREAD);
+
                                if (replymessageid != NULL) {
-                                       procmsg_msginfo_unset_flags(msginfo, MSG_FORWARDED, 0);
+                                       procmsg_msginfo_unset_flags(msginfo, to_unset|MSG_FORWARDED, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
                                }  else {
-                                       procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);
+                                       procmsg_msginfo_unset_flags(msginfo, to_unset|MSG_REPLIED, 0);
                                        procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
                                }
                                procmsg_msginfo_free(msginfo);