#include <string.h>
#include <ctype.h>
#include <unistd.h>
+#include <sys/stat.h>
#include "intl.h"
#include "main.h"
#include "scoring.h"
#include "prefs_folder_item.h"
#include "filtering.h"
+#include "labelcolors.h"
#include "pixmaps/dir-open.xpm"
#include "pixmaps/mark.xpm"
gconstpointer ptr1,
gconstpointer ptr2);
+#if MARK_ALL_READ
+static void summary_mark_all_read (SummaryView *summaryview);
+#endif
+
GtkTargetEntry summary_drag_types[1] =
{
{"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
{N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL},
{N_("/_Mark/Mark as rea_d"), NULL, summary_mark_as_read, 0, NULL},
+#if MARK_ALL_READ
+ {N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
+#endif
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
{N_("/_Mark/Unignore thread"), NULL, summary_unignore_thread, 0, NULL},
- {N_("/_Label"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Label/None"), NULL, summary_set_label, MSG_LABEL_NONE, NULL},
- {N_("/_Label/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Label/Orange"), NULL, summary_set_label, MSG_LABEL_ORANGE, NULL},
- {N_("/_Label/Red"), NULL, summary_set_label, MSG_LABEL_RED, NULL},
- {N_("/_Label/Pink"), NULL, summary_set_label, MSG_LABEL_PINK, NULL},
- {N_("/_Label/SkyBlue"), NULL, summary_set_label, MSG_LABEL_SKYBLUE, NULL},
- {N_("/_Label/Blue"), NULL, summary_set_label, MSG_LABEL_BLUE, NULL},
- {N_("/_Label/Green"), NULL, summary_set_label, MSG_LABEL_GREEN, NULL},
- {N_("/_Label/Brown"), NULL, summary_set_label, MSG_LABEL_BROWN, NULL},
-
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
{N_("/Repl_y to sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/Select _all"), NULL, summary_select_all, 0, NULL}
};
+#define LABEL_COLORS_ELEMS labelcolors_get_color_count()
+
+static void label_menu_item_activate_cb(GtkWidget *widget, gpointer data)
+{
+ guint color = GPOINTER_TO_UINT(data);
+ SummaryView *view = gtk_object_get_data(GTK_OBJECT(widget), "view");
+
+ g_return_if_fail(view);
+
+ /* "dont_toggle" state set? */
+ if (gtk_object_get_data(GTK_OBJECT(view->label_menu), "dont_toggle"))
+ return;
+
+ summary_set_label(view, color, NULL);
+}
+
+/* summary_set_label_color() - labelcolor parameter is the color *flag*
+ * for the messsage; not the color index */
void summary_set_label_color(GtkCTree *ctree, GtkCTreeNode *node,
guint labelcolor)
{
- GdkColor color;
- GtkStyle *style, *prev_style, *ctree_style;
- MsgInfo *msginfo;
-
- ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
-
- prev_style = gtk_ctree_node_get_row_style(ctree, node);
-
- if (!prev_style)
- prev_style = ctree_style;
-
- style = gtk_style_copy(prev_style);
-
- switch (labelcolor) {
- case MSG_LABEL_ORANGE:
- color.red = 0xffff;
- color.green = (0x99<<8);
- color.blue = 0x0;
- break;
- case MSG_LABEL_RED:
- color.red = 0xffff;
- color.green = color.blue = 0x0;
- break;
- case MSG_LABEL_PINK:
- color.red = 0xffff;
- color.green = (0x66<<8);
- color.blue = 0xffff;
- break;
- case MSG_LABEL_SKYBLUE:
- color.red = 0x0;
- color.green = (0xcc<<8);
- color.blue = 0xffff;
- break;
- case MSG_LABEL_BLUE:
- color.red = 0x0;
- color.green = 0x0;
- color.blue = 0xffff;
- break;
- case MSG_LABEL_GREEN:
- color.red = 0x0;
- color.green = (0x99<<8);
- color.blue = 0x0;
- break;
- case MSG_LABEL_BROWN:
- color.red = (0x66<<8);
- color.green = (0x33<<8);
- color.blue = (0x33<<8);
- break;
- case MSG_LABEL_NONE:
- default:
- labelcolor = MSG_LABEL_NONE;
- color.red = ctree_style->fg[GTK_STATE_NORMAL].red;
- color.green = ctree_style->fg[GTK_STATE_NORMAL].green;
- color.blue = ctree_style->fg[GTK_STATE_NORMAL].blue;
- style->fg[GTK_STATE_NORMAL] = color;
-
- color.red = ctree_style->fg[GTK_STATE_SELECTED].red;
- color.green = ctree_style->fg[GTK_STATE_SELECTED].green;
- color.blue = ctree_style->fg[GTK_STATE_SELECTED].blue;
- style->fg[GTK_STATE_SELECTED] = color;
- gtk_ctree_node_set_row_style(ctree, node, style);
- break;
- }
-
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
-
- MSG_UNSET_FLAGS(msginfo->flags, MSG_LABEL);
- MSG_SET_FLAGS(msginfo->flags, labelcolor);
-
- if ( style ) {
- style->fg[GTK_STATE_NORMAL] = color;
- style->fg[GTK_STATE_SELECTED] = color;
- gtk_ctree_node_set_row_style(ctree, node, style);
- }
+ GdkColor color;
+ GtkStyle *style, *prev_style, *ctree_style;
+ MsgInfo *msginfo;
+ gint color_index;
+
+ color_index = labelcolor == 0 ? -1 : (gint) labelcolor - 1;
+
+ ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
+
+ prev_style = gtk_ctree_node_get_row_style(ctree, node);
+
+ if (!prev_style)
+ prev_style = ctree_style;
+
+ style = gtk_style_copy(prev_style);
+
+ if (color_index < 0 || color_index >= LABEL_COLORS_ELEMS) {
+ color_index = 0;
+ color.red = ctree_style->fg[GTK_STATE_NORMAL].red;
+ color.green = ctree_style->fg[GTK_STATE_NORMAL].green;
+ color.blue = ctree_style->fg[GTK_STATE_NORMAL].blue;
+ style->fg[GTK_STATE_NORMAL] = color;
+
+ color.red = ctree_style->fg[GTK_STATE_SELECTED].red;
+ color.green = ctree_style->fg[GTK_STATE_SELECTED].green;
+ color.blue = ctree_style->fg[GTK_STATE_SELECTED].blue;
+ style->fg[GTK_STATE_SELECTED] = color;
+ gtk_ctree_node_set_row_style(ctree, node, style);
+ }
+ else {
+ color = labelcolors_get_color(color_index);
+ }
+
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LABEL);
+ MSG_SET_LABEL_VALUE(msginfo->flags, labelcolor);
+
+ if ( style ) {
+ style->fg[GTK_STATE_NORMAL] = color;
+ style->fg[GTK_STATE_SELECTED] = color;
+ gtk_ctree_node_set_row_style(ctree, node, style);
+ }
}
void summary_set_label(SummaryView *summaryview, guint labelcolor, GtkWidget *widget)
{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCList *clist = GTK_CLIST(summaryview->ctree);
- GList *cur;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCList *clist = GTK_CLIST(summaryview->ctree);
+ GList *cur;
- for (cur = clist->selection; cur != NULL; cur = cur->next)
- summary_set_label_color(ctree, GTK_CTREE_NODE(cur->data), labelcolor);
+ for (cur = clist->selection; cur != NULL; cur = cur->next)
+ summary_set_label_color(ctree, GTK_CTREE_NODE(cur->data), labelcolor);
+}
+
+static void label_menu_item_activate_item_cb(GtkMenuItem *label_menu_item, gpointer data)
+{
+ SummaryView *summaryview;
+ GtkMenuShell *label_menu;
+ GtkCheckMenuItem **items;
+ int n;
+ GList *cur, *sel;
+
+ summaryview = (SummaryView *) data;
+ g_return_if_fail(summaryview);
+ if (NULL == (sel = GTK_CLIST(summaryview->ctree)->selection))
+ return;
+
+ label_menu = GTK_MENU_SHELL(summaryview->label_menu);
+ g_return_if_fail(label_menu);
+
+ items = alloca( (LABEL_COLORS_ELEMS + 1) * sizeof(GtkWidget *));
+ g_return_if_fail(items);
+
+ /* NOTE: don't return prematurely because we set the "dont_toggle" state
+ * for check menu items */
+ gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle", GINT_TO_POINTER(1));
+
+ /* clear items. get item pointers. */
+ for (n = 0, cur = label_menu->children; cur != NULL; cur = cur->next) {
+ if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
+ gtk_check_menu_item_set_state(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
+ items[n] = GTK_CHECK_MENU_ITEM(cur->data);
+ n++;
+ }
+ }
+
+ if (n == (LABEL_COLORS_ELEMS + 1)) {
+ /* iterate all messages and set the state of the appropriate items */
+ for (; sel != NULL; sel = sel->next) {
+ MsgInfo *msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(sel->data));
+ gint menu_item;
+ if (msginfo) {
+ menu_item = MSG_GET_LABEL_VALUE(msginfo->flags);
+ if (!items[menu_item]->active)
+ gtk_check_menu_item_set_state(items[menu_item], TRUE);
+ }
+ }
+ }
+ else
+ g_warning("invalid number of color elements (%d)\n", n);
+
+ /* reset "dont_toggle" state */
+ gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle", GINT_TO_POINTER(0));
+}
+
+static void summary_create_label_menu(SummaryView *summaryview)
+{
+ const gint LABEL_MENU_POS = 5;
+ GtkWidget *label_menu_item;
+ GtkWidget *label_menu;
+ GtkWidget *item;
+ gint i;
+
+ label_menu_item = gtk_menu_item_new_with_label(_("Label"));
+ gtk_menu_insert(GTK_MENU(summaryview->popupmenu), label_menu_item, LABEL_MENU_POS);
+ gtk_signal_connect(GTK_OBJECT(label_menu_item), "activate",
+ GTK_SIGNAL_FUNC(label_menu_item_activate_item_cb), summaryview);
+
+ gtk_widget_show(label_menu_item);
+ summaryview->label_menu_item = label_menu_item;
+
+ label_menu = gtk_menu_new();
+
+ /* create sub items. for the menu item activation callback we pass the
+ * index of label_colors[] as data parameter. for the None color we pass
+ * an invalid (high) value. also we attach a data pointer so we can
+ * always get back the SummaryView pointer. */
+
+ item = gtk_check_menu_item_new_with_label(_("None"));
+ gtk_menu_append(GTK_MENU(label_menu), item);
+ gtk_signal_connect(GTK_OBJECT(item), "activate",
+ GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
+ GUINT_TO_POINTER(0));
+ gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);
+ gtk_widget_show(item);
+
+ item = gtk_menu_item_new();
+ gtk_menu_append(GTK_MENU(label_menu), item);
+ gtk_widget_show(item);
+
+ /* create pixmap/label menu items */
+ for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
+ item = labelcolors_create_check_color_menu_item(i);
+ gtk_menu_append(GTK_MENU(label_menu), item);
+ gtk_signal_connect(GTK_OBJECT(item), "activate",
+ GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
+ GUINT_TO_POINTER(i + 1));
+ gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);
+ gtk_widget_show(item);
+ }
+
+ gtk_widget_show(label_menu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menu_item), label_menu);
+ summaryview->label_menu = label_menu;
}
SummaryView *summary_create(void)
summary_clear_list(summaryview);
summary_set_menu_sensitive(summaryview);
+ summary_create_label_menu(summaryview);
+
}
GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
- GSList *mlist = NULL;
- gchar *buf;
+ GSList *mlist = NULL; gchar *buf;
gboolean is_refresh;
guint prev_msgnum = 0;
GtkCTreeNode *selected_node = summaryview->folderview->selected;
is_refresh = (!prefs_common.open_inbox_on_inc &&
item == summaryview->folder_item) ? TRUE : FALSE;
+
if (is_refresh) {
prev_msgnum = summary_get_current_msgnum(summaryview);
if (prev_msgnum < 1)
summary_write_cache(summaryview);
else
return FALSE;
- } else
+ }
+ else if (!summaryview->filtering_happened) {
summary_write_cache(summaryview);
+ }
+
+ summaryview->filtering_happened = FALSE;
summaryview->folderview->opened = selected_node;
(summaryview->mainwin, summaryview->selected ? TRUE : FALSE);
debug_print("\n");
- STATUSBAR_PUSH(summaryview->mainwin, _("done."));
+ STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
main_window_cursor_normal(summaryview->mainwin);
menu_set_sensitive(ifactory, "/Move...", TRUE);
menu_set_sensitive(ifactory, "/Copy...", TRUE);
}
+
+ gtk_widget_set_sensitive(summaryview->label_menu_item, TRUE);
menu_set_sensitive(ifactory, "/Execute", TRUE);
sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
menu_set_sensitive(ifactory, "/Mark/Mark as read", TRUE);
+#if MARK_ALL_READ
+ menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
+#endif
menu_set_sensitive(ifactory, "/Mark/Ignore thread", TRUE);
menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
- menu_set_sensitive(ifactory, "/Label", TRUE);
-
menu_set_sensitive(ifactory, "/Select all", TRUE);
if (summaryview->folder_item->folder->account)
if (node) {
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
- gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0);
+
+ /* BUGFIX: select next unread message
+ * REVERT: causes incorrect folder stats
+ * gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0);
+ */
if (summaryview->displayed == node)
summaryview->displayed = NULL;
if (!summaryview->selected)
return 0;
msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
+ if (!msginfo)
+ return 0;
return msginfo->msgnum;
}
parent = g_hash_table_lookup
(msgid_table, msginfo->inreplyto);
}
- if (parent == NULL && msginfo->subject) {
+ if (parent == NULL && msginfo->subject &&
+ g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
parent = subject_table_lookup
(subject_table, msginfo->subject);
}
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread--;
*/
- MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
}
}
summary_set_marks_func(ctree, node, summaryview);
- if ( MSG_GET_LABEL(msginfo->flags) )
- summary_set_label_color(ctree, node, (msginfo->flags & MSG_LABEL));
+ if (MSG_GET_LABEL(msginfo->flags))
+ summary_set_label_color(ctree, node, MSG_GET_LABEL_VALUE(msginfo->flags));
/* preserve previous node if the message is
duplicated */
*cur_msginfo->inreplyto) {
cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
}
- if (cur_parent == NULL && cur_msginfo->subject) {
+ if (cur_parent == NULL &&
+ cur_msginfo->subject &&
+ g_strncasecmp(cur_msginfo->subject,
+ "Re: ", 4) == 0) {
cur_parent = subject_table_lookup(subject_table, cur_msginfo->subject);
}
}
summary_set_marks_func(ctree, node, summaryview);
if ( MSG_GET_LABEL(msginfo->flags) )
- summary_set_label_color(ctree, node, (msginfo->flags & MSG_LABEL));
+ summary_set_label_color(ctree, node, MSG_GET_LABEL_VALUE(msginfo->flags));
if (msginfo->msgid && *msginfo->msgid &&
g_hash_table_lookup(msgid_table, msginfo->msgid)
gchar *buf;
gchar *cachefile, *markfile;
GSList * cur;
+ gint filemode = 0;
+ PrefsFolderItem *prefs;
if (!summaryview->folder_item || !summaryview->folder_item->path)
return -1;
}
if (change_file_mode_rw(fps.cache_fp, cachefile) < 0)
FILE_OP_ERROR(cachefile, "chmod");
+
+ prefs = summaryview->folder_item->prefs;
+ if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+ /* for cache file */
+ filemode = prefs->folder_chmod;
+ if (filemode & S_IRGRP) filemode |= S_IWGRP;
+ if (filemode & S_IROTH) filemode |= S_IWOTH;
+#if HAVE_FCHMOD
+ fchmod(fileno(fps.cache_fp), filemode);
+#else
+ chmod(cachefile, filemode);
+#endif
+ }
+
g_free(cachefile);
markfile = folder_item_get_mark_file(summaryview->folder_item);
}
if (change_file_mode_rw(fps.mark_fp, markfile) < 0)
FILE_OP_ERROR(markfile, "chmod");
+ if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+#if HAVE_FCHMOD
+ fchmod(fileno(fps.mark_fp), filemode);
+#else
+ chmod(markfile, filemode);
+#endif
+ }
+
g_free(markfile);
buf = g_strdup_printf(_("Writing summary cache (%s)..."),
Xalloca(from, strlen(msginfo->from) + 1, return);
strcpy(from, msginfo->from);
extract_address(from);
- if (account_find_mail_from_address(from)) {
+ if (account_find_from_address(from)) {
g_free(to);
to = g_strconcat("-->", msginfo->to, NULL);
text[S_COL_FROM] = to;
Xalloca(from, strlen(msginfo->from) + 1, return);
strcpy(from, msginfo->from);
extract_address(from);
- count = complete_address(from);
- if (count > 1) {
- g_free(from_name);
- from = get_complete_address(1);
- from_name = procheader_get_fromname(from);
- g_free(from);
- text[S_COL_FROM] = from_name;
+ if (*from) {
+ count = complete_address(from);
+ if (count > 1) {
+ g_free(from_name);
+ from = get_complete_address(1);
+ from_name = procheader_get_fromname(from);
+ g_free(from);
+ text[S_COL_FROM] = from_name;
+ }
}
}
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread--;
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
CHANGE_FLAGS(msginfo);
-
summary_set_row_marks(summaryview, row);
gtk_clist_thaw(GTK_CLIST(ctree));
summary_status_show(summaryview);
else if ((global_scoring ||
summaryview->folder_item->prefs->scoring) &&
(msginfo->score >= summaryview->important_score) &&
- ((msginfo->flags &
- (MSG_MARKED | MSG_MOVE | MSG_COPY)) == 0)) {
+ (MSG_IS_MARKED(msginfo->flags) || MSG_IS_MOVE(msginfo->flags) || MSG_IS_COPY(msginfo->flags))) {
gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
gtk_ctree_node_set_foreground(ctree, row,
&summaryview->color_important);
summaryview->moved--;
if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED | MSG_MOVE | MSG_COPY);
- MSG_SET_FLAGS(msginfo->flags, MSG_MARKED);
-
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
+ MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
CHANGE_FLAGS(msginfo);
-
summary_set_row_marks(summaryview, row);
debug_print(_("Message %d is marked\n"), msginfo->msgnum);
}
summaryview->unread--;
if (MSG_IS_NEW(msginfo->flags) ||
MSG_IS_UNREAD(msginfo->flags)) {
- MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
CHANGE_FLAGS(msginfo);
-
summary_set_row_marks(summaryview, row);
debug_print(_("Message %d is marked as read\n"),
msginfo->msgnum);
summary_status_show(summaryview);
}
+#if MARK_ALL_READ
+static void summary_mark_all_read(SummaryView *summaryview)
+{
+ summary_select_all(summaryview);
+ summary_mark_as_read(summaryview);
+ summary_unselect_all(summaryview);
+}
+#endif
+
static void summary_mark_row_as_unread(SummaryView *summaryview,
GtkCTreeNode *row)
{
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags)) {
msginfo->to_folder = NULL;
- MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
summaryview->deleted--;
}
- MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
if (!MSG_IS_UNREAD(msginfo->flags)) {
- MSG_SET_FLAGS(msginfo->flags, MSG_UNREAD);
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
unreadxpm, unreadxpmmask);
summaryview->unread++;
summaryview->moved--;
if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- MSG_UNSET_FLAGS(msginfo->flags,
- MSG_MARKED |
- MSG_MOVE |
- MSG_COPY);
- MSG_SET_FLAGS(msginfo->flags, MSG_DELETED);
-
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
+ MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
CHANGE_FLAGS(msginfo);
-
summaryview->deleted++;
if (!prefs_common.immediate_exec)
summaryview->moved--;
if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- MSG_UNSET_FLAGS(msginfo->flags,
- MSG_MARKED |
- MSG_DELETED |
- MSG_MOVE |
- MSG_COPY);
-
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+ MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
CHANGE_FLAGS(msginfo);
-
summary_set_row_marks(summaryview, row);
debug_print(_("Message %s/%d is unmarked\n"),
msginfo->to_folder = to_folder;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
- MSG_UNSET_FLAGS(msginfo->flags,
- MSG_MARKED | MSG_DELETED | MSG_COPY);
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+ MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
if (!MSG_IS_MOVE(msginfo->flags)) {
- MSG_SET_FLAGS(msginfo->flags, MSG_MOVE);
+ MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
summaryview->moved++;
}
-
if (!prefs_common.immediate_exec)
summary_set_row_marks(summaryview, row);
msginfo->to_folder = to_folder;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
- MSG_UNSET_FLAGS(msginfo->flags,
- MSG_MARKED | MSG_DELETED | MSG_MOVE);
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+ MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
if (!MSG_IS_COPY(msginfo->flags)) {
- MSG_SET_FLAGS(msginfo->flags, MSG_COPY);
+ MSG_SET_TMP_FLAGS(msginfo->flags, MSG_COPY);
summaryview->copied++;
}
-
if (!prefs_common.immediate_exec)
summary_set_row_marks(summaryview, row);
(ctree, GTK_CTREE_NODE(cur->data));
if (msginfo) procmsg_print_message(msginfo, cmdline);
}
-
+
g_free(cmdline);
}
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
- MSG_UNSET_FLAGS(msginfo->flags, MSG_COPY);
-
+ MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
summary_set_row_marks(summaryview, node);
}
}
for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo = cur->data;
- MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
}
folder_item_move_msgs_with_dest(trash, summaryview->mlist);
if(msginfo->inreplyto) {
parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
}
- if (parent == NULL && msginfo->subject) {
+ if (parent == NULL && msginfo->subject &&
+ g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
parent = subject_table_lookup(subject_table, msginfo->subject);
}
compose_new_with_recipient
(ac, summaryview->folder_item->path);
else
- compose_new(ac);
+ compose_new_with_folderitem(ac, summaryview->folder_item);
} else
compose_new(NULL);
return;
switch (column) {
case S_COL_MARK:
if (MSG_IS_MARKED(msginfo->flags)) {
- MSG_UNSET_FLAGS(msginfo->flags, MSG_MARKED);
-
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
CHANGE_FLAGS(msginfo);
-
summary_set_row_marks(summaryview, row);
} else
summary_mark_row(summaryview, row);
guint action,
GtkWidget *widget_)
{
- GtkWidget *submenu;
- GList *groups, *tmp;
+ const gint ADD_SENDER_TO_ADDRESSBOOK_MENU_POS = 13;
+ GtkWidget *submenu;
+ GList *groups, *tmp;
GtkMenuShell *menushell;
- GtkWidget *menu;
- GtkWidget *menuitem;
- GList *child;
- gboolean found = FALSE;
- MsgInfo *msginfo;
- gchar *from_address;
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ GList *child;
+ gboolean found = FALSE;
+ MsgInfo *msginfo;
+ gchar *from_address;
menushell = GTK_MENU_SHELL(summaryview->popupmenu);
g_return_if_fail(menushell != NULL);
if (!found) {
submenu = gtk_menu_item_new_with_label(_("Add sender to address book"));
gtk_object_set_data(GTK_OBJECT(submenu), "contacts", (gpointer)1);
- gtk_menu_insert(GTK_MENU(summaryview->popupmenu), submenu, 12);
+ gtk_menu_insert(GTK_MENU(summaryview->popupmenu), submenu, ADD_SENDER_TO_ADDRESSBOOK_MENU_POS);
gtk_widget_show(submenu);
}
else {
summaryview->newmsgs--;
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread--;
- MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
CHANGE_FLAGS(msginfo);
summaryview->newmsgs++;
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread++;
- MSG_UNSET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
CHANGE_FLAGS(msginfo);
projects / claws.git / blobdiff