/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistributte it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <regex.h>
#include "intl.h"
#include "main.h"
#include "imap.h"
#include "addressbook.h"
#include "addr_compl.h"
-#include "scoring.h"
-#include "prefs_folder_item.h"
+#include "folder_item_prefs.h"
#include "filtering.h"
#include "string_match.h"
#include "toolbar.h"
#include "matcher.h"
#include "matcher_parser.h"
#include "hooks.h"
+#include "description_window.h"
#define SUMMARY_COL_MARK_WIDTH 10
-#define SUMMARY_COL_UNREAD_WIDTH 13
+#define SUMMARY_COL_STATUS_WIDTH 13
#define SUMMARY_COL_LOCKED_WIDTH 13
#define SUMMARY_COL_MIME_WIDTH 11
-static GdkFont *boldfont;
-static GdkFont *smallfont;
static GtkStyle *bold_style;
static GtkStyle *bold_marked_style;
static GdkBitmap *keyxpmmask;
static GdkPixmap *clipkeyxpm;
static GdkBitmap *clipkeyxpmmask;
+static GdkPixmap *gpgsignedxpm;
+static GdkBitmap *gpgsignedxpmmask;
static void summary_free_msginfo_func (GtkCTree *ctree,
GtkCTreeNode *node,
GtkCTreeNode *row);
static void summary_lock_row (SummaryView *summaryview,
GtkCTreeNode *row);
+static void summary_unlock_row (SummaryView *summaryview,
+ GtkCTreeNode *row);
static void summary_mark_row_as_read (SummaryView *summaryview,
GtkCTreeNode *row);
static void summary_mark_row_as_unread (SummaryView *summaryview,
gpointer data);
static void summary_thread_init (SummaryView *summaryview);
-static void summary_ignore_thread (SummaryView *summaryview);
-static void summary_unignore_thread (SummaryView *summaryview);
+static void summary_ignore_thread (SummaryView *summaryview);
+static void summary_unignore_thread (SummaryView *summaryview);
static void summary_unthread_for_exec (SummaryView *summaryview);
static void summary_unthread_for_exec_func (GtkCTree *ctree,
static GtkWidget *summary_ctree_create (SummaryView *summaryview);
/* callback functions */
-static void summary_toggle_pressed (GtkWidget *eventbox,
+static gint summary_toggle_pressed (GtkWidget *eventbox,
GdkEventButton *event,
SummaryView *summaryview);
-static void summary_button_pressed (GtkWidget *ctree,
+static gboolean summary_button_pressed (GtkWidget *ctree,
GdkEventButton *event,
SummaryView *summaryview);
-static void summary_button_released (GtkWidget *ctree,
+static gboolean summary_button_released (GtkWidget *ctree,
GdkEventButton *event,
SummaryView *summaryview);
-static void summary_key_pressed (GtkWidget *ctree,
+static gboolean summary_key_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
-static void summary_searchbar_pressed (GtkWidget *ctree,
+static gboolean summary_searchbar_pressed
+ (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
+static gboolean summary_searchbar_focus_evt (GtkWidget *ctree,
+ GdkEventFocus *event,
+ SummaryView *summaryview);
static void summary_searchtype_changed (GtkMenuItem *widget,
gpointer data);
static void summary_open_row (GtkSCTree *sctree,
static void summary_create_filter_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
+static void summary_create_processing_cb(SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget);
static void summary_mark_clicked (GtkWidget *button,
SummaryView *summaryview);
-static void summary_unread_clicked (GtkWidget *button,
+static void summary_status_clicked (GtkWidget *button,
SummaryView *summaryview);
static void summary_mime_clicked (GtkWidget *button,
SummaryView *summaryview);
static gint summary_cmp_by_mark (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_unread (GtkCList *clist,
+static gint summary_cmp_by_status (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
static gint summary_cmp_by_mime (GtkCList *clist,
static gint summary_cmp_by_from (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_to (GtkCList *clist,
- gconstpointer ptr1,
- gconstpointer ptr2);
-static gint summary_cmp_by_subject (GtkCList *clist,
- gconstpointer ptr1,
- gconstpointer ptr2);
static gint summary_cmp_by_simplified_subject
- (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2);
+ (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
static gint summary_cmp_by_score (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_locked (GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2);
static gint summary_cmp_by_label (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static gint summary_cmp_by_to (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
+static gint summary_cmp_by_subject (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
+static gint summary_cmp_by_locked (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
static void news_flag_crosspost (MsgInfo *msginfo);
static void tog_searchbar_cb (GtkWidget *w,
gpointer data);
-static void summary_update_msg (gpointer source, gpointer data);
+static void summary_find_answers (SummaryView *summaryview,
+ MsgInfo *msg);
+
+static gboolean summary_update_msg (gpointer source, gpointer data);
GtkTargetEntry summary_drag_types[1] =
{
static GtkItemFactoryEntry summary_popup_entries[] =
{
- {N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
+ {N_("/_Reply"), "<control>R", summary_reply_cb, COMPOSE_REPLY, NULL},
{N_("/Repl_y to"), NULL, NULL, 0, "<Branch>"},
- {N_("/Repl_y to/_all"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ {N_("/Repl_y to/_all"), "<shift><control>R", summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
{N_("/Repl_y to/_sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/Repl_y to/mailing _list"),
- NULL, summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+ "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
{N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
+ {N_("/_Forward"), "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD, NULL},
{N_("/Redirect"), NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/M_ove..."), NULL, summary_move_to, 0, NULL},
- {N_("/_Copy..."), NULL, summary_copy_to, 0, NULL},
- {N_("/_Delete"), NULL, summary_delete, 0, NULL},
+ {N_("/M_ove..."), "<control>O", summary_move_to, 0, NULL},
+ {N_("/_Copy..."), "<shift><control>O", summary_copy_to, 0, NULL},
+ {N_("/_Delete"), "<control>D", summary_delete, 0, NULL},
{N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
- {N_("/E_xecute"), NULL, summary_execute_cb, 0, NULL},
+ {N_("/E_xecute"), "X", summary_execute_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
- {N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL},
+ {N_("/_Mark/_Mark"), "<shift>asterisk", summary_mark, 0, NULL},
+ {N_("/_Mark/_Unmark"), "U", summary_unmark, 0, NULL},
{N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL},
+ {N_("/_Mark/Mark as unr_ead"), "<shift>exclam", summary_mark_as_unread, 0, NULL},
{N_("/_Mark/Mark as rea_d"), NULL, summary_mark_as_read, 0, NULL},
{N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
{N_("/_Mark/Unignore thread"), NULL, summary_unignore_thread, 0, NULL},
+ {N_("/_Mark/Lock"), NULL, summary_msgs_lock, 0, NULL},
+ {N_("/_Mark/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
NULL, summary_create_filter_cb, FILTER_BY_TO, NULL},
{N_("/Create f_ilter rule/by _Subject"),
NULL, summary_create_filter_cb, FILTER_BY_SUBJECT, NULL},
+ {N_("/Create processing rule"), NULL, NULL, 0, "<Branch>"},
+ {N_("/Create processing rule/_Automatically"),
+ NULL, summary_create_processing_cb, FILTER_BY_AUTO, NULL},
+ {N_("/Create processing rule/by _From"),
+ NULL, summary_create_processing_cb, FILTER_BY_FROM, NULL},
+ {N_("/Create processing rule/by _To"),
+ NULL, summary_create_processing_cb, FILTER_BY_TO, NULL},
+ {N_("/Create processing rule/by _Subject"),
+ NULL, summary_create_processing_cb, FILTER_BY_SUBJECT, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/Open in new _window"),
- NULL, summary_open_msg, 0, NULL},
- {N_("/_View/_Source"), NULL, summary_view_source, 0, NULL},
- {N_("/_View/All _header"), NULL, summary_show_all_header_cb, 0, "<ToggleItem>"},
+ "<control><alt>N", summary_open_msg, 0, NULL},
+ {N_("/_View/_Source"), "<control>U", summary_view_source, 0, NULL},
+ {N_("/_View/All _header"), "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Save as..."), NULL, summary_save_as, 0, NULL},
+ {N_("/_Save as..."), "<control>S", summary_save_as, 0, NULL},
{N_("/_Print..."), NULL, summary_print, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Select _all"), NULL, summary_select_all, 0, NULL},
+ {N_("/Select _all"), "<control>A", summary_select_all, 0, NULL},
{N_("/Select t_hread"), NULL, summary_select_thread, 0, NULL}
-};
+}; /* see also list in menu_connect_identical_items() in menu.c if this changes */
static const gchar *const col_label[N_SUMMARY_COLS] = {
N_("M"), /* S_COL_MARK */
- N_("U"), /* S_COL_UNREAD */
+ N_("S"), /* S_COL_STATUS */
"", /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("From"), /* S_COL_FROM */
N_("L") /* S_COL_LOCKED */
};
+/*
+ * Strings describing how to use Extended Search
+ *
+ * When adding new lines, remember to put 2 strings for each line
+ */
+static gchar *search_descr_strings[] = {
+ "a", N_("all messages"),
+ "ag #", N_("messages whose age is greater than #"),
+ "al #", N_("messages whose age is less than #"),
+ "b S", N_("messages which contain S in the message body"),
+ "B S", N_("messages which contain S in the whole message"),
+ "c S", N_("messages carbon-copied to S"),
+ "C S", N_("message is either to: or cc: to S"),
+ "D", N_("deleted messages"), /** how I can filter deleted messages **/
+ "e S", N_("messages which contain S in the Sender field"),
+ "E S", N_("true if execute \"S\" succeeds"),
+ "f S", N_("messages originating from user S"),
+ "F", N_("forwarded messages"),
+ "h S", N_("messages which contain header S"),
+ "i S", N_("messages which contain S in Message-Id header"),
+ "I S", N_("messages which contain S in inreplyto header"),
+ "L", N_("locked messages"),
+ "n S", N_("messages which are in newsgroup S"),
+ "N", N_("new messages"),
+ "O", N_("old messages"),
+ "r", N_("messages which have been replied to"),
+ "R", N_("read messages"),
+ "s S", N_("messages which contain S in subject"),
+ "se #", N_("messages whose score is equal to #"),
+ "sg #", N_("messages whose score is greater than #"),
+ "sl #", N_("messages whose score is lower than #"),
+ "Se #", N_("messages whose size is equal to #"),
+ "Sg #", N_("messages whose size is greater than #"),
+ "Ss #", N_("messages whose size is smaller than #"),
+ "t S", N_("messages which have been sent to S"),
+ "T", N_("marked messages"),
+ "U", N_("unread messages"),
+ "x S", N_("messages which contain S in References header"),
+ "X cmd", N_("messages returning 0 when passed to command"),
+ "y S", N_("messages which contain S in X-Label header"),
+ "", "" ,
+ "&", N_("logical AND operator"),
+ "|", N_("logical OR operator"),
+ "! or ~", N_("logical NOT operator"),
+ "%", N_("case sensitive search"),
+ NULL, NULL
+};
+
+static DescriptionWindow search_descr = {
+ NULL,
+ 2,
+ N_("Extended Search symbols"),
+ search_descr_strings
+};
+
+static void search_description_cb(GtkWidget *widget)
+{
+ description_window_create(&search_descr);
+};
+
SummaryView *summary_create(void)
{
SummaryView *summaryview;
GtkWidget *search_type_opt;
GtkWidget *search_type;
GtkWidget *search_string;
+ GtkWidget *search_hbbox;
+ GtkWidget *search_description;
GtkWidget *menuitem;
GtkWidget *toggle_search;
GtkTooltips *search_tip;
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
- vbox = gtk_vbox_new(FALSE, 3);
+#define SUMMARY_VBOX_SPACING 3
+ vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
/* create status label */
hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
- gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
- GTK_SIGNAL_FUNC(summary_toggle_pressed),
- summaryview);
+ g_signal_connect(G_OBJECT(toggle_eventbox), "button_press_event",
+ G_CALLBACK(summary_toggle_pressed),
+ summaryview);
statlabel_msgs = gtk_label_new("");
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
- gtk_widget_set_usize(vbox,
+ gtk_widget_set_size_request(vbox,
prefs_common.summaryview_width,
prefs_common.summaryview_height);
search_type = gtk_menu_new();
MENUITEM_ADD (search_type, menuitem, _("Subject"), S_SEARCH_SUBJECT);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_searchtype_changed),
- summaryview);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(summary_searchtype_changed),
+ summaryview);
MENUITEM_ADD (search_type, menuitem, _("From"), S_SEARCH_FROM);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_searchtype_changed),
- summaryview);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(summary_searchtype_changed),
+ summaryview);
MENUITEM_ADD (search_type, menuitem, _("To"), S_SEARCH_TO);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_searchtype_changed),
- summaryview);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(summary_searchtype_changed),
+ summaryview);
MENUITEM_ADD (search_type, menuitem, _("Extended"), S_SEARCH_EXTENDED);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_searchtype_changed),
- summaryview);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(summary_searchtype_changed),
+ summaryview);
gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
+
+ gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), prefs_common.summary_quicksearch_type);
+
gtk_widget_show(search_type);
search_string = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox_search), search_string, FALSE, FALSE, 2);
+ gtkut_button_set_create(&search_hbbox, &search_description, _("Extended Symbols"),
+ NULL, NULL, NULL, NULL);
+ g_signal_connect(G_OBJECT(search_description), "clicked",
+ G_CALLBACK(search_description_cb), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);
+
gtk_widget_show(search_string);
gtk_widget_show(hbox_search);
- gtk_signal_connect(GTK_OBJECT(search_string), "key_press_event",
- GTK_SIGNAL_FUNC(summary_searchbar_pressed),
- summaryview);
+ g_signal_connect(G_OBJECT(search_string), "key_press_event",
+ G_CALLBACK(summary_searchbar_pressed),
+ summaryview);
+
+ g_signal_connect(G_OBJECT(search_string), "focus_in_event",
+ G_CALLBACK(summary_searchbar_focus_evt),
+ summaryview);
- gtk_signal_connect (GTK_OBJECT(toggle_search), "toggled",
- GTK_SIGNAL_FUNC(tog_searchbar_cb), hbox_search);
+ g_signal_connect(G_OBJECT(search_string), "focus_out_event",
+ G_CALLBACK(summary_searchbar_focus_evt),
+ summaryview);
+
+ g_signal_connect (G_OBJECT(toggle_search), "toggled",
+ G_CALLBACK(tog_searchbar_cb), summaryview);
/* create popup menu */
n_entries = sizeof(summary_popup_entries) /
summaryview->search_type_opt = search_type_opt;
summaryview->search_type = search_type;
summaryview->search_string = search_string;
+ summaryview->search_description = search_description;
summaryview->msginfo_update_callback_id =
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
+ summaryview->target_list = gtk_target_list_new(summary_drag_types, 1);
+
/* CLAWS: need this to get the SummaryView * from
* the CList */
gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview);
void summary_init(SummaryView *summaryview)
{
+ static GdkFont *boldfont = NULL;
+ static GdkFont *smallfont = NULL;
GtkStyle *style;
GtkWidget *pixmap;
+ gtk_widget_realize(summaryview->ctree);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
&markxpm, &markxpmmask);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
&clipkeyxpm, &clipkeyxpmmask);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
&keyxpm, &keyxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+ &gpgsignedxpm, &gpgsignedxpmmask);
if (!small_style) {
+ PangoFontDescription *font_desc = NULL;
+
small_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
- if (!smallfont)
- smallfont = gtkut_font_load(SMALL_FONT);
- small_style->font = smallfont;
+ if (SMALL_FONT)
+ font_desc = pango_font_description_from_string
+ (SMALL_FONT);
+ if (font_desc) {
+ if (small_style->font_desc)
+ pango_font_description_free(small_style->font_desc);
+ small_style->font_desc = font_desc;
+ }
small_marked_style = gtk_style_copy(small_style);
small_marked_style->fg[GTK_STATE_NORMAL] =
summaryview->color_marked;
summaryview->color_dim;
}
if (!bold_style) {
+ PangoFontDescription *font_desc = NULL;
bold_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
- if (!boldfont)
- boldfont = gtkut_font_load(BOLD_FONT);
- bold_style->font = boldfont;
+ if (BOLD_FONT)
+ font_desc = pango_font_description_from_string
+ (BOLD_FONT);
+ if (font_desc) {
+ if (bold_style->font_desc)
+ pango_font_description_free
+ (bold_style->font_desc);
+ bold_style->font_desc = font_desc;
+ }
bold_marked_style = gtk_style_copy(bold_style);
bold_marked_style->fg[GTK_STATE_NORMAL] =
summaryview->color_marked;
style = gtk_style_copy(gtk_widget_get_style
(summaryview->statlabel_folder));
-
gtk_widget_set_style(summaryview->statlabel_folder, style);
gtk_widget_set_style(summaryview->statlabel_select, style);
gtk_widget_set_style(summaryview->statlabel_msgs, style);
}
+#if 0
GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
GtkCTreeNode *current_node)
{
else
return best_node;
}
+#endif
#define CURRENTLY_DISPLAYED(m) \
( (m->msgnum == displayed_msgnum) \
guint selected_msgnum = 0;
guint displayed_msgnum = 0;
GSList *cur;
+ GSList *not_killed;
if (summary_is_locked(summaryview)) return FALSE;
summary_clear_list(summaryview);
summary_set_column_titles(summaryview);
- if (!is_refresh)
- messageview_clear(summaryview->messageview);
buf = NULL;
- if (!item || !item->path || !item->parent || item->no_select ||
- (item->folder->type == F_MH &&
- ((buf = folder_item_get_path(item)) == NULL ||
- change_dir(buf) < 0))) {
+ if (!item || !item->path || !item->parent || item->no_select) {
g_free(buf);
debug_print("empty folder\n\n");
summary_set_hide_read_msgs_menu(summaryview, FALSE);
- if (is_refresh)
- messageview_clear(summaryview->messageview);
summary_clear_all(summaryview);
summaryview->folder_item = item;
gtk_clist_thaw(GTK_CLIST(ctree));
}
g_free(buf);
+ if (!is_refresh)
+ messageview_clear(summaryview->messageview);
+
summaryview->folder_item = item;
item->opened = TRUE;
BY OTHER PROGRAMS TO THE FOLDER
*/
mlist = folder_item_get_msg_list(item);
-#if 0
- summary_processing(summaryview, mlist);
-#endif
- for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
- MsgInfo * msginfo = (MsgInfo *) cur->data;
-
- msginfo->score = score_message(global_scoring, msginfo);
- if (msginfo->score != MAX_SCORE &&
- msginfo->score != MIN_SCORE) {
- msginfo->score += score_message(item->prefs->scoring,
- msginfo);
- }
- }
if (summaryview->folder_item->hide_read_msgs) {
GSList *not_killed;
|| MSG_IS_LOCKED(msginfo->flags)
|| CURRENTLY_DISPLAYED(msginfo))
&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
if (strlen(gtk_entry_get_text(GTK_ENTRY(summaryview->search_string))) > 0) {
GSList *not_killed;
- gint search_type = GPOINTER_TO_INT(gtk_object_get_user_data(
+ gint search_type = GPOINTER_TO_INT(g_object_get_data(
GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
- GTK_MENU(summaryview->search_type))))));
- gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
+ GTK_MENU(summaryview->search_type)))), MENU_VAL_ID));
+ const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
gchar *searched_header = NULL;
MatcherList * tmp_list = NULL;
if (search_type == S_SEARCH_EXTENDED) {
- char *newstr;
+ char *newstr = NULL;
newstr = expand_search_string(search_string);
if (newstr) {
}
if (search_type != S_SEARCH_EXTENDED) {
if (searched_header && strcasestr(searched_header, search_string) != NULL)
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
} else {
- if (tmp_list != NULL && matcherlist_match(tmp_list, msginfo))
- not_killed = g_slist_append(not_killed, msginfo);
+ if ((tmp_list != NULL) && matcherlist_match(tmp_list, msginfo))
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
}
-
if (search_type == S_SEARCH_EXTENDED && tmp_list != NULL) {
matcherlist_free(tmp_list);
tmp_list = NULL;
g_slist_free(mlist);
mlist = not_killed;
}
-
+
+#if 0
if ((global_scoring || item->prefs->scoring)) {
GSList *not_killed;
gint kill_score;
MsgInfo * msginfo = (MsgInfo *) cur->data;
if (msginfo->score > kill_score)
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
g_slist_free(mlist);
mlist = not_killed;
}
+#endif
+ not_killed = NULL;
+ for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+
+ if (!msginfo->hidden)
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else
+ procmsg_msginfo_free(msginfo);
+ }
+ g_slist_free(mlist);
+ mlist = not_killed;
STATUSBAR_POP(summaryview->mainwin);
- /* set ctree and hash table from the msginfo list
- creating thread, and count the number of messages */
+ /* set ctree and hash table from the msginfo list, and
+ create the thread */
summary_set_ctree_from_list(summaryview, mlist);
g_slist_free(mlist);
}
} else {
/* select first unread message */
+#if 0
if (summaryview->sort_key == SORT_BY_SCORE)
node = summary_find_next_important_score(summaryview,
NULL);
else
+#endif
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_UNREAD, FALSE);
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
item->sort_type == SORT_DESCENDING
? 0 : GTK_CLIST(ctree)->rows - 1);
}
- if (prefs_common.open_unread_on_enter) {
+ if (prefs_common.open_unread_on_enter ||
+ prefs_common.always_show_msg) {
summary_unlock(summaryview);
- summary_select_node(summaryview, node, TRUE, TRUE);
+ summary_select_node(summaryview, node,
+ messageview_is_visible(summaryview->messageview),
+ TRUE);
summary_lock(summaryview);
} else
summary_select_node(summaryview, node, FALSE, TRUE);
}
+ summary_set_column_titles(summaryview);
summary_status_show(summaryview);
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
debug_print("\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
summaryview->display_msg = FALSE;
- summaryview->selected = NULL;
+ summaryview->selected = NULL;
summaryview->displayed = NULL;
- summaryview->newmsgs = summaryview->unread = 0;
- summaryview->messages = summaryview->total_size = 0;
- summaryview->deleted = summaryview->moved = 0;
- summaryview->copied = 0;
+ summaryview->total_size = 0;
+ summaryview->deleted = summaryview->moved = 0;
+ summaryview->copied = 0;
if (summaryview->msgid_table) {
g_hash_table_destroy(summaryview->msgid_table);
summaryview->msgid_table = NULL;
void summary_clear_all(SummaryView *summaryview)
{
+ messageview_clear(summaryview->messageview);
summary_clear_list(summaryview);
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
summary_status_show(summaryview);
}
return selection;
}
+GSList *summary_get_selected_msg_list(SummaryView *summaryview)
+{
+ GSList *mlist = NULL;
+ GList *cur;
+ MsgInfo *msginfo;
+
+ for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+ cur = cur->next) {
+ msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
+ mlist = g_slist_prepend(mlist, msginfo);
+ }
+
+ mlist = g_slist_reverse(mlist);
+
+ return mlist;
+}
+
+GSList *summary_get_msg_list(SummaryView *summaryview)
+{
+ GSList *mlist = NULL;
+ GtkCTree *ctree;
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+
+ ctree = GTK_CTREE(summaryview->ctree);
+
+ for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+ node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+ msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+ mlist = g_slist_prepend(mlist, msginfo);
+ }
+
+ mlist = g_slist_reverse(mlist);
+
+ return mlist;
+}
+
static void summary_set_menu_sensitive(SummaryView *summaryview)
{
GtkItemFactory *ifactory = summaryview->popupfactory;
- SummarySelection selection;
+ SensitiveCond state;
+ gboolean sensitive;
GtkWidget *menuitem;
- gboolean sens;
+ gint i;
+
+ static const struct {
+ gchar *const entry;
+ SensitiveCond cond;
+ } entry[] = {
+ {"/Reply" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Reply to" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Reply to/all" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Reply to/sender" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Reply to/mailing list" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Follow-up and reply to" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
+
+ {"/Forward" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+ {"/Redirect" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+
+ {"/Re-edit" , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+
+ {"/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+ {"/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+ {"/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
+ {"/Execute" , M_DELAY_EXEC},
+
+ {"/Mark" , M_TARGET_EXIST},
+ {"/Mark/Mark" , M_TARGET_EXIST},
+ {"/Mark/Unmark" , M_TARGET_EXIST},
+ {"/Mark/Mark as unread" , M_TARGET_EXIST},
+ {"/Mark/Mark all read" , M_TARGET_EXIST},
+ {"/Mark/Ignore thread" , M_TARGET_EXIST},
+ {"/Mark/Lock" , M_TARGET_EXIST},
+ {"/Mark/Unlock" , M_TARGET_EXIST},
+ {"/Color label" , M_TARGET_EXIST},
+
+ {"/Add sender to address book" , M_SINGLE_TARGET_EXIST},
+ {"/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ {"/Create processing rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+
+ {"/View" , M_SINGLE_TARGET_EXIST},
+ {"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
+ {"/View/Source" , M_SINGLE_TARGET_EXIST},
+ {"/View/All header" , M_SINGLE_TARGET_EXIST},
+
+ {"/Save as..." , M_TARGET_EXIST|M_UNLOCKED},
+ {"/Print..." , M_TARGET_EXIST|M_UNLOCKED},
+
+ {"/Select thread" , M_SINGLE_TARGET_EXIST},
+ {"/Select all" , M_TARGET_EXIST},
+
+ {NULL, 0}
+ };
- selection = summary_get_selection_type(summaryview);
main_window_set_menu_sensitive(summaryview->mainwin);
- if (selection == SUMMARY_NONE) {
- GtkWidget *submenu;
+ state = main_window_get_current_state(summaryview->mainwin);
- submenu = gtk_item_factory_get_widget
- (summaryview->popupfactory, "/Mark");
- menu_set_insensitive_all(GTK_MENU_SHELL(submenu));
- menu_set_insensitive_all
- (GTK_MENU_SHELL(summaryview->popupmenu));
- return;
+ for (i = 0; entry[i].entry != NULL; i++) {
+ sensitive = ((entry[i].cond & state) == entry[i].cond);
+ menu_set_sensitive(ifactory, entry[i].entry, sensitive);
}
- if (summaryview->folder_item->folder->type != F_NEWS)
- menu_set_sensitive(ifactory, "/Move...", TRUE);
- else
- menu_set_sensitive(ifactory, "/Move...", FALSE);
-
-#if 0
- menu_set_sensitive(ifactory, "/Delete", TRUE);
-#endif
- menu_set_sensitive(ifactory, "/Copy...", TRUE);
- menu_set_sensitive(ifactory, "/Execute", TRUE);
-
- menu_set_sensitive(ifactory, "/Mark", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Mark", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
-
- menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Mark as read", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Ignore thread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
-
- menu_set_sensitive(ifactory, "/Color label", TRUE);
-
- sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
- menu_set_sensitive(ifactory, "/Reply", sens);
- menu_set_sensitive(ifactory, "/Reply to", sens);
- menu_set_sensitive(ifactory, "/Reply to/all", sens);
- menu_set_sensitive(ifactory, "/Reply to/sender", sens);
- menu_set_sensitive(ifactory, "/Reply to/mailing list", sens);
- menu_set_sensitive(ifactory, "/Forward", TRUE);
- menu_set_sensitive(ifactory, "/Redirect", sens);
-
- menu_set_sensitive(ifactory, "/Add sender to address book", sens);
- menu_set_sensitive(ifactory, "/Create filter rule", sens);
-
- menu_set_sensitive(ifactory, "/View", sens);
- menu_set_sensitive(ifactory, "/View/Open in new window", sens);
- menu_set_sensitive(ifactory, "/View/Source", sens);
- menu_set_sensitive(ifactory, "/View/All header", sens);
- if (summaryview->folder_item->stype == F_OUTBOX ||
- summaryview->folder_item->stype == F_DRAFT ||
- summaryview->folder_item->stype == F_QUEUE)
- menu_set_sensitive(ifactory, "/Re-edit", sens);
- else
- menu_set_sensitive(ifactory, "/Re-edit", FALSE);
-
- menu_set_sensitive(ifactory, "/Save as...", TRUE);
- menu_set_sensitive(ifactory, "/Print...", TRUE);
-
- menu_set_sensitive(ifactory, "/Select all", TRUE);
- menu_set_sensitive(ifactory, "/Select thread", sens);
- if (summaryview->folder_item->folder->account)
- sens = summaryview->folder_item->folder->account->protocol
- == A_NNTP;
- else
- sens = FALSE;
- menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
- menu_set_sensitive(ifactory, "/Cancel a news message", sens);
- menu_set_sensitive(ifactory, "/Delete", !sens);
summary_lock(summaryview);
menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem),
- summaryview->messageview->textview->show_all_headers);
+ summaryview->messageview->mimeview->textview->show_all_headers);
summary_unlock(summaryview);
}
}
if (val == G_ALERTDEFAULT) {
- if (gtk_signal_n_emissions_by_name
- (GTK_OBJECT(ctree), "key_press_event") > 0)
- gtk_signal_emit_stop_by_name
- (GTK_OBJECT(ctree),
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
"key_press_event");
folderview_select_next_unread(summaryview->folderview);
return;
"Go to next folder?"),
_("Yes"), _("Search again"), _("No"));
if (val == G_ALERTDEFAULT) {
+#warning FIXME_GTK2
+#if 0
if (gtk_signal_n_emissions_by_name
(GTK_OBJECT(ctree), "key_press_event") > 0)
gtk_signal_emit_stop_by_name
(GTK_OBJECT(ctree),
"key_press_event");
folderview_select_next_unread(summaryview->folderview);
+#endif
return;
} else if (val == G_ALERTALTERNATE)
node = NULL;
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (!MSG_IS_DELETED(msginfo->flags)) break;
+ if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (!MSG_IS_DELETED(msginfo->flags)) break;
+ if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if ((msginfo->flags.perm_flags & flags) != 0) break;
+ if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
}
return node;
/* Find msg with matching flags but ignore messages with
ignore flags, if searching for new or unread messages */
if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) &&
- ((msginfo->flags.perm_flags & flags) != 0))
+ (msginfo && (msginfo->flags.perm_flags & flags) != 0))
break;
}
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (msginfo->msgnum == msgnum) break;
+ if (msginfo && msginfo->msgnum == msgnum) break;
}
return node;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_NEWS(msginfo->flags))
+ if (msginfo->folder && msginfo->folder->folder &&
+ msginfo->folder->folder->klass->type == F_NEWS)
news_flag_crosspost(msginfo);
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->newmsgs++;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked++;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
- summaryview->messages++;
summaryview->total_size += msginfo->size;
summary_set_row_marks(summaryview, node);
GtkCTreeNode *node;
MsgInfo *msginfo;
- summaryview->newmsgs = summaryview->unread =
- summaryview->messages = summaryview->total_size =
+ summaryview->total_size =
summaryview->deleted = summaryview->moved = summaryview->copied = 0;
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->newmsgs++;
- if (MSG_IS_UNREAD(msginfo->flags)&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked++;
summaryview->moved++;
if (MSG_IS_COPY(msginfo->flags))
summaryview->copied++;
- summaryview->messages++;
summaryview->total_size += msginfo->size;
}
}
guint n_selected = 0;
off_t sel_size = 0;
MsgInfo *msginfo;
+ gchar *name;
if (!summaryview->folder_item) {
- gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");
- gtk_label_set(GTK_LABEL(summaryview->statlabel_select), "");
- gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), "");
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), "");
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), "");
return;
}
msginfo = gtk_ctree_node_get_row_data
(GTK_CTREE(summaryview->ctree),
GTK_CTREE_NODE(cur->data));
- sel_size += msginfo->size;
- n_selected++;
+ if (!msginfo)
+ g_warning("summary_status_show(): msginfo == NULL\n");
+ else {
+ sel_size += msginfo->size;
+ n_selected++;
+ }
}
- if (summaryview->folder_item->folder->type == F_NEWS &&
- prefs_common.ng_abbrev_len < strlen(summaryview->folder_item->path)) {
- gchar *group;
- group = get_abbrev_newsgroup_name
- (g_basename(summaryview->folder_item->path), prefs_common.ng_abbrev_len);
- gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
- g_free(group);
- } else {
- gtk_label_set(GTK_LABEL(summaryview->statlabel_folder),
- summaryview->folder_item->path);
- }
+ name = folder_item_get_name(summaryview->folder_item);
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), name);
+ g_free(name);
if (summaryview->deleted)
del = g_strdup_printf(_("%d deleted"), summaryview->deleted);
str = g_strconcat(n_selected ? itos(n_selected) : "",
itstr, sel, spc, del, mv, cp, NULL);
- gtk_label_set(GTK_LABEL(summaryview->statlabel_select), str);
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), str);
g_free(str);
g_free(sel);
g_free(del);
g_free(cp);
g_free(itstr);
- if (FOLDER_IS_LOCAL(summaryview->folder_item->folder)) {
- str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
- summaryview->newmsgs,
- summaryview->unread,
- summaryview->messages,
+ str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
+
+ summaryview->folder_item->new_msgs,
+ summaryview->folder_item->unread_msgs,
+ summaryview->folder_item->total_msgs,
to_human_readable(summaryview->total_size));
- } else {
- str = g_strdup_printf(_("%d new, %d unread, %d total"),
- summaryview->newmsgs,
- summaryview->unread,
- summaryview->messages);
- }
- gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
}
static FolderSortKey sort_by[N_SUMMARY_COLS] = {
SORT_BY_MARK,
- SORT_BY_UNREAD,
+ SORT_BY_STATUS,
SORT_BY_MIME,
SORT_BY_SUBJECT,
SORT_BY_FROM,
type = summaryview->col_state[pos].type;
/* CLAWS: mime and unread are single char headers */
- single_char = (type == S_COL_MIME || type == S_COL_UNREAD);
+ single_char = (type == S_COL_MIME || type == S_COL_STATUS);
justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
}
if (type == S_COL_MIME) {
- label = gtk_pixmap_new(clipxpm, clipxpmmask);
+ label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
continue;
case SORT_BY_MARK:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
break;
- case SORT_BY_UNREAD:
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_unread;
+ case SORT_BY_STATUS:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_status;
break;
case SORT_BY_MIME:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
break;
case SORT_BY_FROM:
- if (summaryview->folder_item && summaryview->folder_item->stype != F_OUTBOX)
- cmp_func = (GtkCListCompareFunc) summary_cmp_by_from;
- else
- cmp_func = (GtkCListCompareFunc) summary_cmp_by_to;
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_from;
break;
case SORT_BY_SUBJECT:
if (summaryview->simplify_subject_preg)
case SORT_BY_SCORE:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
break;
- case SORT_BY_LOCKED:
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
- break;
case SORT_BY_LABEL:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
break;
+ case SORT_BY_TO:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_to;
+ break;
+ case SORT_BY_LOCKED:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
+ break;
case SORT_BY_NONE:
- cmp_func = NULL;
- return;
+ break;
default:
return;
}
summary_set_column_titles(summaryview);
summary_set_menu_sensitive(summaryview);
+
+ /* allow fallback to don't sort */
+ if (summaryview->sort_key == SORT_BY_NONE)
+ return;
+
if(cmp_func != NULL) {
debug_print("Sorting summary...");
STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
g_node_destroy(root);
- folder_update_items_when_required(FALSE);
-
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
-
- mlist = g_slist_reverse(mlist);
+ cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
msginfo->subject,
node);
}
- mlist = g_slist_reverse(mlist);
+ mlist = cur;
}
if (prefs_common.enable_hscrollbar &&
res = NULL;
if (1 < (count = complete_address(email_addr))) {
tmp = get_complete_address(1);
+/* tmp = addressbook_lookup_name( email_addr );
+ if( tmp ) { */
res = procheader_get_fromname(tmp);
- g_free(tmp);
+ g_free(tmp);
}
-
+
return res;
}
gint *col_pos = summaryview->col_pos;
text[col_pos[S_COL_MARK]] = NULL;
- text[col_pos[S_COL_UNREAD]] = NULL;
+ text[col_pos[S_COL_STATUS]] = NULL;
text[col_pos[S_COL_MIME]] = NULL;
text[col_pos[S_COL_LOCKED]] = NULL;
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
Xstrdup_a(addr, msginfo->from, return);
extract_address(addr);
-
if (prefs_common.use_addr_book) {
if (account_find_from_address(addr)) {
addr = summary_complete_address(msginfo->to);
g_free(addr);
}
} else {
- if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
+ if (account_find_from_address(addr)) {
g_free(to);
to = g_strconcat("-->", msginfo->to, NULL);
text[col_pos[S_COL_FROM]] = to;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
MsgFlags flags;
- gchar *filename;
+ gint val;
- if (!new_window && summaryview->displayed == row) return;
+ if (!new_window) {
+ if (summaryview->displayed == row)
+ return;
+ else
+ summaryview->messageview->filtered = FALSE;
+ }
+
g_return_if_fail(row != NULL);
if (summary_is_locked(summaryview)) return;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- filename = procmsg_get_message_file(msginfo);
- if (!filename) {
- summary_unlock(summaryview);
- return;
- }
- g_free(filename);
-
- if (new_window || !prefs_common.mark_as_read_on_new_window) {
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread--;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked--;
- if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- procmsg_msginfo_unset_flags
- (msginfo, MSG_NEW | MSG_UNREAD, 0);
- folder_update_item(msginfo->folder, FALSE);
- summary_set_row_marks(summaryview, row);
- gtk_clist_thaw(GTK_CLIST(ctree));
- summary_status_show(summaryview);
-
- flags = msginfo->flags;
- }
- }
-
if (new_window) {
MessageView *msgview;
msgview = messageview_create_with_new_window(summaryview->mainwin);
- messageview_show(msgview, msginfo, all_headers);
+ val = messageview_show(msgview, msginfo, all_headers);
} else {
MessageView *msgview;
summaryview->displayed = row;
if (!messageview_is_visible(msgview))
main_window_toggle_message_view(summaryview->mainwin);
- messageview_show(msgview, msginfo, all_headers);
- if (msgview->type == MVIEW_TEXT ||
- (msgview->type == MVIEW_MIME &&
- (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL ||
- gtk_notebook_get_current_page
- (GTK_NOTEBOOK(msgview->mimeview->notebook)) == 0)))
+ val = messageview_show(msgview, msginfo, all_headers);
+ if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
gtk_widget_grab_focus(summaryview->ctree);
GTK_EVENTS_FLUSH();
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
+ if (val == 0 &&
+ (new_window || !prefs_common.mark_as_read_on_new_window)) {
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
+ && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked--;
+ if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ procmsg_msginfo_unset_flags
+ (msginfo, MSG_NEW | MSG_UNREAD, 0);
+ summary_set_row_marks(summaryview, row);
+ gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_status_show(summaryview);
+
+ flags = msginfo->flags;
+ }
+ }
+
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
summary_unlock(summaryview);
}
void summary_open_msg(SummaryView *summaryview)
{
if (!summaryview->selected) return;
-
+
+ /* CLAWS: if separate message view, don't open a new window
+ * but rather use the current separated message view */
summary_display_msg_full(summaryview, summaryview->selected,
- TRUE, FALSE);
+ prefs_common.sep_msg ? FALSE : TRUE,
+ FALSE);
}
void summary_view_source(SummaryView * summaryview)
if (messageview_is_visible(summaryview->messageview))
summaryview->display_msg = TRUE;
- gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
- type, 0.0);
+ g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical",
+ type, 0.0);
if (GTK_CLIST(ctree)->selection)
gtk_sctree_set_anchor_row
/* set new/unread column */
if (MSG_IS_IGNORE_THREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
ignorethreadxpm, ignorethreadxpmmask);
} else if (MSG_IS_NEW(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
newxpm, newxpmmask);
} else if (MSG_IS_UNREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
unreadxpm, unreadxpmmask);
} else if (MSG_IS_REPLIED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
repliedxpm, repliedxpmmask);
} else if (MSG_IS_FORWARDED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
forwardedxpm, forwardedxpmmask);
} else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
NULL);
}
}
gtk_ctree_node_set_foreground
(ctree, row, &summaryview->color_marked);
- }
- else if ((global_scoring ||
+#if 0
+ } else if ((global_scoring ||
summaryview->folder_item->prefs->scoring) &&
(msginfo->score >= summaryview->important_score) &&
(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);
+#endif
} else {
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
}
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
}
- if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+ if (MSG_IS_SIGNED(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+ gpgsignedxpm, gpgsignedxpmmask);
+ } else if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipkeyxpm, clipkeyxpmmask);
} else if (MSG_IS_ENCRYPTED(flags)) {
} else {
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
}
- if (!style)
+ if (!style)
style = small_style;
gtk_ctree_node_set_row_style(ctree, row, style);
summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
}
-static gboolean summary_update_unread_children (SummaryView *summaryview, MsgInfo *info, gboolean newly_marked)
-{
- GSList *children = procmsg_find_children(info);
- GSList *cur;
- gboolean changed = FALSE;
- for (cur = children; cur != NULL; cur = g_slist_next(cur)) {
- MsgInfo *tmp = (MsgInfo *)cur->data;
- if(MSG_IS_UNREAD(tmp->flags) && !MSG_IS_IGNORE_THREAD(tmp->flags)) {
- if(newly_marked)
- summaryview->unreadmarked++;
- else
- summaryview->unreadmarked--;
- changed = TRUE;
- }
- procmsg_msginfo_free(tmp);
- }
- return changed;
-}
-
static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
- if (MSG_IS_MOVE(msginfo->flags)) {
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- }
- if (MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- }
- changed |= summary_update_unread_children (summaryview, msginfo, TRUE);
+ procmsg_update_unread_children (msginfo, TRUE);
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_update_item(msginfo->to_folder, FALSE);
- }
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_MARKED, 0);
summary_set_row_marks(summaryview, row);
static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- /* almost verbatim summary_mark_row(); may want a menu action? */
gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
summaryview->copied--;
changed = TRUE;
}
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_update_item(msginfo->to_folder, FALSE);
- }
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_LOCKED, 0);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is locked\n", msginfo->msgnum);
}
+static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ MsgInfo *msginfo;
+
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ if (!MSG_IS_LOCKED(msginfo->flags))
+ return;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
+ procmsg_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
+ summary_set_row_marks(summaryview, row);
+ debug_print("Message %d is unlocked\n", msginfo->msgnum);
+}
+
void summary_mark(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if(!MSG_IS_NEW(msginfo->flags) && !MSG_IS_UNREAD(msginfo->flags))
+ if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
return;
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread--;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked--;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
GTK_CTREE_NODE(cur->data));
- folder_update_items_when_required(FALSE);
+ folder_item_update_thaw();
+
+ summary_status_show(summaryview);
+}
+
+void summary_msgs_lock(SummaryView *summaryview)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GList *cur;
+
+ folder_item_update_freeze();
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+ summary_lock_row(summaryview,
+ GTK_CTREE_NODE(cur->data));
+ folder_item_update_thaw();
+
+ summary_status_show(summaryview);
+}
+
+void summary_msgs_unlock(SummaryView *summaryview)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GList *cur;
+ folder_item_update_freeze();
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+ summary_unlock_row(summaryview,
+ GTK_CTREE_NODE(cur->data));
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
GtkCTreeNode *node;
gtk_clist_freeze(clist);
+ folder_item_update_freeze();
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
node = gtkut_ctree_node_next(ctree, node))
summary_mark_row_as_read(summaryview, node);
- for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
- node = gtkut_ctree_node_next(ctree, node)) {
- if (!GTK_CTREE_ROW(node)->expanded)
- summary_set_row_marks(summaryview, node);
- }
gtk_clist_thaw(clist);
- folder_update_items_when_required(FALSE);
+ folder_item_update_thaw();
summary_status_show(summaryview);
}
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags)) {
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted--;
}
- if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread++;
-
if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked++;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_unread(summaryview,
GTK_CTREE_NODE(cur->data));
- folder_update_items_when_required(FALSE);
-
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
GList * cur;
gboolean found;
- switch (summaryview->folder_item->folder->type) {
+ switch (FOLDER_TYPE(summaryview->folder_item->folder)) {
case F_NEWS:
static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
if (MSG_IS_DELETED(msginfo->flags)) return;
- if (MSG_IS_MOVE(msginfo->flags)) {
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- }
- if (MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- }
- changed |= summary_update_unread_children (summaryview, msginfo, FALSE);
+ procmsg_update_unread_children (msginfo, FALSE);
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_update_item(msginfo->to_folder, FALSE);
- }
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted++;
GtkCTreeNode *node;
if (!item) return;
-#if 0
- if (!item || item->folder->type == F_NEWS) return;
-#endif
if (summary_is_locked(summaryview)) return;
if (aval != G_ALERTDEFAULT) return;
}
+ main_window_cursor_wait(summaryview->mainwin);
+
/* next code sets current row focus right. We need to find a row
* that is not deleted. */
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
sel_last = GTK_CTREE_NODE(cur->data);
summary_delete_row(summaryview, sel_last);
}
+ folder_item_update_thaw();
node = summary_find_next_msg(summaryview, sel_last);
if (!node)
node = summary_find_prev_msg(summaryview, sel_last);
- if (node) {
- if (sel_last && node == gtkut_ctree_node_next(ctree, sel_last))
- summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
- else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
- summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
- else
- summary_select_node
- (summaryview, node,
- messageview_is_visible(summaryview->messageview),
- FALSE);
- }
-
- if (prefs_common.immediate_exec || item->stype == F_TRASH)
+ summary_select_node(summaryview, node, FALSE, FALSE);
+
+ if (prefs_common.immediate_exec || item->stype == F_TRASH) {
summary_execute(summaryview);
- else
+ /* after deleting, the anchor may be at an invalid row
+ * so reset it to the node we found earlier */
+ gtk_sctree_set_anchor_row(GTK_SCTREE(ctree), node);
+ } else
summary_status_show(summaryview);
+
+ main_window_cursor_normal(summaryview->mainwin);
}
void summary_delete_duplicated(SummaryView *summaryview)
{
if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
if (summaryview->folder_item->stype == F_TRASH) return;
main_window_cursor_wait(summaryview->mainwin);
STATUSBAR_PUSH(summaryview->mainwin,
_("Deleting duplicated messages..."));
+ folder_item_update_freeze();
+
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
GTK_CTREE_FUNC(summary_delete_duplicated_func),
summaryview);
else
summary_status_show(summaryview);
+ folder_item_update_thaw();
+
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
SummaryView *summaryview)
{
GtkCTreeNode *found;
- MsgInfo *msginfo = GTK_CTREE_ROW(node)->row.data;
+ MsgInfo *msginfo;
MsgInfo *dup_msginfo;
+
+ msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- if (!msginfo->msgid || !*msginfo->msgid) return;
+ if (!msginfo || !msginfo->msgid || !*msginfo->msgid) return;
found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
- if (MSG_IS_MOVE(msginfo->flags)) {
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- }
- if (MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- }
- changed |= summary_update_unread_children (summaryview, msginfo, FALSE);
+ procmsg_update_unread_children (msginfo, FALSE);
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_update_item(msginfo->to_folder, FALSE);
- }
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
summary_set_row_marks(summaryview, row);
static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
FolderItem *to_folder)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
g_return_if_fail(to_folder != NULL);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_MOVE(msginfo->flags)) {
- if (!prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0) {
- folder_update_item(msginfo->to_folder, FALSE);
- changed = TRUE;
- }
- }
- }
- msginfo->to_folder = to_folder;
+ procmsg_msginfo_set_to_folder(msginfo, to_folder);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_COPY(msginfo->flags)) {
summaryview->copied--;
- if (!prefs_common.immediate_exec)
- msginfo->to_folder->op_count--;
}
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
if (!MSG_IS_MOVE(msginfo->flags)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
summaryview->moved++;
- changed = TRUE;
}
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
- if (changed) {
- msginfo->to_folder->op_count++;
- if (msginfo->to_folder->op_count == 1)
- folder_update_item(msginfo->to_folder, FALSE);
- }
}
debug_print("Message %d is set to move to %s\n",
if (!to_folder) return;
if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
if (summary_is_locked(summaryview)) return;
summary_execute(summaryview);
else {
summary_status_show(summaryview);
-
- folder_update_item(to_folder, FALSE);
}
if (!summaryview->selected) { /* this was the last message */
FolderItem *to_folder;
if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
FOLDER_SEL_MOVE, NULL);
static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
FolderItem *to_folder)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
g_return_if_fail(to_folder != NULL);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_COPY(msginfo->flags)) {
- if (!prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0) {
- folder_update_item(msginfo->to_folder, FALSE);
- changed = TRUE;
- }
- }
- }
- msginfo->to_folder = to_folder;
+ procmsg_msginfo_set_to_folder(msginfo, to_folder);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
summaryview->moved--;
- if (!prefs_common.immediate_exec)
- msginfo->to_folder->op_count--;
}
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
if (!MSG_IS_COPY(msginfo->flags)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
summaryview->copied++;
- changed = TRUE;
}
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
- if (changed) {
- msginfo->to_folder->op_count++;
- if (msginfo->to_folder->op_count == 1)
- folder_update_item(msginfo->to_folder, FALSE);
- }
}
debug_print("Message %d is set to copy to %s\n",
summary_execute(summaryview);
else {
summary_status_show(summaryview);
-
- folder_update_item(to_folder, FALSE);
}
}
void summary_select_all(SummaryView *summaryview)
{
- if (summaryview->messages >= 500) {
+ if (!summaryview->folder_item) return;
+
+ if (summaryview->folder_item->total_msgs >= 500) {
STATUSBAR_PUSH(summaryview->mainwin,
_("Selecting all messages..."));
main_window_cursor_wait(summaryview->mainwin);
gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
- if (summaryview->messages >= 500) {
+ if (summaryview->folder_item->total_msgs >= 500) {
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
}
Xstrdup_a(filename, msginfo->subject, return);
subst_for_filename(filename);
}
- dest = filesel_select_file(_("Save as"), filename);
+ if (g_getenv ("G_BROKEN_FILENAMES") &&
+ filename && g_utf8_validate(filename, -1, NULL)) {
+ gchar *oldstr = filename;
+ filename = conv_codeset_strdup(filename,
+ CS_UTF_8,
+ conv_get_current_charset_str());
+ if (!filename) {
+ g_warning("summary_save_as(): faild to convert character set.");
+ filename = g_strdup(oldstr);
+ }
+ dest = filesel_select_file(_("Save as"), filename);
+ g_free(filename);
+ } else
+ dest = filesel_select_file(_("Save as"), filename);
+ filename = NULL;
if (!dest) return;
if (is_file_exist(dest)) {
aval = alertpanel(_("Append or Overwrite"),
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCTreeNode *node, *next;
+ GtkCTreeNode *new_selected = NULL;
if (!summaryview->folder_item) return FALSE;
if (summaryview->threaded)
summary_unthread_for_exec(summaryview);
+ folder_item_update_freeze();
summary_execute_move(summaryview);
summary_execute_copy(summaryview);
summary_execute_delete(summaryview);
+ folder_item_update_thaw();
node = GTK_CTREE_NODE(clist->row_list);
- while (node != NULL) {
+ for (; node != NULL; node = next) {
next = gtkut_ctree_node_next(ctree, node);
- if (gtk_ctree_node_get_row_data(ctree, node) == NULL) {
- if (node == summaryview->displayed) {
- messageview_clear(summaryview->messageview);
- summaryview->displayed = NULL;
- }
- if (GTK_CTREE_ROW(node)->children != NULL)
- g_warning("summary_execute(): children != NULL\n");
- else
- gtk_ctree_remove_node(ctree, node);
+ if (gtk_ctree_node_get_row_data(ctree, node) != NULL) continue;
+
+ if (node == summaryview->displayed) {
+ messageview_clear(summaryview->messageview);
+ summaryview->displayed = NULL;
}
- node = next;
+ if (GTK_CTREE_ROW(node)->children != NULL) {
+ g_warning("summary_execute(): children != NULL\n");
+ continue;
+ }
+
+ if (!new_selected &&
+ gtkut_ctree_node_is_selected(ctree, node)) {
+ gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ new_selected = summary_find_next_msg(summaryview, node);
+ if (!new_selected)
+ new_selected = summary_find_prev_msg
+ (summaryview, node);
+ }
+
+ gtk_ctree_remove_node(ctree, node);
+ }
+
+ if (new_selected) {
+ gtk_sctree_select
+ (GTK_SCTREE(ctree),
+ summaryview->displayed ? summaryview->displayed
+ : new_selected);
}
if (summaryview->threaded)
if (summaryview->mlist) {
procmsg_move_messages(summaryview->mlist);
- folder_update_items_when_required(FALSE);
-
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
-
- folder_update_item(summaryview->folder_item, FALSE);
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
- if (!prefs_common.immediate_exec &&
- msginfo->to_folder->op_count > 0)
- msginfo->to_folder->op_count--;
-
summaryview->mlist =
- g_slist_append(summaryview->mlist, msginfo);
+ g_slist_prepend(summaryview->mlist, msginfo);
gtk_ctree_node_set_row_data(ctree, node, NULL);
if (msginfo->msgid && *msginfo->msgid &&
summaryview);
if (summaryview->mlist) {
+ summaryview->mlist = g_slist_reverse(summaryview->mlist);
procmsg_copy_messages(summaryview->mlist);
- folder_update_items_when_required(FALSE);
-
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
- if (!prefs_common.immediate_exec &&
- msginfo->to_folder->op_count > 0)
- msginfo->to_folder->op_count--;
-
summaryview->mlist =
- g_slist_append(summaryview->mlist, msginfo);
+ g_slist_prepend(summaryview->mlist, msginfo);
procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
summary_set_row_marks(summaryview, node);
GSList *cur;
trash = summaryview->folder_item->folder->trash;
- if (summaryview->folder_item->folder->type == F_MH) {
- g_return_if_fail(trash != NULL);
- }
/* search deleting messages and execute */
gtk_ctree_pre_recursive
folder_item_remove_msgs(summaryview->folder_item,
summaryview->mlist);
else
- folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+ folder_item_move_msgs(trash, summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
-
- if ((summaryview->folder_item != trash) && (trash != NULL)) {
- folder_update_item(trash, FALSE);
- }
- folder_update_item(summaryview->folder_item, FALSE);
}
static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
msginfo->msgid)) {
g_hash_table_remove(summaryview->msgid_table,
msginfo->msgid);
- }
+ }
if (msginfo->subject && *msginfo->subject &&
- node == g_hash_table_lookup(summaryview->subject_table,
- msginfo->subject)) {
- g_hash_table_remove(summaryview->subject_table,
- msginfo->subject);
+ node == subject_table_lookup(summaryview->subject_table,
+ msginfo->subject)) {
+ subject_table_remove(summaryview->subject_table,
+ msginfo->subject);
}
}
}
STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
main_window_cursor_wait(summaryview->mainwin);
- gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
- summary_tree_expanded, summaryview);
+ g_signal_handlers_block_by_func(G_OBJECT(ctree),
+ G_CALLBACK(summary_tree_expanded), summaryview);
gtk_clist_freeze(GTK_CLIST(ctree));
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
msginfo->inreplyto);
}
- if (parent == NULL) {
+ if (prefs_common.thread_by_subject && parent == NULL) {
parent = subject_table_lookup
(summaryview->subject_table,
msginfo->subject);
while (node) {
next = GTK_CTREE_NODE_NEXT(node);
- if (prefs_common.expand_thread)
+ if (!summaryview->thread_collapsed)
gtk_ctree_expand(ctree, node);
if (prefs_common.bold_unread &&
GTK_CTREE_ROW(node)->children)
node = next;
}
+ gtkut_ctree_set_focus_row(ctree, summaryview->selected);
+
gtk_clist_thaw(GTK_CLIST(ctree));
- gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
- summary_tree_expanded, summaryview);
+ g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+ G_CALLBACK(summary_tree_expanded), summaryview);
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
GtkCTreeNode *next;
- if (prefs_common.expand_thread) {
+ if (!summaryview->thread_collapsed) {
while (node) {
next = GTK_CTREE_ROW(node)->sibling;
if (GTK_CTREE_ROW(node)->children)
STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
main_window_cursor_wait(summaryview->mainwin);
- gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
- summary_tree_collapsed, summaryview);
+ g_signal_handlers_block_by_func(G_OBJECT(ctree),
+ summary_tree_collapsed, summaryview);
gtk_clist_freeze(GTK_CLIST(ctree));
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
gtk_sctree_sort_recursive(ctree, NULL);
gtk_clist_thaw(GTK_CLIST(ctree));
- gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
- summary_tree_collapsed, summaryview);
+ g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+ G_CALLBACK(summary_tree_collapsed), summaryview);
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
gtk_clist_thaw(GTK_CLIST(ctree));
+ summaryview->thread_collapsed = FALSE;
+
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
}
gtk_clist_thaw(GTK_CLIST(ctree));
+
+ summaryview->thread_collapsed = TRUE;
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
void summary_filter(SummaryView *summaryview)
{
- if (!global_processing) {
+ if (!filtering_rules) {
alertpanel_error(_("No filter rules defined."));
return;
}
summary_lock(summaryview);
+ folder_item_update_freeze();
+
debug_print("filtering...");
STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
main_window_cursor_wait(summaryview->mainwin);
gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
- if (global_processing == NULL) {
+ if (filtering_rules == NULL) {
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
GTK_CTREE_FUNC(summary_filter_func),
summaryview);
summaryview);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
- folder_update_items_when_required(FALSE);
}
+ folder_item_update_thaw();
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
* CLAWS: summary_show() only valid after having a lock. ideally
* we want the lock to be context aware...
*/
- if (global_processing) {
+ if (filtering_rules) {
summary_show(summaryview, summaryview->folder_item);
}
}
{
MsgInfo *msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- filter_message_by_msginfo(global_processing, msginfo);
+ filter_message_by_msginfo(filtering_rules, msginfo);
}
-void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
+void summary_msginfo_filter_open(FolderItem * item, MsgInfo *msginfo,
+ PrefsFilterType type, gint processing_rule)
{
- static HeaderEntry hentry[] = {{"X-BeenThere:", NULL, FALSE},
- {"X-ML-Name:", NULL, FALSE},
- {"X-List:", NULL, FALSE},
- {"X-Mailing-list:", NULL, FALSE},
- {"List-Id:", NULL, FALSE},
- {NULL, NULL, FALSE}};
-
- static gchar *header_strs[] = {"From", "from", "To", "to", "Subject", "subject"};
-
- static gchar *hentry_strs[] = {"X-BeenThere", "X-ML-Name", "X-List",
- "X-Mailing-List", "List-Id",
- "header \"X-BeenThere\"", "header \"X-ML-Name\"",
- "header \"X-List\"", "header \"X-Mailing-List\"",
- "header \"List-Id\""};
- enum
- {
- H_X_BEENTHERE = 0,
- H_X_ML_NAME = 1,
- H_X_LIST = 2,
- H_X_MAILING_LIST = 3,
- H_LIST_ID = 4
- };
-
- enum
- {
- H_FROM = 0,
- H_TO = 2,
- H_SUBJECT = 4
- };
-
- MsgInfo *msginfo;
gchar *header = NULL;
gchar *key = NULL;
- FILE *fp;
- int header_offset;
- int hentry_offset;
-
- if (!summaryview->selected) return;
-
- msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
- summaryview->selected);
- if (!msginfo) return;
-
- header_offset = 1;
- hentry_offset = 5;
-
- switch (type) {
- case FILTER_BY_NONE:
- break;
- case FILTER_BY_AUTO:
- if ((fp = procmsg_open_message(msginfo)) == NULL) return;
- procheader_get_header_fields(fp, hentry);
- fclose(fp);
-
- if (hentry[H_X_BEENTHERE].body != NULL) {
- header = hentry_strs[H_X_BEENTHERE + hentry_offset];
- Xstrdup_a(key, hentry[H_X_BEENTHERE].body, );
- } else if (hentry[H_X_ML_NAME].body != NULL) {
- header = hentry_strs[H_X_ML_NAME + hentry_offset];
- Xstrdup_a(key, hentry[H_X_ML_NAME].body, );
- } else if (hentry[H_X_LIST].body != NULL) {
- header = hentry_strs[H_X_LIST + hentry_offset];
- Xstrdup_a(key, hentry[H_X_LIST].body, );
- } else if (hentry[H_X_MAILING_LIST].body != NULL) {
- header = hentry_strs[H_X_MAILING_LIST + hentry_offset];
- Xstrdup_a(key, hentry[H_X_MAILING_LIST].body, );
- } else if (hentry[H_LIST_ID].body != NULL) {
- header = hentry_strs[H_LIST_ID + hentry_offset];
- Xstrdup_a(key, hentry[H_LIST_ID].body, );
- } else if (msginfo->subject) {
- header = header_strs[H_SUBJECT + header_offset];
- key = msginfo->subject;
- }
-
- g_free(hentry[H_X_BEENTHERE].body);
- hentry[H_X_BEENTHERE].body = NULL;
- g_free(hentry[H_X_ML_NAME].body);
- hentry[H_X_ML_NAME].body = NULL;
- g_free(hentry[H_X_LIST].body);
- hentry[H_X_LIST].body = NULL;
- g_free(hentry[H_X_MAILING_LIST].body);
- hentry[H_X_MAILING_LIST].body = NULL;
- g_free(hentry[H_LIST_ID].body);
- hentry[H_LIST_ID].body = NULL;
- break;
- case FILTER_BY_FROM:
- header = header_strs[H_FROM + header_offset];
- key = msginfo->from;
- break;
- case FILTER_BY_TO:
- header = header_strs[H_TO + header_offset];
- key = msginfo->to;
- break;
- case FILTER_BY_SUBJECT:
- header = header_strs[H_SUBJECT + header_offset];
- key = msginfo->subject;
- break;
- default:
- break;
+ procmsg_get_filter_keyword(msginfo, &header, &key, type);
+
+ if (processing_rule) {
+ if (item == NULL)
+ prefs_filtering_open(&pre_global_processing,
+ _("Processing rules to apply before folder rules"),
+ header, key);
+ else
+ prefs_filtering_open(&item->prefs->processing,
+ _("Processing configuration"),
+ header, key);
}
-
- /*
- * NOTE: key may be allocated on the stack, so
- * prefs_filter[ing]_open() should have completed
- * and have set entries. Otherwise we're hosed.
- */
-
- prefs_filtering_open(NULL, header, key);
+ else {
+ prefs_filtering_open(&filtering_rules,
+ _("Filtering configuration"),
+ header, key);
+ }
+
+ g_free(header);
+ g_free(key);
}
-void summary_reply(SummaryView *summaryview, ComposeMode mode)
+void summary_filter_open(SummaryView *summaryview, PrefsFilterType type,
+ gint processing_rule)
{
- GList *sel = GTK_CLIST(summaryview->ctree)->selection;
MsgInfo *msginfo;
- gchar *text;
+ FolderItem * item;
+
+ if (!summaryview->selected) return;
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
summaryview->selected);
if (!msginfo) return;
-
- text = gtkut_editable_get_selection
- (GTK_EDITABLE(summaryview->messageview->textview->text));
-
- if (!text && summaryview->messageview->type == MVIEW_MIME
- && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
- && summaryview->messageview->mimeview->textview
- && !summaryview->messageview->mimeview->textview->default_text) {
- text = gtkut_editable_get_selection (GTK_EDITABLE
- (summaryview->messageview->mimeview->textview->text));
- }
- switch (mode) {
- case COMPOSE_REPLY:
- if (prefs_common.default_reply_list)
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, TRUE, FALSE, text);
- else
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_WITH_QUOTE:
- if (prefs_common.default_reply_list)
- compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
- else
- compose_reply(msginfo, TRUE, FALSE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_WITHOUT_QUOTE:
- if (prefs_common.default_reply_list)
- compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
- else
- compose_reply(msginfo, FALSE, FALSE, FALSE, FALSE, NULL);
- break;
- case COMPOSE_REPLY_TO_SENDER:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, FALSE, TRUE, text);
- break;
- case COMPOSE_FOLLOWUP_AND_REPLY_TO:
- compose_followup_and_reply_to(msginfo,
- prefs_common.reply_with_quote,
- FALSE, TRUE, text);
- break;
- case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, text);
- break;
- case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
- break;
- case COMPOSE_REPLY_TO_ALL:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
- break;
- case COMPOSE_REPLY_TO_LIST:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, TRUE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
- break;
- case COMPOSE_FORWARD:
- if (prefs_common.forward_as_attachment) {
- summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
- return;
- } else {
- summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, NULL);
- return;
- }
- break;
- case COMPOSE_FORWARD_INLINE:
- if (!sel->next) {
- compose_forward(NULL, msginfo, FALSE, text);
- break;
- }
- /* if (sel->next) FALL THROUGH */
- case COMPOSE_FORWARD_AS_ATTACH:
- {
- GSList *msginfo_list = NULL;
- for ( ; sel != NULL; sel = sel->next)
- msginfo_list = g_slist_append(msginfo_list,
- gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
- GTK_CTREE_NODE(sel->data)));
- compose_forward_multiple(NULL, msginfo_list);
- g_slist_free(msginfo_list);
- }
- break;
- case COMPOSE_REDIRECT:
- compose_redirect(NULL, msginfo);
- break;
- default:
- g_warning("summary_reply_cb(): invalid action: %d\n", mode);
- }
-
- summary_set_marks_selected(summaryview);
- g_free(text);
+ item = summaryview->folder_item;
+ summary_msginfo_filter_open(item, msginfo, type, processing_rule);
}
/* color label */
guint color = GPOINTER_TO_UINT(data);
SummaryView *summaryview;
- summaryview = gtk_object_get_data(GTK_OBJECT(widget), "summaryview");
+ summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
g_return_if_fail(summaryview != NULL);
/* "dont_toggle" state set? */
- if (gtk_object_get_data(GTK_OBJECT(summaryview->colorlabel_menu),
+ if (g_object_get_data(G_OBJECT(summaryview->colorlabel_menu),
"dont_toggle"))
return;
gint color_index;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
- procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
gtk_ctree_node_set_row_style(ctree, node, style);
}
+static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ MsgInfo *msginfo;
+
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+
+ procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
+}
+
void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
GtkWidget *widget)
{
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_colorlabel_color(ctree, GTK_CTREE_NODE(cur->data),
- labelcolor);
+ main_window_cursor_wait(summaryview->mainwin);
+ folder_item_update_freeze();
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+ summary_set_row_colorlabel(summaryview,
+ GTK_CTREE_NODE(cur->data), labelcolor);
+ folder_item_update_thaw();
+ main_window_cursor_normal(summaryview->mainwin);
}
static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,
/* NOTE: don't return prematurely because we set the "dont_toggle"
* state for check menu items */
- gtk_object_set_data(GTK_OBJECT(menu), "dont_toggle",
- GINT_TO_POINTER(1));
+ g_object_set_data(G_OBJECT(menu), "dont_toggle",
+ GINT_TO_POINTER(1));
/* clear items. get item pointers. */
for (n = 0, cur = 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_set_active
(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
items[n] = GTK_CHECK_MENU_ITEM(cur->data);
n++;
if (msginfo) {
clabel = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
if (!items[clabel]->active)
- gtk_check_menu_item_set_state
+ gtk_check_menu_item_set_active
(items[clabel], TRUE);
}
}
g_warning("invalid number of color elements (%d)\n", n);
/* reset "dont_toggle" state */
- gtk_object_set_data(GTK_OBJECT(menu), "dont_toggle",
- GINT_TO_POINTER(0));
+ g_object_set_data(G_OBJECT(menu), "dont_toggle",
+ GINT_TO_POINTER(0));
}
static void summary_colorlabel_menu_create(SummaryView *summaryview)
label_menuitem = gtk_item_factory_get_item(summaryview->popupfactory,
"/Color label");
- gtk_signal_connect(GTK_OBJECT(label_menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_item_cb),
+ g_signal_connect(G_OBJECT(label_menuitem), "activate",
+ G_CALLBACK(summary_colorlabel_menu_item_activate_item_cb),
summaryview);
gtk_widget_show(label_menuitem);
* can always get back the SummaryView pointer. */
item = gtk_check_menu_item_new_with_label(_("None"));
- gtk_menu_append(GTK_MENU(menu), item);
- gtk_signal_connect(GTK_OBJECT(item), "activate",
- GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_cb),
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(summary_colorlabel_menu_item_activate_cb),
GUINT_TO_POINTER(0));
- gtk_object_set_data(GTK_OBJECT(item), "summaryview", summaryview);
+ g_object_set_data(G_OBJECT(item), "summaryview", summaryview);
gtk_widget_show(item);
item = gtk_menu_item_new();
- gtk_menu_append(GTK_MENU(menu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
gtk_widget_show(item);
/* create pixmap/label menu items */
for (i = 0; i < N_COLOR_LABELS; i++) {
item = colorlabel_create_check_color_menu_item(i);
- gtk_menu_append(GTK_MENU(menu), item);
- gtk_signal_connect(GTK_OBJECT(item), "activate",
- GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_cb),
- GUINT_TO_POINTER(i + 1));
- gtk_object_set_data(GTK_OBJECT(item), "summaryview",
- summaryview);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(summary_colorlabel_menu_item_activate_cb),
+ GUINT_TO_POINTER(i + 1));
+ g_object_set_data(G_OBJECT(item), "summaryview",
+ summaryview);
gtk_widget_show(item);
}
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
GTK_JUSTIFY_CENTER);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
GTK_JUSTIFY_CENTER);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
GTK_JUSTIFY_CENTER);
GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MARK],
SUMMARY_COL_MARK_WIDTH);
- gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
- SUMMARY_COL_UNREAD_WIDTH);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
+ SUMMARY_COL_STATUS_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
SUMMARY_COL_LOCKED_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
GTK_CTREE_EXPANDER_TRIANGLE);
#endif
gtk_ctree_set_indent(GTK_CTREE(ctree), 16);
- gtk_object_set_user_data(GTK_OBJECT(ctree), summaryview);
+ g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[pos].button,
/* connect signal to the buttons for sorting */
#define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
- gtk_signal_connect \
- (GTK_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
+ g_signal_connect \
+ (G_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
"clicked", \
- GTK_SIGNAL_FUNC(func), \
+ G_CALLBACK(func), \
summaryview)
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MARK , summary_mark_clicked);
- CLIST_BUTTON_SIGNAL_CONNECT(S_COL_UNREAD , summary_unread_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_STATUS , summary_status_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MIME , summary_mime_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE , summary_size_clicked);
#undef CLIST_BUTTON_SIGNAL_CONNECT
- gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
- GTK_SIGNAL_FUNC(summary_selected), summaryview);
- gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
- GTK_SIGNAL_FUNC(summary_button_pressed),
- summaryview);
- gtk_signal_connect(GTK_OBJECT(ctree), "button_release_event",
- GTK_SIGNAL_FUNC(summary_button_released),
- summaryview);
- gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
- GTK_SIGNAL_FUNC(summary_key_pressed), summaryview);
- gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",
- GTK_SIGNAL_FUNC(summary_col_resized), summaryview);
- gtk_signal_connect(GTK_OBJECT(ctree), "open_row",
- GTK_SIGNAL_FUNC(summary_open_row), summaryview);
-
- gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
- GTK_SIGNAL_FUNC(summary_tree_expanded),
- summaryview);
- gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_collapse",
- GTK_SIGNAL_FUNC(summary_tree_collapsed),
- summaryview);
-
- gtk_signal_connect(GTK_OBJECT(ctree), "start_drag",
- GTK_SIGNAL_FUNC(summary_start_drag),
- summaryview);
- gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
- GTK_SIGNAL_FUNC(summary_drag_data_get),
- summaryview);
+ g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+ G_CALLBACK(summary_selected), summaryview);
+ g_signal_connect(G_OBJECT(ctree), "button_press_event",
+ G_CALLBACK(summary_button_pressed),
+ summaryview);
+ g_signal_connect(G_OBJECT(ctree), "button_release_event",
+ G_CALLBACK(summary_button_released),
+ summaryview);
+ g_signal_connect(G_OBJECT(ctree), "key_press_event",
+ G_CALLBACK(summary_key_pressed), summaryview);
+ g_signal_connect(G_OBJECT(ctree), "resize_column",
+ G_CALLBACK(summary_col_resized), summaryview);
+ g_signal_connect(G_OBJECT(ctree), "open_row",
+ G_CALLBACK(summary_open_row), summaryview);
+
+ g_signal_connect_after(G_OBJECT(ctree), "tree_expand",
+ G_CALLBACK(summary_tree_expanded),
+ summaryview);
+ g_signal_connect_after(G_OBJECT(ctree), "tree_collapse",
+ G_CALLBACK(summary_tree_collapsed),
+ summaryview);
+
+ g_signal_connect(G_OBJECT(ctree), "start_drag",
+ G_CALLBACK(summary_start_drag),
+ summaryview);
+ g_signal_connect(G_OBJECT(ctree), "drag_data_get",
+ G_CALLBACK(summary_drag_data_get),
+ summaryview);
return ctree;
}
gtk_widget_destroy(summaryview->ctree);
summaryview->ctree = ctree = summary_ctree_create(summaryview);
- pixmap = gtk_pixmap_new(clipxpm, clipxpmmask);
+ pixmap = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
gtk_clist_set_column_widget(GTK_CLIST(ctree),
summaryview->col_pos[S_COL_MIME], pixmap);
gtk_widget_show(pixmap);
/* callback functions */
-static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
+static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
SummaryView *summaryview)
{
- if (!event) return;
-
- summary_toggle_view(summaryview);
+ if (event)
+ summary_toggle_view(summaryview);
+ return TRUE;
}
-static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
- SummaryView *summaryview)
+static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
+ SummaryView *summaryview)
{
- if (!event) return;
+ if (!event) return FALSE;
if (event->button == 3) {
+ summaryview->display_msg = TRUE;
/* right clicked */
gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
messageview_is_visible(summaryview->messageview))
summaryview->display_msg = TRUE;
}
+
+ return FALSE;
}
-static void summary_button_released(GtkWidget *ctree, GdkEventButton *event,
- SummaryView *summaryview)
+static gboolean summary_button_released(GtkWidget *ctree, GdkEventButton *event,
+ SummaryView *summaryview)
{
+ return FALSE;
}
void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-#define RETURN_IF_LOCKED() \
- if (summaryview->mainwin->lock_count) return
-
-static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(widget);
MessageView *messageview;
TextView *textview;
- if (summary_is_locked(summaryview)) return;
- if (!event) return;
+ if (summary_is_locked(summaryview)) return TRUE;
+ if (!event) return TRUE;
switch (event->keyval) {
case GDK_Left: /* Move focus */
case GDK_Escape:
gtk_widget_grab_focus(summaryview->folderview->ctree);
- return;
+ return TRUE;
+ case GDK_Up:
+ case GDK_Down:
+ if ((node = summaryview->selected) != NULL) {
+ GtkCTreeNode *next = NULL;
+ next = (event->keyval == GDK_Down)
+ ? gtkut_ctree_node_next(ctree, node)
+ : gtkut_ctree_node_prev(ctree, node);
+ if (next) {
+ gtk_sctree_select(GTK_SCTREE(ctree), next);
+ return TRUE;
+ }
+ }
+ break;
default:
break;
}
if (node)
gtk_sctree_select(GTK_SCTREE(ctree), node);
else
- return;
+ return TRUE;
}
messageview = summaryview->messageview;
- if (messageview->type == MVIEW_MIME &&
- gtk_notebook_get_current_page
- (GTK_NOTEBOOK(messageview->mimeview->notebook)) == 1)
- textview = messageview->mimeview->textview;
- else
- textview = messageview->textview;
+ textview = messageview->mimeview->textview;
switch (event->keyval) {
case GDK_space: /* Page down or go to the next */
- if (summaryview->displayed != summaryview->selected) {
- summary_display_msg(summaryview,
- summaryview->selected);
- break;
- }
- if (!textview_scroll_page(textview, FALSE))
- summary_select_next_unread(summaryview);
+ if (event->state & GDK_SHIFT_MASK)
+ textview_scroll_page(textview, TRUE);
+ else {
+ if (summaryview->displayed != summaryview->selected) {
+ summary_display_msg(summaryview,
+ summaryview->selected);
+ break;
+ }
+ if (!textview_scroll_page(textview, FALSE))
+ summary_select_next_unread(summaryview);
+ }
break;
case GDK_BackSpace: /* Page up */
textview_scroll_page(textview, TRUE);
textview_scroll_one_line
(textview, (event->state & GDK_MOD1_MASK) != 0);
break;
- case GDK_asterisk: /* Mark */
- summary_mark(summaryview);
- break;
- case GDK_exclam: /* Mark as unread */
- summary_mark_as_unread(summaryview);
- break;
case GDK_Delete:
- RETURN_IF_LOCKED();
BREAK_ON_MODIFIER_KEY();
summary_delete(summaryview);
break;
default:
break;
}
+ return TRUE;
}
-static void summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
- SummaryView *summaryview)
+static gboolean summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
+ SummaryView *summaryview)
{
if (event != NULL && event->keyval == GDK_Return)
summary_show(summaryview, summaryview->folder_item);
+ return FALSE;
+}
+
+static gboolean summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
+ SummaryView *summaryview)
+{
+ if (event != NULL && event->in)
+ g_signal_handlers_block_by_func(G_OBJECT(summaryview->mainwin->window),
+ G_CALLBACK(mainwindow_key_pressed),
+ summaryview->mainwin);
+ else
+ g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->mainwin->window),
+ G_CALLBACK(mainwindow_key_pressed),
+ summaryview->mainwin);
+
+ return FALSE;
}
static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
{
SummaryView *sw = (SummaryView *)data;
+ prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
+ GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
+ GTK_MENU(sw->search_type)))), MENU_VAL_ID));
+
+ /* Show extended search description button, only when Extended is selected */
+ if (prefs_common.summary_quicksearch_type == S_SEARCH_EXTENDED) {
+ gtk_widget_show(sw->search_description);
+ } else {
+ gtk_widget_hide(sw->search_description);
+ }
+
if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
summary_show(sw, sw->folder_item);
}
static void tog_searchbar_cb(GtkWidget *w, gpointer data)
{
+ SummaryView *summaryview = (SummaryView *)data;
+ GtkWidget *hbox= summaryview->hbox_search;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
prefs_common.show_searchbar = TRUE;
- gtk_widget_show(GTK_WIDGET(data));
+ gtk_widget_show(hbox);
} else {
prefs_common.show_searchbar = FALSE;
- gtk_widget_hide(GTK_WIDGET(data));
+ gtk_widget_hide(hbox);
}
}
summary_status_show(summaryview);
if (GTK_CLIST(ctree)->selection &&
- GTK_CLIST(ctree)->selection->next) {
+ GTK_CLIST(ctree)->selection->next) {
summaryview->display_msg = FALSE;
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
return;
}
summaryview->selected = row;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo != NULL);
switch (column < 0 ? column : summaryview->col_state[column].type) {
case S_COL_MARK:
- if (MSG_IS_MARKED(msginfo->flags)) {
- summary_unmark_row(summaryview, row);
- } else
- summary_mark_row(summaryview, row);
+ if (!MSG_IS_DELETED(msginfo->flags) &&
+ !MSG_IS_MOVE(msginfo->flags) &&
+ !MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_MARKED(msginfo->flags)) {
+ summary_unmark_row(summaryview, row);
+ } else {
+ summary_mark_row(summaryview, row);
+ }
+ }
break;
- case S_COL_UNREAD:
+ case S_COL_STATUS:
if (MSG_IS_UNREAD(msginfo->flags)) {
summary_mark_row_as_read(summaryview, row);
summary_status_show(summaryview);
!MSG_IS_FORWARDED(msginfo->flags)) {
summary_mark_row_as_unread(summaryview, row);
summary_status_show(summaryview);
+ } else if (MSG_IS_REPLIED(msginfo->flags)) {
+ summary_find_answers(summaryview, msginfo);
+ return;
}
break;
case S_COL_LOCKED:
}
if (summaryview->display_msg ||
- (prefs_common.show_msg_with_cursor_key &&
+ (prefs_common.always_show_msg &&
messageview_is_visible(summaryview->messageview))) {
- summary_display_msg(summaryview, row);
summaryview->display_msg = FALSE;
- } else {
- summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ if (summaryview->displayed != row) {
+ summary_display_msg(summaryview, row);
+ return;
+ }
}
+
+ summary_set_menu_sensitive(summaryview);
+ toolbar_main_set_sensitive(summaryview->mainwin);
}
static void summary_col_resized(GtkCList *clist, gint column, gint width,
prefs_common.summary_col_size[type] = width;
}
+
+/*
+ * \brief get List of msginfo selected in SummaryView
+ *
+ * \param summaryview
+ *
+ * \return GSList holding MsgInfo
+ */
+GSList *summary_get_selection(SummaryView *summaryview)
+{
+ GList *sel = NULL;
+ GSList *msginfo_list = NULL;
+
+ g_return_val_if_fail(summaryview != NULL, NULL);
+
+ sel = GTK_CLIST(summaryview->ctree)->selection;
+
+ g_return_val_if_fail(sel != NULL, NULL);
+
+ for ( ; sel != NULL; sel = sel->next)
+ msginfo_list =
+ g_slist_append(msginfo_list,
+ gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(sel->data)));
+ return msginfo_list;
+}
+
static void summary_reply_cb(SummaryView *summaryview, guint action,
GtkWidget *widget)
{
- summary_reply(summaryview, (ComposeMode)action);
+ MessageView *msgview = (MessageView*)summaryview->messageview;
+ GSList *msginfo_list;
+ gchar *body;
+
+ g_return_if_fail(msgview != NULL);
+
+ msginfo_list = summary_get_selection(summaryview);
+ g_return_if_fail(msginfo_list != NULL);
+
+ body = messageview_get_selection(msgview);
+
+ compose_reply_mode((ComposeMode)action, msginfo_list, body);
+ g_free(body);
+ g_slist_free(msginfo_list);
}
static void summary_execute_cb(SummaryView *summaryview, guint action,
static void summary_create_filter_cb(SummaryView *summaryview,
guint action, GtkWidget *widget)
{
- summary_filter_open(summaryview, (PrefsFilterType)action);
+ summary_filter_open(summaryview, (PrefsFilterType)action, 0);
+}
+
+static void summary_create_processing_cb(SummaryView *summaryview,
+ guint action, GtkWidget *widget)
+{
+ summary_filter_open(summaryview, (PrefsFilterType)action, 1);
}
static void summary_sort_by_column_click(SummaryView *summaryview,
summary_sort_by_column_click(summaryview, SORT_BY_MARK);
}
-static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_status_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_UNREAD);
+ summary_sort_by_column_click(summaryview, SORT_BY_STATUS);
}
static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
SummaryView *summaryview)
{
- GtkTargetList *list;
GdkDragContext *context;
g_return_if_fail(summaryview != NULL);
g_return_if_fail(summaryview->folder_item->folder != NULL);
if (summaryview->selected == NULL) return;
- list = gtk_target_list_new(summary_drag_types, 1);
-
- context = gtk_drag_begin(widget, list,
+ context = gtk_drag_begin(widget, summaryview->target_list,
GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
gtk_drag_set_icon_default(context);
}
/* custom compare functions for sorting */
-static gint summary_cmp_by_mark(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags);
-}
-
-static gint summary_cmp_by_unread(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags);
-}
-
-static gint summary_cmp_by_mime(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags);
-}
-
-static gint summary_cmp_by_num(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return msginfo1->msgnum - msginfo2->msgnum;
-}
-
-static gint summary_cmp_by_size(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return msginfo1->size - msginfo2->size;
-}
-
-static gint summary_cmp_by_date(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return msginfo1->date_t - msginfo2->date_t;
-}
-
-static gint summary_cmp_by_from(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- if (!msginfo1->fromname)
- return (msginfo2->fromname != NULL);
- if (!msginfo2->fromname)
- return -1;
-
- return strcasecmp(msginfo1->fromname, msginfo2->fromname);
-}
-
-static gint summary_cmp_by_to(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
+#define CMP_FUNC_DEF(func_name, val) \
+static gint func_name(GtkCList *clist, \
+ gconstpointer ptr1, gconstpointer ptr2) \
+{ \
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data; \
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data; \
+ \
+ if (!msginfo1 || !msginfo2) \
+ return -1; \
+ \
+ return (val); \
+}
+
+CMP_FUNC_DEF(summary_cmp_by_mark,
+ MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_status,
+ MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_mime,
+ MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_label,
+ MSG_GET_COLORLABEL(msginfo1->flags) -
+ MSG_GET_COLORLABEL(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_locked,
+ MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags))
+
+CMP_FUNC_DEF(summary_cmp_by_num, msginfo1->msgnum - msginfo2->msgnum)
+CMP_FUNC_DEF(summary_cmp_by_size, msginfo1->size - msginfo2->size)
+CMP_FUNC_DEF(summary_cmp_by_date, msginfo1->date_t - msginfo2->date_t)
+
+#undef CMP_FUNC_DEF
+#define CMP_FUNC_DEF(func_name, var_name) \
+static gint func_name(GtkCList *clist, \
+ gconstpointer ptr1, gconstpointer ptr2) \
+{ \
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data; \
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data; \
+ \
+ if (!msginfo1->var_name) \
+ return (msginfo2->var_name != NULL); \
+ if (!msginfo2->var_name) \
+ return -1; \
+ \
+ return strcasecmp(msginfo1->var_name, msginfo2->var_name); \
+}
+
+CMP_FUNC_DEF(summary_cmp_by_to, to);
+
+#undef CMP_FUNC_DEF
+
+static gint summary_cmp_by_subject(GtkCList *clist, \
+ gconstpointer ptr1, \
+ gconstpointer ptr2) \
+{ \
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data; \
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data; \
+ \
+ if (!msginfo1->subject) \
+ return (msginfo2->subject != NULL); \
+ if (!msginfo2->subject) \
+ return -1; \
+ \
+ return subject_compare_for_sort \
+ (msginfo1->subject, msginfo2->subject); \
+}
+
+ static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
+ gconstpointer ptr2)
+ {
const gchar *str1, *str2;
const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
if (!str1)
return str2 != NULL;
-
+
if (!str2)
- return -1;
-
- if (g_strncasecmp(str1, "-->", 3) == 0)
- str1 += 3;
- if (g_strncasecmp(str2, "-->", 3) == 0)
- str2 += 3;
-
+ return -1;
+
return strcasecmp(str1, str2);
-}
-
-static gint summary_cmp_by_subject(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- if (!msginfo1->subject)
- return (msginfo2->subject != NULL);
- if (!msginfo2->subject)
- return -1;
-
- return strcasecmp(msginfo1->subject, msginfo2->subject);
-}
-
-static gint summary_cmp_by_simplified_subject
+ }
+
+ static gint summary_cmp_by_simplified_subject
(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
{
- const PrefsFolderItem *prefs;
+ const FolderItemPrefs *prefs;
const gchar *str1, *str2;
const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
return strcasecmp(str1, str2);
}
-static gint summary_cmp_by_label(GtkCList *clist,
+static gint summary_cmp_by_score(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+ int diff;
- return MSG_GET_COLORLABEL(msginfo1->flags) -
- MSG_GET_COLORLABEL(msginfo2->flags);
+ /* if score are equal, sort by date */
+
+ diff = msginfo1->threadscore - msginfo2->threadscore;
+ if (diff != 0)
+ return diff;
+ else
+ return summary_cmp_by_date(clist, ptr1, ptr2);
}
static void news_flag_crosspost(MsgInfo *msginfo)
GString *line;
gpointer key;
gpointer value;
- Folder *mff = msginfo->folder->folder;
+ Folder *mff;
+
+ g_return_if_fail(msginfo != NULL);
+ g_return_if_fail(msginfo->folder != NULL);
+ g_return_if_fail(msginfo->folder->folder != NULL);
+ mff = msginfo->folder->folder;
+ g_return_if_fail(mff->klass->type == F_NEWS);
- if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
+ if (mff->account->mark_crosspost_read) {
line = g_string_sized_new(128);
g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
debug_print("nfcp: checking <%s>", line->str);
debug_print(" <%s>", (gchar *)value);
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- folder_update_item(msginfo->folder, FALSE);
procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
}
g_hash_table_remove(mff->newsart, key);
}
}
-static gint summary_cmp_by_score(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
- int diff;
-
- /* if score are equal, sort by date */
-
- diff = msginfo1->threadscore - msginfo2->threadscore;
- if (diff != 0)
- return diff;
- else
- return summary_cmp_by_date(clist, ptr1, ptr2);
-}
-
-static gint summary_cmp_by_locked(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags);
-}
-
static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
{
SummaryView *summaryview = (SummaryView *) data;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_NEW(msginfo->flags))
- summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags))
- summaryview->unread--;
if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked--;
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
summary_set_row_marks(summaryview, row);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
- for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
- gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_ignore_thread_func), summaryview);
- }
- folder_update_items_when_required(FALSE);
+ folder_item_update_freeze();
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+ gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
+ GTK_CTREE_FUNC(summary_ignore_thread_func),
+ summaryview);
+
+ folder_item_update_thaw();
summary_status_show(summaryview);
}
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_NEW(msginfo->flags))
- summaryview->newmsgs++;
- if (MSG_IS_UNREAD(msginfo->flags))
- summaryview->unread++;
if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked++;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
- for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
- gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_unignore_thread_func), summaryview);
- }
- folder_update_items_when_required(FALSE);
+ folder_item_update_freeze();
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+ gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
+ GTK_CTREE_FUNC(summary_unignore_thread_func),
+ summaryview);
+
+ folder_item_update_thaw();
summary_status_show(summaryview);
}
+static void summary_check_ignore_thread_func
+ (GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+{
+ MsgInfo *msginfo;
+ gint *found_ignore = (gint *) data;
+
+ if (*found_ignore) return;
+ else {
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ *found_ignore = MSG_IS_IGNORE_THREAD(msginfo->flags);
+ }
+}
+
+void summary_toggle_ignore_thread(SummaryView *summaryview)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GList *cur;
+ gint found_ignore = 0;
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+ gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
+ GTK_CTREE_FUNC(summary_check_ignore_thread_func),
+ &found_ignore);
+
+ if (found_ignore)
+ summary_unignore_thread(summaryview);
+ else
+ summary_ignore_thread(summaryview);
+}
+
#if 0 /* OLD PROCESSING */
static gboolean processing_apply_func(GNode *node, gpointer data)
{
stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
/* Threading */
summaryview->threaded = item->threaded;
+ summaryview->thread_collapsed = item->thread_collapsed;
/* Scoring */
+#if 0
if (global_scoring || item->prefs->scoring) {
summaryview->important_score = prefs_common.important_score;
if (item->prefs->important_score >
summaryview->important_score =
item->prefs->important_score;
}
+#endif
}
void summary_save_prefs_to_folderitem(SummaryView *summaryview, FolderItem *item)
/* Threading */
item->threaded = summaryview->threaded;
+ item->thread_collapsed = summaryview->thread_collapsed;
}
-static void summary_update_msg(gpointer source, gpointer data) {
+static gboolean summary_update_msg(gpointer source, gpointer data)
+{
MsgInfoUpdate *msginfo_update = (MsgInfoUpdate *) source;
SummaryView *summaryview = (SummaryView *)data;
GtkCTreeNode *node;
- g_return_if_fail(msginfo_update != NULL);
- g_return_if_fail(summaryview != NULL);
+ g_return_val_if_fail(msginfo_update != NULL, TRUE);
+ g_return_val_if_fail(summaryview != NULL, FALSE);
- node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
-
- if (node)
- summary_set_row_marks(summaryview, node);
+ if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
+ node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
+
+ if (node)
+ summary_set_row_marks(summaryview, node);
+ }
+
+ return FALSE;
}
-/*
- * End of Source.
+/*!
+ *\brief change summaryview to display your answer(s) to a message
+ *
+ *\param summaryview The SummaryView ;)
+ *\param msginfo The message for which answers are searched
+ *
*/
+static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
+{
+ FolderItem *sent_folder = NULL;
+ PrefsAccount *account = NULL;
+ GtkCTreeNode *node = NULL;
+ char *buf = NULL;
+ if (msg == NULL || msg->msgid == NULL)
+ return;
+
+ account = account_get_reply_account(msg, prefs_common.reply_account_autosel);
+ if (account == NULL)
+ return;
+ sent_folder = account_get_special_folder
+ (account, F_OUTBOX);
+
+ buf = g_strdup_printf("inreplyto matchcase \"%s\"", msg->msgid);
+
+ if (sent_folder != summaryview->folder_item) {
+ folderview_select(summaryview->mainwin->folderview, sent_folder);
+ }
+
+ gtk_option_menu_set_history(GTK_OPTION_MENU(summaryview->search_type_opt),
+ S_SEARCH_EXTENDED);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summaryview->toggle_search), TRUE);
+
+ gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), buf);
+ g_free(buf);
+ summary_show(summaryview, summaryview->folder_item);
+ node = gtk_ctree_node_nth(GTK_CTREE(summaryview->ctree), 0);
+ if (node)
+ summary_select_node(summaryview, node, TRUE, TRUE);
+}
projects / claws.git / blobdiff