[Commits] procmsg.c 1.150.2.119 1.150.2.120 stock_pixmap.c 1.25.2.72 1.25.2.73 stock_pixmap.h 1.18.2.42 1.18.2.43 summaryview.c 1.395.2.441 1.395.2.442
wwp at claws-mail.org
wwp at claws-mail.org
Fri Dec 16 14:30:35 CET 2011
Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv30900/src
Modified Files:
Tag: gtk2
procmsg.c stock_pixmap.c stock_pixmap.h summaryview.c
Log Message:
2011-12-16 [wwp] 3.8.0cvs2
* src/procmsg.c
* src/stock_pixmap.c
* src/stock_pixmap.h
* src/summaryview.c
* src/gtk/icon_legend.c
* src/pixmaps/replied_and_forwarded.xpm
Make replied and forwarded status flags non exclusive.
Introduce a new message state (and relevant icon in message list)
where both the replied and forwarded flags are set.
Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.441
retrieving revision 1.395.2.442
diff -u -d -r1.395.2.441 -r1.395.2.442
--- summaryview.c 9 Dec 2011 20:29:21 -0000 1.395.2.441
+++ summaryview.c 16 Dec 2011 13:30:33 -0000 1.395.2.442
@@ -97,6 +97,7 @@
static GdkPixbuf *unreadxpm;
static GdkPixbuf *repliedxpm;
static GdkPixbuf *forwardedxpm;
+static GdkPixbuf *repliedandforwardedxpm;
static GdkPixbuf *ignorethreadxpm;
static GdkPixbuf *watchthreadxpm;
static GdkPixbuf *lockedxpm;
@@ -931,6 +932,8 @@
&repliedxpm);
stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
&forwardedxpm);
+ stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED_AND_FORWARDED,
+ &repliedandforwardedxpm);
stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
&clipxpm);
stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
@@ -3753,6 +3756,9 @@
} else if (MSG_IS_UNREAD(flags)) {
gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
unreadxpm);
+ } else if (MSG_IS_REPLIED(flags) && MSG_IS_FORWARDED(flags)) {
+ gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
+ repliedandforwardedxpm);
} else if (MSG_IS_REPLIED(flags)) {
gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_STATUS],
repliedxpm);
@@ -6174,6 +6180,8 @@
return _("New");
} else if (MSG_IS_UNREAD(flags)) {
return _("Unread");
+ } else if (MSG_IS_REPLIED(flags) && MSG_IS_FORWARDED(flags)) {
+ return _("Replied but also forwarded - click to see reply");
} else if (MSG_IS_REPLIED(flags)) {
return _("Replied - click to see reply");
} else if (MSG_IS_FORWARDED(flags)) {
@@ -7751,6 +7759,7 @@
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_UNREAD, &unreadxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED, &repliedxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm);
+ stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED_AND_FORWARDED, &repliedandforwardedxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP, &clipxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_LOCKED, &lockedxpm);
stock_pixbuf_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
Index: stock_pixmap.c
===================================================================
RCS file: /home/claws-mail/claws/src/stock_pixmap.c,v
retrieving revision 1.25.2.72
retrieving revision 1.25.2.73
diff -u -d -r1.25.2.72 -r1.25.2.73
--- stock_pixmap.c 25 Oct 2011 16:51:58 -0000 1.25.2.72
+++ stock_pixmap.c 16 Dec 2011 13:30:33 -0000 1.25.2.73
@@ -57,6 +57,7 @@
#include "pixmaps/locked.xpm"
#include "pixmaps/new.xpm"
#include "pixmaps/replied.xpm"
+#include "pixmaps/replied_and_forwarded.xpm"
#include "pixmaps/close.xpm"
#include "pixmaps/down_arrow.xpm"
#include "pixmaps/up_arrow.xpm"
@@ -121,13 +122,13 @@
#include "pixmaps/privacy_failed.xpm"
#include "pixmaps/privacy_unknown.xpm"
#include "pixmaps/privacy_expired.xpm"
-#include "pixmaps/privacy_warn.xpm"
+#include "pixmaps/privacy_warn.xpm"
#include "pixmaps/privacy_emblem_encrypted.xpm"
#include "pixmaps/privacy_emblem_signed.xpm"
#include "pixmaps/privacy_emblem_passed.xpm"
#include "pixmaps/privacy_emblem_failed.xpm"
#include "pixmaps/privacy_emblem_warn.xpm"
-#include "pixmaps/mime_message.xpm"
+#include "pixmaps/mime_message.xpm"
#include "pixmaps/address_search.xpm"
#include "pixmaps/check_spelling.xpm"
@@ -304,6 +305,7 @@
{outbox_open_mark_xpm , NULL, NULL, "outbox_open_mark", NULL},
{outbox_open_hrm_mark_xpm , NULL, NULL, "outbox_open_hrm_mark", NULL},
{replied_xpm , NULL, NULL, "replied", NULL},
+ {replied_and_forwarded_xpm , NULL, NULL, "replied_and_forwarded", NULL},
{paste_xpm , NULL, NULL, "paste", NULL},
{preferences_xpm , NULL, NULL, "preferences", NULL},
{properties_xpm , NULL, NULL, "properties", NULL},
Index: stock_pixmap.h
===================================================================
RCS file: /home/claws-mail/claws/src/stock_pixmap.h,v
retrieving revision 1.18.2.42
retrieving revision 1.18.2.43
diff -u -d -r1.18.2.42 -r1.18.2.43
--- stock_pixmap.h 16 Feb 2011 07:16:16 -0000 1.18.2.42
+++ stock_pixmap.h 16 Dec 2011 13:30:33 -0000 1.18.2.43
@@ -102,6 +102,7 @@
STOCK_PIXMAP_OUTBOX_OPEN_MARK,
STOCK_PIXMAP_OUTBOX_OPEN_HRM_MARK,
STOCK_PIXMAP_REPLIED,
+ STOCK_PIXMAP_REPLIED_AND_FORWARDED,
STOCK_PIXMAP_PASTE,
STOCK_PIXMAP_PREFERENCES,
STOCK_PIXMAP_PROPERTIES,
Index: procmsg.c
===================================================================
RCS file: /home/claws-mail/claws/src/procmsg.c,v
retrieving revision 1.150.2.119
retrieving revision 1.150.2.120
diff -u -d -r1.150.2.119 -r1.150.2.120
--- procmsg.c 25 Oct 2011 07:22:55 -0000 1.150.2.119
+++ procmsg.c 16 Dec 2011 13:30:33 -0000 1.150.2.120
@@ -1784,16 +1784,15 @@
}
if (msginfo != NULL) {
- MsgPermFlags to_unset = 0;
+ if (replymessageid != NULL) {
+ MsgPermFlags to_unset = 0;
- if (prefs_common.mark_as_read_on_new_window)
- to_unset = (MSG_NEW|MSG_UNREAD);
+ if (prefs_common.mark_as_read_on_new_window)
+ to_unset = (MSG_NEW|MSG_UNREAD);
- if (replymessageid != NULL) {
- procmsg_msginfo_unset_flags(msginfo, to_unset|MSG_FORWARDED, 0);
+ procmsg_msginfo_unset_flags(msginfo, to_unset, 0);
procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
} else {
- procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
}
procmsg_msginfo_free(msginfo);
More information about the Commits
mailing list