/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkwidget.h>
#include <string.h>
#include <ctype.h>
-#include "intl.h"
#include "main.h"
#include "menu.h"
#include "mainwindow.h"
#include "imap.h"
#include "addressbook.h"
#include "addr_compl.h"
-#include "scoring.h"
#include "folder_item_prefs.h"
#include "filtering.h"
#include "string_match.h"
#include "toolbar.h"
#include "news.h"
-#include "matcher.h"
-#include "matcher_parser.h"
#include "hooks.h"
#include "description_window.h"
-#include "folder.h"
+#include "folderutils.h"
+#include "quicksearch.h"
+#include "partial_download.h"
#define SUMMARY_COL_MARK_WIDTH 10
#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;
GtkCTreeNode *row,
FolderItem *to_folder);
-static void summary_delete_duplicated_func
- (GtkCTree *ctree,
- GtkCTreeNode *node,
- SummaryView *summaryview);
-
static void summary_execute_move (SummaryView *summaryview);
static void summary_execute_move_func (GtkCTree *ctree,
GtkCTreeNode *node,
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 gint summary_key_pressed (GtkWidget *ctree,
+static gboolean summary_key_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
-static gint summary_searchbar_pressed (GtkWidget *ctree,
- GdkEventKey *event,
- SummaryView *summaryview);
-static void 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,
SummaryView *summaryview);
static void summary_tree_expanded (GtkCTree *ctree,
static void summary_reply_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
-static void summary_execute_cb (SummaryView *summaryview,
- guint action,
- GtkWidget *widget);
static void summary_show_all_header_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
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 news_flag_crosspost (MsgInfo *msginfo);
+static void quicksearch_execute_cb (QuickSearch *quicksearch,
+ gpointer data);
static void tog_searchbar_cb (GtkWidget *w,
gpointer data);
{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..."), "<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"), "X", summary_execute_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Mark/_Mark"), "<shift>asterisk", summary_mark, 0, NULL},
- {N_("/_Mark/_Unmark"), "U", summary_unmark, 0, NULL},
+ {N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
+ {N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL},
{N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Mark/Mark as unr_ead"), "<shift>exclam", summary_mark_as_unread, 0, NULL},
+ {N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL},
{N_("/_Mark/Mark as rea_d"), NULL, summary_mark_as_read, 0, NULL},
{N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
{N_("/_Mark/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Add sender to address boo_k"),
NULL, summary_add_address_cb, 0, NULL},
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"),
"<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..."), "<control>S", summary_save_as, 0, NULL},
- {N_("/_Print..."), NULL, summary_print, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {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_("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 greather than #"),
- "al #", N_("messages whose age is greather 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"),
- "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 *ctree;
GtkWidget *hbox;
GtkWidget *hbox_l;
- GtkWidget *hbox_search;
GtkWidget *statlabel_folder;
GtkWidget *statlabel_select;
GtkWidget *statlabel_msgs;
GtkWidget *toggle_eventbox;
GtkWidget *toggle_arrow;
GtkWidget *popupmenu;
- GtkWidget *search_type_opt;
- GtkWidget *search_type;
- GtkWidget *search_string;
- GtkWidget *search_hbbox;
- GtkWidget *search_description;
- GtkWidget *menuitem;
GtkWidget *toggle_search;
GtkTooltips *search_tip;
GtkItemFactory *popupfactory;
gint n_entries;
+ QuickSearch *quicksearch;
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
/* create status label */
hbox = gtk_hbox_new(FALSE, 0);
-
+ gtk_widget_show(hbox);
+
search_tip = gtk_tooltips_new();
toggle_search = gtk_toggle_button_new();
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
+ prefs_common.show_searchbar);
+ gtk_widget_show(toggle_search);
gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
toggle_search,
gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
hbox_l = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(hbox_l);
gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
statlabel_folder = gtk_label_new("");
+ gtk_widget_show(statlabel_folder);
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
statlabel_select = gtk_label_new("");
+ gtk_widget_show(statlabel_select);
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
/* toggle view button */
toggle_eventbox = gtk_event_box_new();
+ gtk_widget_show(toggle_eventbox);
gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ gtk_widget_show(toggle_arrow);
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_widget_show(statlabel_msgs);
gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
hbox_spc = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(hbox_spc);
gtk_box_pack_end(GTK_BOX(hbox), hbox_spc, FALSE, FALSE, 6);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_widget_show(scrolledwin);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
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);
ctree = summary_ctree_create(summaryview);
+ gtk_widget_show(ctree);
gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CLIST(ctree)->hadjustment);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* quick search */
- hbox_search = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox_search, FALSE, FALSE, 0);
-
- search_type_opt = gtk_option_menu_new();
- gtk_widget_show(search_type_opt);
- gtk_box_pack_start(GTK_BOX(hbox_search), search_type_opt, FALSE, FALSE, 0);
-
- 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);
- MENUITEM_ADD (search_type, menuitem, _("From"), S_SEARCH_FROM);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(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);
- MENUITEM_ADD (search_type, menuitem, _("Extended"), S_SEARCH_EXTENDED);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(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);
- gtk_signal_connect(GTK_OBJECT(search_description), "clicked",
- GTK_SIGNAL_FUNC(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);
+ quicksearch = quicksearch_new();
+ gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(search_string), "focus_in_event",
- GTK_SIGNAL_FUNC(summary_searchbar_focus_evt),
- summaryview);
+ quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
- gtk_signal_connect(GTK_OBJECT(search_string), "focus_out_event",
- GTK_SIGNAL_FUNC(summary_searchbar_focus_evt),
- summaryview);
-
- gtk_signal_connect (GTK_OBJECT(toggle_search), "toggled",
- GTK_SIGNAL_FUNC(tog_searchbar_cb), 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->ctree = ctree;
summaryview->hbox = hbox;
summaryview->hbox_l = hbox_l;
- summaryview->hbox_search = hbox_search;
summaryview->statlabel_folder = statlabel_folder;
summaryview->statlabel_select = statlabel_select;
summaryview->statlabel_msgs = statlabel_msgs;
summaryview->popupmenu = popupmenu;
summaryview->popupfactory = popupfactory;
summaryview->lock_count = 0;
- 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);
+ summaryview->quicksearch = quicksearch;
+
/* CLAWS: need this to get the SummaryView * from
* the CList */
- gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview);
+ g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
gtk_widget_show_all(vbox);
+ gtk_widget_show(vbox);
+
+ if (prefs_common.show_searchbar)
+ quicksearch_show(quicksearch);
+ else
+ quicksearch_hide(quicksearch);
+
return summaryview;
}
void summary_init(SummaryView *summaryview)
{
- GtkStyle *style;
GtkWidget *pixmap;
+ PangoFontDescription *font_desc;
+ gint size;
+ gtk_widget_realize(summaryview->ctree);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
&markxpm, &markxpmmask);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
&gpgsignedxpm, &gpgsignedxpmmask);
- if (!small_style) {
- small_style = gtk_style_copy
- (gtk_widget_get_style(summaryview->ctree));
- if (!smallfont)
- smallfont = gtkut_font_load(SMALL_FONT);
- small_style->font = smallfont;
- small_marked_style = gtk_style_copy(small_style);
- small_marked_style->fg[GTK_STATE_NORMAL] =
- summaryview->color_marked;
- small_deleted_style = gtk_style_copy(small_style);
- small_deleted_style->fg[GTK_STATE_NORMAL] =
- summaryview->color_dim;
- }
+ font_desc = pango_font_description_from_string(NORMAL_FONT);
+ gtk_widget_modify_font(summaryview->ctree, font_desc);
+ pango_font_description_free(font_desc);
+
if (!bold_style) {
bold_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
- if (!boldfont)
- boldfont = gtkut_font_load(BOLD_FONT);
- bold_style->font = boldfont;
+ font_desc = pango_font_description_from_string(BOLD_FONT);
+ if (font_desc) {
+ pango_font_description_free(bold_style->font_desc);
+ bold_style->font_desc = font_desc;
+ }
+
+ pango_font_description_set_weight
+ (bold_style->font_desc, PANGO_WEIGHT_BOLD);
bold_marked_style = gtk_style_copy(bold_style);
bold_marked_style->fg[GTK_STATE_NORMAL] =
summaryview->color_marked;
summaryview->color_dim;
}
- 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);
+ font_desc = pango_font_description_new();
+ size = pango_font_description_get_size
+ (summaryview->statlabel_folder->style->font_desc);
+ pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+ gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
+ gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
+ gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
+ pango_font_description_free(font_desc);
pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
gtk_widget_show(pixmap);
summaryview->quick_search_pixmap = pixmap;
-
+
/* Init summaryview prefs */
summaryview->sort_key = SORT_BY_NONE;
summaryview->sort_type = SORT_ASCENDING;
}
+#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) \
- && (!g_strcasecmp(m->folder->name,item->name)) )
+ && (!g_ascii_strcasecmp(m->folder->name,item->name)) )
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
guint selected_msgnum = 0;
guint displayed_msgnum = 0;
GSList *cur;
+ GSList *not_killed;
if (summary_is_locked(summaryview)) return FALSE;
inc_lock();
summary_lock(summaryview);
- if (item != summaryview->folder_item) {
- /* changing folder, reset search */
- gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), "");
+ if (!prefs_common.summary_quicksearch_sticky
+ && !prefs_common.summary_quicksearch_recurse
+ && !quicksearch_is_running(summaryview->quicksearch)) {
+ quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
}
-
+
/* STATUSBAR_POP(summaryview->mainwin); */
is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
if (summaryview->mainwin->lock_count == 0 &&
(summaryview->moved > 0 || summaryview->copied > 0)) {
AlertValue val;
+ gboolean changed = FALSE;
val = alertpanel(_("Process mark"),
_("Some marks are left. Process it?"),
- _("Yes"), _("No"), _("Cancel"));
+ GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL);
if (G_ALERTDEFAULT == val) {
summary_unlock(summaryview);
summary_execute(summaryview);
summary_lock(summaryview);
+ changed = TRUE;
} else if (G_ALERTALTERNATE == val) {
/* DO NOTHING */
} else {
inc_unlock();
return FALSE;
}
- folder_update_op_count();
+ if (changed || !quicksearch_is_active(summaryview->quicksearch))
+ folder_update_op_count();
}
gtk_clist_freeze(GTK_CLIST(ctree));
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) {
+ if (!item || !item->path || !folder_item_parent(item) || 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));
summary_unlock(summaryview);
inc_unlock();
+ if (item && quicksearch_is_running(summaryview->quicksearch)) {
+ main_window_cursor_wait(summaryview->mainwin);
+ quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+ if (quicksearch_is_active(summaryview->quicksearch))
+ quicksearch_search_subfolders(summaryview->quicksearch,
+ summaryview->folderview,
+ summaryview->folder_item);
+ main_window_cursor_normal(summaryview->mainwin);
+ }
return TRUE;
}
g_free(buf);
+ if (!is_refresh)
+ messageview_clear(summaryview->messageview);
+
summaryview->folder_item = item;
item->opened = TRUE;
- gtk_signal_handler_block_by_data(GTK_OBJECT(ctree), summaryview);
-
buf = g_strdup_printf(_("Scanning folder (%s)..."), item->path);
debug_print("%s\n", buf);
STATUSBAR_PUSH(summaryview->mainwin, buf);
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_prepend(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
summary_set_hide_read_msgs_menu(summaryview, FALSE);
}
- if (strlen(gtk_entry_get_text(GTK_ENTRY(summaryview->search_string))) > 0) {
+ if (quicksearch_is_active(summaryview->quicksearch)) {
GSList *not_killed;
- gint search_type = GPOINTER_TO_INT(gtk_object_get_user_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));
- gchar *searched_header = NULL;
- MatcherList * tmp_list = NULL;
- if (search_type == S_SEARCH_EXTENDED) {
- char *newstr = NULL;
-
- newstr = expand_search_string(search_string);
- if (newstr) {
- tmp_list = matcher_parser_get_cond(newstr);
- g_free(newstr);
- }
- else
- tmp_list = NULL;
- }
-
not_killed = NULL;
for (cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
- switch (search_type) {
- case S_SEARCH_SUBJECT:
- searched_header = msginfo->subject;
- break;
- case S_SEARCH_FROM:
- searched_header = msginfo->from;
- break;
- case S_SEARCH_TO:
- searched_header = msginfo->to;
- break;
- case S_SEARCH_EXTENDED:
- break;
- default:
- debug_print("unknown search type (%d)\n", search_type);
- break;
- }
- if (search_type != S_SEARCH_EXTENDED) {
- if (searched_header && strcasestr(searched_header, search_string) != NULL)
- 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_prepend(not_killed, msginfo);
- else
- procmsg_msginfo_free(msginfo);
- }
+ if (quicksearch_match(summaryview->quicksearch, 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;
+
+ if (quicksearch_is_running(summaryview->quicksearch)) {
+ /* only scan subfolders when quicksearch changed,
+ * not when search is the same and folder changed */
+ main_window_cursor_wait(summaryview->mainwin);
+ quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+ quicksearch_search_subfolders(summaryview->quicksearch,
+ summaryview->folderview,
+ summaryview->folder_item);
+ main_window_cursor_normal(summaryview->mainwin);
}
-
+
g_slist_free(mlist);
mlist = not_killed;
}
-
+
+#if 0
if ((global_scoring || item->prefs->scoring)) {
GSList *not_killed;
gint kill_score;
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);
- if (summaryview->sort_key != SORT_BY_NONE)
- summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
-
- gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), summaryview);
+ g_slist_free(mlist);
gtk_clist_thaw(GTK_CLIST(ctree));
}
} 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) {
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);
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_main_set_sensitive(summaryview->mainwin);
return selection;
}
+/*!
+ *\return MsgInfo * Selected message if there's one selected;
+ * if multiple selected, or none, return NULL.
+ */
+MsgInfo *summary_get_selected_msg(SummaryView *summaryview)
+{
+ /* summaryview->selected may be valid when multiple
+ * messages were selected */
+ GList *sellist = GTK_CLIST(summaryview->ctree)->selection;
+
+ if (sellist == NULL || sellist->next)
+ return NULL;
+
+ return GTKUT_CTREE_NODE_GET_ROW_DATA(sellist->data);
+}
+
GSList *summary_get_selected_msg_list(SummaryView *summaryview)
{
GSList *mlist = NULL;
GtkWidget *menuitem;
gint i;
- main_window_set_menu_sensitive(summaryview->mainwin);
-
static const struct {
gchar *const entry;
SensitiveCond cond;
{"/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},
{"/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_SINGLE_TARGET_EXIST|M_UNLOCKED},
+#if 0
+ {"/Save as..." , M_TARGET_EXIST|M_UNLOCKED},
{"/Print..." , M_TARGET_EXIST|M_UNLOCKED},
{"/Select thread" , M_SINGLE_TARGET_EXIST},
-
+ {"/Select all" , M_TARGET_EXIST},
+#endif
{NULL, 0}
};
+ main_window_set_menu_sensitive(summaryview->mainwin);
+
state = main_window_get_current_state(summaryview->mainwin);
for (i = 0; entry[i].entry != NULL; i++) {
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);
}
void summary_select_prev_unread(SummaryView *summaryview)
{
GtkCTreeNode *node;
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping current\n");
+ skip_cur = TRUE;
+ }
node = summary_find_prev_flagged_msg
- (summaryview, summaryview->selected, MSG_UNREAD, FALSE);
+ (summaryview, summaryview->selected, MSG_UNREAD, skip_cur);
if (!node) {
AlertValue val = 0;
val = alertpanel(_("No more unread messages"),
_("No unread message found. "
"Search from the end?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTDEFAULT;
{
GtkCTreeNode *node = summaryview->selected;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping cur\n");
+ skip_cur = TRUE;
+ }
+
node = summary_find_next_flagged_msg
- (summaryview, node, MSG_UNREAD, FALSE);
+ (summaryview, node, MSG_UNREAD, skip_cur);
if (node)
summary_select_node(summaryview, node, TRUE, FALSE);
val = alertpanel(_("No more unread messages"),
_("No unread message found. "
"Go to next folder?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTDEFAULT;
}
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),
+ g_signal_stop_emission_by_name(G_OBJECT(ctree),
"key_press_event");
folderview_select_next_unread(summaryview->folderview);
return;
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Search from the end?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_NEW, FALSE);
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Go to next folder?"),
- _("Yes"), _("Search again"), _("No"));
+ GTK_STOCK_YES, _("Search again"),
+ GTK_STOCK_NO);
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),
- "key_press_event");
+ g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
folderview_select_next_unread(summaryview->folderview);
return;
} else if (val == G_ALERTALTERNATE)
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
"Search from the end?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_MARKED, TRUE);
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
"Search from the beginning?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_MARKED, TRUE);
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
"Search from the end?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_CLABEL_FLAG_MASK, TRUE);
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
"Search from the beginning?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_CLABEL_FLAG_MASK, TRUE);
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;
}
}
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;
}
}
name = folder_item_get_name(summaryview->folder_item);
- gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), name);
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), name);
g_free(name);
if (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(itstr);
str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
- summaryview->newmsgs,
- summaryview->unread,
- summaryview->messages,
- to_human_readable(summaryview->total_size));
- gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
+ summaryview->folder_item->new_msgs,
+ summaryview->folder_item->unread_msgs,
+ summaryview->folder_item->total_msgs,
+ to_human_readable(summaryview->total_size));
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
}
}
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;
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);
- if(cmp_func != NULL) {
+
+ /* 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..."));
main_window_cursor_wait(summaryview->mainwin);
+ gtk_clist_freeze(clist);
gtk_clist_set_compare_func(clist, cmp_func);
gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
main_window_cursor_normal(summaryview->mainwin);
+ gtk_clist_thaw(clist);
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
}
g_node_destroy(root);
-
+
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
debug_print("\tsubject hash table size = %d\n",
g_hash_table_size(subject_table));
}
+
+ summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
}
static gchar *summary_complete_address(const gchar *addr)
static gchar col_score[11];
static gchar buf[BUFFSIZE];
gint *col_pos = summaryview->col_pos;
+ FolderType ftype = F_UNKNOWN;
text[col_pos[S_COL_MARK]] = NULL;
text[col_pos[S_COL_STATUS]] = NULL;
text[col_pos[S_COL_FROM]] = msginfo->fromname ? msginfo->fromname :
_("(No From)");
- if (prefs_common.swap_from && msginfo->from && msginfo->to &&
- !MSG_IS_NEWS(msginfo->flags)) {
+
+ if (msginfo->folder && msginfo->folder->folder)
+ ftype = msginfo->folder->folder->klass->type;
+
+ if (ftype != F_NEWS && prefs_common.swap_from && msginfo->from && msginfo->to) {
gchar *addr = NULL;
Xstrdup_a(addr, msginfo->from, return);
summary_display_msg_full(summaryview, row, FALSE, FALSE);
}
+static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
+ GtkCTreeNode *row)
+{
+ g_return_if_fail(summaryview != NULL);
+ g_return_if_fail(msginfo != NULL);
+ g_return_if_fail(row != NULL);
+
+ 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(summaryview->ctree));
+ summary_status_show(summaryview);
+ }
+}
+
+typedef struct {
+ MsgInfo *msginfo;
+ SummaryView *summaryview;
+ GtkCTreeNode *row;
+} MarkAsReadData;
+
+static int msginfo_mark_as_read_timeout(void *data)
+{
+ MarkAsReadData *mdata = (MarkAsReadData *)data;
+ if (!mdata)
+ return FALSE;
+
+ if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
+ msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
+ mdata->row);
+
+ g_free(mdata);
+
+ return FALSE;
+}
+
static void summary_display_msg_full(SummaryView *summaryview,
GtkCTreeNode *row,
gboolean new_window, gboolean all_headers)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
- MsgFlags flags;
+ gint val;
if (!new_window) {
if (summaryview->displayed == row)
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- 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);
- 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;
msgview = summaryview->messageview;
summaryview->displayed = row;
- if (!messageview_is_visible(msgview))
+ 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)))
+ GTK_EVENTS_FLUSH();
+ }
+ 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) {
+ if (prefs_common.mark_as_read_delay) {
+ MarkAsReadData *data = g_new0(MarkAsReadData, 1);
+ data->summaryview = summaryview;
+ data->msginfo = msginfo;
+ data->row = row;
+ gtk_timeout_add(prefs_common.mark_as_read_delay * 1000,
+ msginfo_mark_as_read_timeout, data);
+ } else if (new_window || !prefs_common.mark_as_read_on_new_window) {
+ msginfo_mark_as_read(summaryview, msginfo, row);
+ }
+ }
+
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
+ messageview_set_menu_sensitive(summaryview->messageview);
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)
compose_reedit(msginfo);
}
-void summary_step(SummaryView *summaryview, GtkScrollType type)
+gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
- if (summary_is_locked(summaryview)) return;
+ if (summary_is_locked(summaryview)) return FALSE;
if (type == GTK_SCROLL_STEP_FORWARD) {
node = gtkut_ctree_node_next(ctree, summaryview->selected);
if (node)
gtkut_ctree_expand_parent_all(ctree, node);
else
- return;
+ return FALSE;
} else {
if (summaryview->selected) {
node = GTK_CTREE_NODE_PREV(summaryview->selected);
- if (!node) return;
+ if (!node) return FALSE;
}
}
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
(GTK_SCTREE(ctree),
GTK_CTREE_NODE(GTK_CLIST(ctree)->selection->data));
+ return TRUE;
}
void summary_toggle_view(SummaryView *summaryview)
}
gtk_ctree_node_set_foreground
(ctree, row, &summaryview->color_dim);
+ } else if (MSG_IS_MARKED(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+ markxpm, markxpmmask);
} else if (MSG_IS_MOVE(flags)) {
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "o");
if (style)
}
gtk_ctree_node_set_foreground
(ctree, row, &summaryview->color_marked);
+#if 0
} else if ((global_scoring ||
summaryview->folder_item->prefs->scoring) &&
(msginfo->score >= summaryview->important_score) &&
gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
gtk_ctree_node_set_foreground(ctree, row,
&summaryview->color_important);
- } else if (MSG_IS_MARKED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
- markxpm, markxpmmask);
+#endif
} else {
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
}
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)) {
+ } else if (MSG_IS_WITH_ATTACHMENT(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)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
keyxpm, keyxpmmask);
- } else if (MSG_IS_MIME(flags)) {
+ } else if (MSG_IS_WITH_ATTACHMENT(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipxpm, clipxpmmask);
} 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);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
/* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
summary_status_show(summaryview);
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--;
GList *cur;
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
GTK_CTREE_NODE(cur->data));
folder_item_update_thaw();
-
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_status_show(summaryview);
}
GList *cur;
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_lock_row(summaryview,
GTK_CTREE_NODE(cur->data));
folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
summary_status_show(summaryview);
}
GList *cur;
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_unlock_row(summaryview,
GTK_CTREE_NODE(cur->data));
folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
summary_status_show(summaryview);
}
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);
- gtk_clist_thaw(clist);
+ 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);
+ }
folder_item_update_thaw();
+ gtk_clist_thaw(clist);
summary_status_show(summaryview);
}
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++;
- procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED | MSG_FORWARDED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
debug_print("Message %d is marked as unread\n",
msginfo->msgnum);
GList *cur;
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_unread(summaryview,
GTK_CTREE_NODE(cur->data));
folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
summary_status_show(summaryview);
}
g_strdup_printf("%s",
account->address);
- if (g_strcasecmp(from_name, msginfo->from) == 0) {
+ if (g_utf8_collate(from_name, msginfo->from) == 0) {
g_free(from_name);
found = TRUE;
break;
GtkCTreeNode *node;
if (!item) return;
-#if 0
- if (!item || item->folder->type == F_NEWS) return;
-#endif
if (summary_is_locked(summaryview)) return;
/* if current folder is trash, ask for confirmation */
if (item->stype == F_TRASH) {
AlertValue aval;
+ MsgInfo *msginfo;
aval = alertpanel(_("Delete message(s)"),
_("Do you really want to delete message(s) from the trash?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (aval != G_ALERTDEFAULT) return;
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+ GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ partial_mark_for_delete(msginfo);
+ }
+
}
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();
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
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();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
node = summary_find_next_msg(summaryview, sel_last);
if (!node)
main_window_cursor_normal(summaryview->mainwin);
}
-void summary_delete_duplicated(SummaryView *summaryview)
-{
- if (!summaryview->folder_item ||
- FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
- if (summaryview->folder_item->stype == F_TRASH) return;
-
- main_window_cursor_wait(summaryview->mainwin);
- debug_print("Deleting duplicated messages...");
- 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);
-
- if (prefs_common.immediate_exec)
- summary_execute(summaryview);
- else
- summary_status_show(summaryview);
-
- folder_item_update_thaw();
-
- debug_print("done.\n");
- STATUSBAR_POP(summaryview->mainwin);
- main_window_cursor_normal(summaryview->mainwin);
-}
-
-static void summary_delete_duplicated_func(GtkCTree *ctree, GtkCTreeNode *node,
- SummaryView *summaryview)
-{
- GtkCTreeNode *found;
- MsgInfo *msginfo;
- MsgInfo *dup_msginfo;
-
- msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
-
- if (!msginfo || !msginfo->msgid || !*msginfo->msgid) return;
-
- found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
-
- if (found && found != node) {
- dup_msginfo = gtk_ctree_node_get_row_data(ctree, found);
- /* prefer to delete the unread one */
- if ((MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_UNREAD(dup_msginfo->flags))
- || (MSG_IS_UNREAD(msginfo->flags) == MSG_IS_UNREAD(dup_msginfo->flags)))
- summary_delete_row(summaryview, node);
- }
-}
-
static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_status_show(summaryview);
}
if (summary_is_locked(summaryview)) return;
if (summaryview->folder_item == to_folder) {
- alertpanel_notice(_("Destination is same as current folder."));
+ alertpanel_error(_("Destination is same as current folder."));
return;
}
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+
for (cur = GTK_CLIST(summaryview->ctree)->selection;
cur != NULL; cur = cur->next)
summary_move_row_to
(summaryview, GTK_CTREE_NODE(cur->data), to_folder);
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
if (prefs_common.immediate_exec)
if (summary_is_locked(summaryview)) return;
if (summaryview->folder_item == to_folder) {
- alertpanel_notice
+ alertpanel_error
(_("Destination to copy is same as current folder."));
return;
}
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+
for (cur = GTK_CLIST(summaryview->ctree)->selection;
cur != NULL; cur = cur->next)
summary_copy_row_to
(summaryview, GTK_CTREE_NODE(cur->data), to_folder);
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
if (prefs_common.immediate_exec)
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);
}
MsgInfo *msginfo;
gchar *filename = NULL;
gchar *src, *dest;
+ gchar *tmp;
AlertValue aval = 0;
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,
+ conv_get_locale_charset_str(),
+ CS_UTF_8);
+ if (!filename) {
+ g_warning("summary_save_as(): faild to convert character set.");
+ filename = g_strdup(oldstr);
+ }
+ dest = filesel_select_file_save(_("Save as"), filename);
+ g_free(filename);
+ } else
+ dest = filesel_select_file_save(_("Save as"), filename);
+ filename = NULL;
if (!dest) return;
if (is_file_exist(dest)) {
aval = alertpanel(_("Append or Overwrite"),
_("Append or overwrite existing file?"),
- _("Append"), _("Overwrite"), _("Cancel"));
+ _("Append"), _("Overwrite"),
+ GTK_STOCK_CANCEL);
if (aval != 0 && aval != 1)
return;
}
src = procmsg_get_message_file(msginfo);
+ tmp = g_path_get_basename(dest);
+
if ( aval==0 ) { /* append */
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."),
- g_basename(dest));
+ alertpanel_error(_("Can't save the file `%s'."), tmp);
} else { /* overwrite */
if (copy_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."),
- g_basename(dest));
+ alertpanel_error(_("Can't save the file `%s'."), tmp);
}
g_free(src);
-
/*
* If two or more msgs are selected,
if (!msginfo) break;
src = procmsg_get_message_file(msginfo);
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."),
- g_basename(dest));
+ alertpanel_error(_("Can't save the file `%s'."), tmp);
}
g_free(src);
}
+ g_free(dest);
+ g_free(tmp);
}
void summary_print(SummaryView *summaryview)
summary_unthread_for_exec(summaryview);
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
summary_execute_move(summaryview);
summary_execute_copy(summaryview);
summary_execute_delete(summaryview);
folder_item_update_thaw();
-
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
node = GTK_CTREE_NODE(clist->row_list);
for (; node != NULL; node = next) {
next = gtkut_ctree_node_next(ctree, node);
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);
GtkCTreeNode *next;
GtkCTreeNode *parent;
MsgInfo *msginfo;
+ GSList *reflist;
summary_lock(summaryview);
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);
parent = NULL;
- /* alfons - claws seems to prefer subject threading before
- * inreplyto threading. we should look more deeply in this,
- * because inreplyto should have precedence... */
if (msginfo && msginfo->inreplyto) {
parent = g_hash_table_lookup(summaryview->msgid_table,
msginfo->inreplyto);
+
+ if (!parent && msginfo->references) {
+ for (reflist = msginfo->references;
+ reflist != NULL; reflist = reflist->next)
+ if ((parent = g_hash_table_lookup
+ (summaryview->msgid_table,
+ reflist->data)))
+ break;
+ }
}
if (prefs_common.thread_by_subject && parent == NULL) {
if (parent && parent != node) {
gtk_ctree_move(ctree, node, parent, NULL);
- gtk_ctree_expand(ctree, node);
}
node = next;
while (node) {
next = GTK_CTREE_NODE_NEXT(node);
- if (!summaryview->thread_collapsed)
- gtk_ctree_expand(ctree, node);
if (prefs_common.bold_unread &&
GTK_CTREE_ROW(node)->children)
summary_set_row_marks(summaryview, node);
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);
while (node) {
next = GTK_CTREE_ROW(node)->sibling;
if (GTK_CTREE_ROW(node)->children)
- gtk_ctree_expand(ctree, node);
+ gtk_ctree_expand_recursive(ctree, node);
node = next;
}
} else if (prefs_common.bold_unread) {
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_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
-void summary_filter(SummaryView *summaryview)
+void summary_filter(SummaryView *summaryview, gboolean selected_only)
{
- if (!global_processing) {
- alertpanel_error(_("No filter rules defined."));
- return;
- }
-
summary_lock(summaryview);
folder_item_update_freeze();
gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
- if (global_processing == NULL) {
- gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
- GTK_CTREE_FUNC(summary_filter_func),
- summaryview);
-
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
- if (prefs_common.immediate_exec) {
- summary_unlock(summaryview);
- summary_execute(summaryview);
- summary_lock(summaryview);
- } else
- summary_status_show(summaryview);
- }
- else {
+ if (selected_only) {
+ GList *cur;
+
+ for (cur = GTK_CLIST(summaryview->ctree)->selection;
+ cur != NULL; cur = cur->next) {
+ summary_filter_func(GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(cur->data),
+ summaryview);
+ }
+ } else {
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
GTK_CTREE_FUNC(summary_filter_func),
summaryview);
-
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
}
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
folder_item_update_thaw();
debug_print("done.\n");
* CLAWS: summary_show() only valid after having a lock. ideally
* we want the lock to be context aware...
*/
- if (global_processing) {
- summary_show(summaryview, summaryview->folder_item);
- }
+ summary_show(summaryview, summaryview->folder_item);
}
static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
gpointer data)
{
+ MailFilteringData mail_filtering_data;
MsgInfo *msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- filter_message_by_msginfo(global_processing, msginfo);
+ mail_filtering_data.msginfo = msginfo;
+ if (hooks_invoke(MAIL_MANUAL_FILTERING_HOOKLIST, &mail_filtering_data))
+ return;
+
+ 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)
{
- MsgInfo *msginfo;
gchar *header = NULL;
gchar *key = NULL;
+ 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);
+ }
+ else {
+ prefs_filtering_open(&filtering_rules,
+ _("Filtering configuration"),
+ header, key);
+ }
+
+ g_free(header);
+ g_free(key);
+}
+
+void summary_filter_open(SummaryView *summaryview, PrefsFilterType type,
+ gint processing_rule)
+{
+ MsgInfo *msginfo;
+ FolderItem * item;
+
if (!summaryview->selected) return;
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
summaryview->selected);
if (!msginfo) return;
-
- procmsg_get_filter_keyword(msginfo, &header, &key, type);
- prefs_filtering_open(NULL, header, key);
-
- g_free(header);
- g_free(key);
+
+ 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;
main_window_cursor_wait(summaryview->mainwin);
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
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();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
main_window_cursor_normal(summaryview->mainwin);
}
/* 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_ctree_set_expander_style(GTK_CTREE(ctree),
GTK_CTREE_EXPANDER_TRIANGLE);
#endif
- gtk_ctree_set_indent(GTK_CTREE(ctree), 16);
- gtk_object_set_user_data(GTK_OBJECT(ctree), summaryview);
+ gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
+ 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);
#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);
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;
+ summaryview->display_msg = messageview_is_visible(summaryview->messageview);
/* right clicked */
gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
} else if (event->button == 2) {
- summaryview->display_msg = TRUE;
+ summaryview->display_msg = messageview_is_visible(summaryview->messageview);
} else if (event->button == 1) {
if (!prefs_common.emulate_emacs &&
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 TRUE
-
-static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
- SummaryView *summaryview)
+static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(widget);
GtkCTreeNode *node;
MessageView *messageview;
TextView *textview;
+ GtkAdjustment *adj;
+ gboolean mod_pressed;
if (summary_is_locked(summaryview)) return TRUE;
if (!event) return TRUE;
+ if (quicksearch_has_focus(summaryview->quicksearch))
+ return FALSE;
+
switch (event->keyval) {
case GDK_Left: /* Move focus */
+ adj = gtk_scrolled_window_get_hadjustment
+ (GTK_SCROLLED_WINDOW(summaryview->scrolledwin));
+ if (adj->lower != adj->value)
+ break;
+ /* FALLTHROUGH */
case GDK_Escape:
gtk_widget_grab_focus(summaryview->folderview->ctree);
return TRUE;
+ case GDK_Home:
+ case GDK_End:
+ if ((node = summaryview->selected) != NULL) {
+ GtkCTreeNode *next = NULL;
+ next = (event->keyval == GDK_Home)
+ ? gtk_ctree_node_nth(ctree, 0)
+ : gtk_ctree_node_nth(ctree,
+ g_list_length(GTK_CLIST(ctree)->row_list)-1);
+ if (next) {
+ gtk_sctree_select_with_state
+ (GTK_SCTREE(ctree), next, event->state);
+
+ /* Deprecated - what are the non-deprecated equivalents? */
+ if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
+ gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
+ summaryview->selected = next;
+ }
+ }
+ return TRUE;
default:
break;
}
}
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;
+
+ mod_pressed =
+ ((event->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
switch (event->keyval) {
case GDK_space: /* Page down or go to the next */
summaryview->selected);
break;
}
- if (!textview_scroll_page(textview, FALSE))
- summary_select_next_unread(summaryview);
- }
+ if (mod_pressed) {
+ if (!textview_scroll_page(textview, TRUE))
+ summary_select_prev_unread(summaryview);
+ } else {
+ if (!textview_scroll_page(textview, FALSE))
+ summary_select_next_unread(summaryview);
+ }
+ }
break;
case GDK_BackSpace: /* Page up */
textview_scroll_page(textview, TRUE);
summaryview->selected);
break;
}
- 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);
+ textview_scroll_one_line(textview, mod_pressed);
break;
case GDK_Delete:
- RETURN_IF_LOCKED();
BREAK_ON_MODIFIER_KEY();
summary_delete(summaryview);
break;
default:
break;
}
- return TRUE;
-}
-
-static gint summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
- SummaryView *summaryview)
-{
- if (event != NULL && event->keyval == GDK_Return)
- summary_show(summaryview, summaryview->folder_item);
- return TRUE;
-}
-
-static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
- SummaryView *summaryview)
-{
- if (event != NULL && event->in)
- gtk_signal_handler_block_by_func(GTK_OBJECT(summaryview->mainwin->window),
- GTK_SIGNAL_FUNC(mainwindow_key_pressed),
- summaryview->mainwin);
- else
- gtk_signal_handler_unblock_by_func(GTK_OBJECT(summaryview->mainwin->window),
- GTK_SIGNAL_FUNC(mainwindow_key_pressed),
- summaryview->mainwin);
+ return FALSE;
}
-static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
+static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
{
- SummaryView *sw = (SummaryView *)data;
- prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(gtk_object_get_user_data(
- GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
- GTK_MENU(sw->search_type))))));
-
- /* 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);
- }
+ SummaryView *summaryview = data;
- if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
- summary_show(sw, sw->folder_item);
+ summary_show(summaryview, summaryview->folder_item);
}
static void tog_searchbar_cb(GtkWidget *w, gpointer data)
{
SummaryView *summaryview = (SummaryView *)data;
- GtkWidget *hbox= summaryview->hbox_search;
- GtkAllocation size = hbox->allocation;
- GtkAllocation msgview_size = summaryview->messageview->vbox->allocation;
- GtkAllocation parent_size = summaryview->vbox->allocation;
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
prefs_common.show_searchbar = TRUE;
- gtk_widget_show(hbox);
- if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
- && msgview_size.height > 1 && parent_size.height > 1) {
- gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
- -1,msgview_size.height - size.height - SUMMARY_VBOX_SPACING);
- gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
- -1,parent_size.height + size.height + SUMMARY_VBOX_SPACING);
- gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
- }
+ quicksearch_show(summaryview->quicksearch);
} else {
prefs_common.show_searchbar = FALSE;
- gtk_widget_hide(hbox);
- if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
- && msgview_size.height > 1 && parent_size.height > 1) {
- gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
- -1,msgview_size.height + size.height + SUMMARY_VBOX_SPACING);
- gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
- -1,parent_size.height - size.height - SUMMARY_VBOX_SPACING);
- gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
- }
+ quicksearch_hide(summaryview->quicksearch);
}
}
{
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);
+ compose_reply_from_messageview(msgview, msginfo_list, action);
g_slist_free(msginfo_list);
}
-static void summary_execute_cb(SummaryView *summaryview, guint action,
- GtkWidget *widget)
-{
- summary_execute(summaryview);
-}
-
static void summary_show_all_header_cb(SummaryView *summaryview,
guint action, GtkWidget *widget)
{
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,
(ctree, GTK_CTREE_NODE(cur->data));
tmp2 = procmsg_get_message_file(msginfo);
if (!tmp2) continue;
- tmp1 = g_strconcat("file:/", tmp2, NULL);
+ tmp1 = g_strconcat("file://", tmp2, NULL);
g_free(tmp2);
if (!mail_list) {
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))
+ MSG_IS_WITH_ATTACHMENT(msginfo1->flags) - MSG_IS_WITH_ATTACHMENT(msginfo2->flags))
CMP_FUNC_DEF(summary_cmp_by_label,
MSG_GET_COLORLABEL(msginfo1->flags) -
MSG_GET_COLORLABEL(msginfo2->flags))
if (!msginfo2->var_name) \
return -1; \
\
- return strcasecmp(msginfo1->var_name, msginfo2->var_name); \
+ return g_utf8_collate(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_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)
- {
+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;
- const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+ const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
g_return_val_if_fail(sv, -1);
if (!str2)
return -1;
- return strcasecmp(str1, str2);
- }
+ return g_utf8_collate(str1, str2);
+}
- static gint summary_cmp_by_simplified_subject
+static gint summary_cmp_by_simplified_subject
(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
{
const FolderItemPrefs *prefs;
const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
const MsgInfo *msginfo1 = r1->data;
const MsgInfo *msginfo2 = r2->data;
- const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+ const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
g_return_val_if_fail(sv, -1);
g_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
if (!prefs)
return -1;
- return strcasecmp(str1, str2);
+ return subject_compare_for_sort(str1, str2);
}
static gint summary_cmp_by_score(GtkCList *clist,
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);
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--;
GList *cur;
folder_item_update_freeze();
-
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
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();
-
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
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++;
GList *cur;
folder_item_update_freeze();
-
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
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();
-
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
summary_status_show(summaryview);
}
widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
"/View/Hide read messages");
- gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(1));
+ g_object_set_data(G_OBJECT(widget), "dont_toggle",
+ GINT_TO_POINTER(1));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
- gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(0));
+ g_object_set_data(G_OBJECT(widget), "dont_toggle",
+ GINT_TO_POINTER(0));
}
void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
folderview_unselect(summaryview->folderview);
folderview_select(summaryview->folderview, summaryview->folder_item);
+ summary_set_column_titles(summaryview);
}
/*
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)
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;
}
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);
+ quicksearch_set(summaryview->quicksearch, QUICK_SEARCH_EXTENDED, 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);
}
+
+void summaryview_export_mbox_list(SummaryView *summaryview)
+{
+ GSList *list = summary_get_selected_msg_list(summaryview);
+ gchar *mbox = filesel_select_file_save(_("Export to mbox file"), NULL);
+
+ if (mbox == NULL || list == NULL)
+ return;
+
+ export_list_to_mbox(list, mbox);
+
+ g_slist_free(list);
+ g_free(mbox);
+
+}
projects / claws.git / blobdiff