/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#include "defs.h"
#include "colorlabel.h"
#include "inc.h"
#include "imap.h"
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
#include "addressbook.h"
#else
#include "addressbook-dbus.h"
#include "edittags.h"
#include "manual.h"
#include "manage_window.h"
+#include "avatars.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_STATUS_WIDTH 13
GtkCMCTreeNode *node);
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
- guint action);
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
- guint action);
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
- guint action);
+static void summary_set_hide_menu (SummaryView *summaryview,
+ const gchar *menu_item,
+ guint action);
static GtkCMCTreeNode *summary_find_prev_msg
(SummaryView *summaryview,
gtk_cmclist_thaw(GTK_CMCLIST(summaryview->ctree));
}
+void summary_thaw_with_status(SummaryView *summaryview)
+{
+ if (summaryview) {
+ summary_status_show(summaryview);
+ gtk_cmclist_thaw(GTK_CMCLIST(summaryview->ctree));
+ }
+}
+
void summary_grab_focus(SummaryView *summaryview)
{
if (summaryview)
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
-#if !(GTK_CHECK_VERSION(2,12,0))
- summaryview->tooltips = tips;
-#endif
#define SUMMARY_VBOX_SPACING 3
vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
summaryview->sort_type = SORT_ASCENDING;
/* Init summaryview extra data */
-#ifndef G_OS_WIN32
summaryview->simplify_subject_preg = NULL;
-#endif
summary_clear_list(summaryview);
summary_set_column_titles(summaryview);
summary_colorlabel_menu_create(summaryview, FALSE);
SummaryColumnState *col_state = summaryview->col_state;
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
- if (!item || (prefs_common.layout_mode == VERTICAL_LAYOUT && prefs_common.two_line_vert) )
+ if (!item || ((prefs_common.layout_mode == VERTICAL_LAYOUT || prefs_common.layout_mode == SMALL_LAYOUT) && prefs_common.two_line_vert) )
return;
if (FOLDER_SHOWS_TO_HDR(item))
show_to = TRUE;
buf = NULL;
if (!item || !item->path || !folder_item_parent(item) || item->no_select) {
g_free(buf);
- debug_print("empty folder (%p %s %p %d)\n\n",
+ debug_print("empty folder (%p %s %p %d)\n",
item,
(item && item->path)?item->path:"(null)",
item?folder_item_parent(item):0x0,
item?item->no_select:FALSE);
- summary_set_hide_read_msgs_menu(summaryview, FALSE);
- summary_set_hide_del_msgs_menu(summaryview, FALSE);
- summary_set_hide_read_threads_menu(summaryview, FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages", FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages", FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads", FALSE);
summary_clear_all(summaryview);
summaryview->folder_item = item;
summary_thaw(summaryview);
if (!quicksearch_has_sat_predicate(summaryview->quicksearch)) {
debug_print("search cancelled!\n");
- printf("search cancelled!\n");
summary_thaw(summaryview);
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
quicksearch_has_sat_predicate(summaryview->quicksearch) == FALSE) {
GSList *not_killed;
- summary_set_hide_read_msgs_menu(summaryview, summaryview->folder_item->hide_read_msgs);
- summary_set_hide_del_msgs_menu(summaryview, summaryview->folder_item->hide_del_msgs);
- summary_set_hide_read_threads_menu(summaryview, summaryview->folder_item->hide_read_threads);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+ summaryview->folder_item->hide_read_msgs);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+ summaryview->folder_item->hide_del_msgs);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+ summaryview->folder_item->hide_read_threads);
not_killed = NULL;
for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
if (!msginfo->hidden) {
if (MSG_IS_DELETED(msginfo->flags) && summaryview->folder_item->hide_del_msgs) {
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
continue;
}
if (summaryview->folder_item->hide_read_msgs) {
msginfo->msgnum == displayed_msgnum))
not_killed = g_slist_prepend(not_killed, msginfo);
else
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
} else {
not_killed = g_slist_prepend(not_killed, msginfo);
}
} else
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
hidden_removed = TRUE;
g_slist_free(mlist);
mlist = not_killed;
} else {
- summary_set_hide_read_msgs_menu(summaryview, FALSE);
- summary_set_hide_del_msgs_menu(summaryview, FALSE);
- summary_set_hide_read_threads_menu(summaryview, FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+ FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+ FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+ FALSE);
}
if (!hidden_removed) {
if (!msginfo->hidden)
not_killed = g_slist_prepend(not_killed, msginfo);
else
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
g_slist_free(mlist);
mlist = not_killed;
#undef CURRENTLY_DISPLAYED
+static void summary_cancel_mark_read_timeout(SummaryView *summaryview) {
+ if (summaryview->mark_as_read_timeout_tag != 0) {
+ g_source_remove(summaryview->mark_as_read_timeout_tag);
+ summaryview->mark_as_read_timeout_tag = 0;
+ }
+}
void summary_clear_list(SummaryView *summaryview)
{
summaryview->folder_item = NULL;
}
+ summary_cancel_mark_read_timeout(summaryview);
+
summaryview->display_msg = FALSE;
summaryview->selected = NULL;
#ifndef GENERIC_UMPC
FILL_TABLE("Menus/SummaryViewPopup/Print", M_TARGET_EXIST);
#endif
- FILL_TABLE(NULL, 0);
+ FILL_TABLE(NULL, -1);
#undef FILL_TABLE
if (i != N_ENTRIES)
g_error("summaryview menu entry table size mismatch (%d/%d)", i, N_ENTRIES);
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
- if (val == G_ALERTALTERNATE) {
- folderview_select_next_unread(summaryview->folderview, TRUE);
- return;
- }
- else
- return;
- } else
+ if (val == G_ALERTALTERNATE)
+ folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD, TRUE);
+ } else {
summary_select_node(summaryview, node, TRUE, FALSE);
-
+ }
}
}
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_new(summaryview->folderview);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_NEW, TRUE);
return;
}
else
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_marked(summaryview->folderview);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED, TRUE);
return;
}
else
if (!summaryview->folder_item)
return;
if (node) {
+ summary_cancel_mark_read_timeout(summaryview);
gtkut_ctree_expand_parent_all(ctree, node);
if (do_refresh) {
summary_lock(summaryview);
MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, node);
if (msginfo)
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
static void summary_set_marks_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
msginfo = gtk_cmctree_node_get_row_data(ctree, node);
+ cm_return_if_fail(msginfo != NULL);
+
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
- tooltip = g_strdup_printf(_("<b>Message summary</b>\n"
- "<b>New:</b> %d\n"
- "<b>Unread:</b> %d\n"
- "<b>Total:</b> %d\n"
- "<b>Size:</b> %s\n\n"
- "<b>Marked:</b> %d\n"
- "<b>Replied:</b> %d\n"
- "<b>Forwarded:</b> %d\n"
- "<b>Locked:</b> %d\n"
- "<b>Ignored:</b> %d\n"
- "<b>Watched:</b> %d"),
- n_new, n_unread, n_total,
- to_human_readable((goffset)n_size),
- n_marked,n_replied,n_forwarded,
- n_locked,n_ignored,n_watched);
+ tooltip = g_strdup_printf("<b>%s</b>\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %s\n\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d",
+ _("Message summary"),
+ _("New:"), n_new,
+ _("Unread:"), n_unread,
+ _("Total:"), n_total,
+ _("Size:"), to_human_readable((goffset)n_size),
+ _("Marked:"), n_marked,
+ _("Replied:"), n_replied,
+ _("Forwarded:"), n_forwarded,
+ _("Locked:"), n_locked,
+ _("Ignored:"), n_ignored,
+ _("Watched:"), n_watched);
gtk_widget_set_tooltip_markup(GTK_WIDGET(summaryview->statlabel_msgs),
tooltip);
gtk_box_pack_start(GTK_BOX(hbox), label,
FALSE, FALSE, 0);
- if (summaryview->sort_key == sort_by[type]) {
+ if (summaryview->sort_key == sort_by[type] ||
+ (summaryview->sort_key == SORT_BY_THREAD_DATE &&
+ sort_by[SORT_BY_DATE] && type == S_COL_DATE)) {
arrow = gtk_arrow_new
(summaryview->sort_type == SORT_ASCENDING
? GTK_ARROW_DOWN : GTK_ARROW_UP,
cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_from;
break;
case SORT_BY_SUBJECT:
-#ifndef G_OS_WIN32
if (summaryview->simplify_subject_preg)
cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_simplified_subject;
else
-#endif
cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_subject;
break;
case SORT_BY_SCORE:
gint *col_pos = summaryview->col_pos;
const gchar *msgid = msginfo->msgid;
GHashTable *msgid_table = summaryview->msgid_table;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
summary_set_header(summaryview, text, msginfo);
if (summaryview->col_state[summaryview->col_pos[S_COL_TAGS]].visible)
SET_TEXT(S_COL_TAGS);
- if (vert && prefs_common.two_line_vert)
+ if ((vert_layout || small_layout) && prefs_common.two_line_vert)
g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
#undef SET_TEXT
GHashTable *msgid_table;
GHashTable *subject_table = NULL;
GSList * cur;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
START_TIMING("");
if (!mlist) return;
(ctree, NULL, node, text, 2,
NULL, NULL,
FALSE, FALSE);
- if (vert && prefs_common.two_line_vert)
+ if ((vert_layout || small_layout) && prefs_common.two_line_vert)
g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
gint *col_pos = summaryview->col_pos;
gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
gboolean should_swap = FALSE;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
static const gchar *color_dim_rgb = NULL;
if (!color_dim_rgb)
color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
/* slow! */
if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible ||
- (vert && prefs_common.two_line_vert)) {
+ ((vert_layout || small_layout) && prefs_common.two_line_vert)) {
if (msginfo->date_t && msginfo->date_t > 0) {
procheader_date_get_localtime(date_modified,
sizeof(date_modified),
extract_address(from_text);
}
if (!from_text)
- _("(No From)");
+ from_text = _("(No From)");
} else {
gchar *tmp = summary_complete_address(msginfo->from);
if (tmp) {
from_text = msginfo->from;
else {
from_text = msginfo->from;
- extract_address(from_text);
+ if (from_text)
+ extract_address(from_text);
}
if (!from_text)
- _("(No From)");
+ from_text = _("(No From)");
}
}
to_text = to_text ? to_text : _("(No From)");
}
}
- snprintf(tmp2, BUFFSIZE-1, "--> %s", to_text);
+ snprintf(tmp2, BUFFSIZE-1, "➜ %s", to_text);
tmp2[BUFFSIZE-1]='\0';
text[col_pos[S_COL_FROM]] = tmp2;
}
-#ifndef G_OS_WIN32
if (summaryview->simplify_subject_preg != NULL)
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ?
string_remove_match(tmp3, BUFFSIZE, msginfo->subject,
summaryview->simplify_subject_preg) :
_("(No Subject)");
else
-#endif
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
_("(No Subject)");
- if (vert && prefs_common.two_line_vert) {
+ if ((vert_layout || small_layout) && prefs_common.two_line_vert) {
if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) {
- gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>From: %s, on %s</span>"),
+ gchar *tmp = g_markup_printf_escaped(g_strconcat("%s\n",
+ "<span color='%s' style='italic'>",
+ _("From: %s, on %s"), "</span>", NULL),
text[col_pos[S_COL_SUBJECT]],
color_dim_rgb,
text[col_pos[S_COL_FROM]],
text[col_pos[S_COL_DATE]]);
text[col_pos[S_COL_SUBJECT]] = tmp;
} else {
- gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>To: %s, on %s</span>"),
+ gchar *tmp = g_markup_printf_escaped(g_strconcat("%s\n",
+ "<span color='%s' style='italic'>",
+ _("To: %s, on %s"), "</span>", NULL),
text[col_pos[S_COL_SUBJECT]],
color_dim_rgb,
text[col_pos[S_COL_TO]],
chg->unset_flags, chg->unset_tmp_flags);
break;
default:
- g_warning("shouldn't happen\n");
+ g_warning("unknown change op");
}
g_free(chg);
}
MarkAsReadData *mdata = (MarkAsReadData *)data;
if (!mdata)
return FALSE;
-
+
+ summary_lock(mdata->summaryview);
if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
- mdata->summaryview->selected);
+ mdata->summaryview->selected);
+ procmsg_msginfo_free(&(mdata->msginfo));
- g_free(mdata);
+ mdata->summaryview->mark_as_read_timeout_tag = 0;
+ summary_unlock(mdata->summaryview);
- return FALSE;
+ g_free(mdata);
+ return FALSE;
}
static void summary_display_msg_full(SummaryView *summaryview,
prefs_common.mark_as_read_delay) {
MarkAsReadData *data = g_new0(MarkAsReadData, 1);
data->summaryview = summaryview;
- data->msginfo = msginfo;
-#if GLIB_CHECK_VERSION(2,14,0)
- g_timeout_add_seconds(prefs_common.mark_as_read_delay,
- msginfo_mark_as_read_timeout, data);
-#else
- g_timeout_add(prefs_common.mark_as_read_delay * 1000,
- msginfo_mark_as_read_timeout, data);
-#endif
+ data->msginfo = procmsg_msginfo_new_ref(msginfo);
+ if (summaryview->mark_as_read_timeout_tag != 0)
+ g_source_remove(summaryview->mark_as_read_timeout_tag);
+ summaryview->mark_as_read_timeout_tag =
+ g_timeout_add_seconds(prefs_common.mark_as_read_delay,
+ 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);
}
msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
source_window_show_msg(srcwin, msginfo);
source_window_show(srcwin);
-#ifdef MAEMO
- maemo_window_full_screen_if_needed(GTK_WINDOW(srcwin->window));
- maemo_connect_key_press_to_mainwindow(GTK_WINDOW(srcwin->window));
-#endif
}
void summary_reedit(SummaryView *summaryview)
if (prefs_common.ask_mark_all_read) {
val = alertpanel_full(_("Mark all as read"),
_("Do you really want to mark all mails in this "
- "folder as read ?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
+ "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
if (!prefs_common.immediate_exec &&
!folder_has_parent_of_type(summaryview->folder_item, F_TRASH)) {
summary_set_row_marks(summaryview, row);
- } else if (summaryview->folder_item->folder->account && !summaryview->folder_item->folder->account->imap_use_trash) {
- summary_set_row_marks(summaryview, row);
}
debug_print("Message %s/%d is set to delete\n",
msginfo->folder->path, msginfo->msgnum);
AlertValue aval;
MsgInfo *msginfo;
gboolean froze = FALSE;
- gboolean show = FALSE;
if (!item) return;
if (summary_is_locked(summaryview)) return;
if (!summaryview->folder_item) return;
+
+ START_LONG_OPERATION(summaryview, FALSE);
- if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
- if (!prefs_common.live_dangerously) {
- gchar *buf = NULL;
- int num = g_list_length(GTK_CMCLIST(summaryview->ctree)->selection);
- buf = g_strdup_printf(ngettext(
- "Do you really want to delete the selected message?",
- "Do you really want to delete the %d selected messages?", num),
- num);
- aval = alertpanel(_("Delete message(s)"),
- buf,
- GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
- g_free(buf);
- if (aval != G_ALERTALTERNATE) return;
+ if (!prefs_common.live_dangerously) {
+ gchar *buf = NULL;
+ int num = g_list_length(GTK_CMCLIST(summaryview->ctree)->selection);
+ buf = g_strdup_printf(ngettext(
+ "Do you really want to delete the selected message?",
+ "Do you really want to delete the %d selected messages?", num),
+ num);
+ aval = alertpanel(ngettext("Delete message", "Delete messages", num),
+ buf,
+ GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
+ g_free(buf);
+ if (aval != G_ALERTALTERNATE) {
+ END_LONG_OPERATION(summaryview);
+ return;
}
}
/* next code sets current row focus right. We need to find a row
* that is not deleted. */
- START_LONG_OPERATION(summaryview, FALSE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
sel_last = GTK_CMCTREE_NODE(cur->data);
folder_item_set_batch(summaryview->folder_item, FALSE);
END_LONG_OPERATION(summaryview);
- node = summary_find_next_msg(summaryview, sel_last);
- if (!node)
+ if (summaryview->sort_type == SORT_ASCENDING) {
+ node = summary_find_next_msg(summaryview, sel_last);
+ if (!node || prefs_common.next_on_delete == FALSE)
+ node = summary_find_prev_msg(summaryview, sel_last);
+ } else {
node = summary_find_prev_msg(summaryview, sel_last);
-
- show = (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
- ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
- messageview_is_visible(summaryview->messageview)));
-
- summary_select_node(summaryview, node, show, TRUE);
+ if (!node || prefs_common.next_on_delete == FALSE)
+ node = summary_find_next_msg(summaryview, sel_last);
+ }
+ summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
summary_execute(summaryview);
to_folder = summaryview->folder_item->folder->trash;
if (to_folder == NULL || to_folder == summaryview->folder_item
- || folder_has_parent_of_type(summaryview->folder_item, F_TRASH)
- || (summaryview->folder_item->folder->account && !summaryview->folder_item->folder->account->imap_use_trash))
+ || folder_has_parent_of_type(summaryview->folder_item, F_TRASH))
summary_delete(summaryview);
else
summary_move_selected_to(summaryview, to_folder);
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
- } else if (msginfo->folder->folder->account && !msginfo->folder->folder->account->imap_use_trash) {
- summary_set_row_marks(summaryview, row);
}
debug_print("Message %d is set to move to %s\n",
if (prefs_common.immediate_exec) {
summary_execute(summaryview);
} else {
- GtkCMCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
- if (!node)
+ GtkCMCTreeNode *node = NULL;
+ if (summaryview->sort_type == SORT_ASCENDING) {
+ node = summary_find_next_msg(summaryview, sel_last);
+ if (!node || prefs_common.next_on_delete == FALSE)
+ node = summary_find_prev_msg(summaryview, sel_last);
+ } else {
node = summary_find_prev_msg(summaryview, sel_last);
+ if (!node || prefs_common.next_on_delete == FALSE)
+ node = summary_find_next_msg(summaryview, sel_last);
+ }
summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
summary_status_show(summaryview);
}
if (!summaryview->folder_item ||
FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
- to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
- FOLDER_SEL_MOVE, NULL, FALSE);
+ to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE);
summary_move_selected_to(summaryview, to_folder);
}
if (!summaryview->folder_item) return;
- to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
- FOLDER_SEL_COPY, NULL, FALSE);
+ to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
summary_copy_selected_to(summaryview, to_folder);
}
{
MsgInfo *msginfo, *full_msginfo;
gchar *from;
- GtkWidget *image = NULL;
GdkPixbuf *picture = NULL;
+ AvatarRender *avatarr;
msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
summaryview->selected);
extract_address(from);
full_msginfo = procmsg_msginfo_get_full_info(msginfo);
- if (full_msginfo &&
- full_msginfo->extradata &&
- full_msginfo->extradata->face) {
- image = face_get_from_header(full_msginfo->extradata->face);
- }
-#if HAVE_LIBCOMPFACE
- else if (full_msginfo &&
- full_msginfo->extradata &&
- full_msginfo->extradata->xface) {
- image = xface_get_from_header(full_msginfo->extradata->xface,
- &summaryview->ctree->style->white,
- summaryview->mainwin->window->window);
- }
-#endif
- procmsg_msginfo_free(full_msginfo);
- if (image)
- picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
-#ifndef USE_NEW_ADDRBOOK
+ avatarr = avatars_avatarrender_new(full_msginfo);
+ hooks_invoke(AVATAR_IMAGE_RENDER_HOOKLIST, avatarr);
+
+ procmsg_msginfo_free(&full_msginfo);
+
+ if (avatarr->image)
+ picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image));
+
+#ifndef USE_ALT_ADDRBOOK
addressbook_add_contact(msginfo->fromname, from, NULL, picture);
#else
if (addressadd_selection(msginfo->fromname, from, NULL, picture)) {
debug_print( "addressbook_add_contact - added\n" );
}
#endif
- if (image)
- gtk_widget_destroy(image);
+ avatars_avatarrender_free(avatarr);
}
void summary_select_all(SummaryView *summaryview)
summary_status_show(summaryview);
}
-void summary_select_thread(SummaryView *summaryview, gboolean delete_thread)
+void summary_select_thread(SummaryView *summaryview, gboolean delete_thread,
+ gboolean trash_thread)
{
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
GtkCMCTreeNode *node = NULL;
g_list_free(copy);
END_LONG_OPERATION(summaryview);
- if (delete_thread) {
+ if (trash_thread) {
if (FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS)
summary_delete(summaryview);
else
summary_delete_trash(summaryview);
- }
+ } else if (delete_thread)
+ summary_delete(summaryview);
+
summary_status_show(summaryview);
}
if (node == summaryview->displayed) {
messageview_clear(summaryview->messageview);
+ summary_cancel_mark_read_timeout(summaryview);
summaryview->displayed = NULL;
}
if (GTK_CMCTREE_ROW(node)->children != NULL) {
if (!new_selected &&
gtkut_ctree_node_is_selected(ctree, node)) {
summary_unselect_all(summaryview);
- new_selected = summary_find_next_msg(summaryview, node);
- if (!new_selected)
- new_selected = summary_find_prev_msg
- (summaryview, node);
+ if (summaryview->sort_type == SORT_ASCENDING) {
+ new_selected = summary_find_next_msg(summaryview, node);
+ if (!new_selected || prefs_common.next_on_delete == FALSE)
+ new_selected = summary_find_prev_msg(summaryview, node);
+ } else {
+ new_selected = summary_find_prev_msg(summaryview, node);
+ if (!new_selected || prefs_common.next_on_delete == FALSE)
+ new_selected = summary_find_next_msg(summaryview, node);
+ }
}
gtk_sctree_remove_node((GtkSCTree *)ctree, node);
if (node == summaryview->displayed) {
messageview_clear(summaryview->messageview);
+ summary_cancel_mark_read_timeout(summaryview);
summaryview->displayed = NULL;
}
if (GTK_CMCTREE_ROW(node)->children != NULL) {
return TRUE;
}
-static void summary_set_deleted_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
- gpointer data)
-{
- SummaryView *summaryview = data;
- MsgInfo *msginfo;
-
- msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
-
- if (msginfo && MSG_IS_MOVE(msginfo->flags)) {
- msginfo->flags.tmp_flags &= ~ MSG_MOVE;
- msginfo->flags.perm_flags |= MSG_DELETED;
- summary_set_row_marks(summaryview, node);
- summaryview->moved--;
- summaryview->deleted++;
- }
-}
-
static gint summary_execute_move(SummaryView *summaryview)
{
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST,
summary_update_msg, (gpointer) summaryview);
- if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
- for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
- procmsg_msginfo_free((MsgInfo *)cur->data);
- }
- if (summaryview->folder_item->folder->account && !summaryview->folder_item->folder->account->imap_use_trash) {
- gtk_cmctree_pre_recursive(ctree, NULL, summary_set_deleted_func,
- summaryview);
+ for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ procmsg_msginfo_free((MsgInfo **)&(cur->data));
}
+
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
return val;
if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
summaryview->mlist =
g_slist_prepend(summaryview->mlist, msginfo);
- if (!summaryview->folder_item->folder->account ||
- summaryview->folder_item->folder->account->imap_use_trash) {
- gtk_cmctree_node_set_row_data(ctree, node, NULL);
-
- if (msginfo->msgid && *msginfo->msgid &&
- node == g_hash_table_lookup(summaryview->msgid_table,
- msginfo->msgid))
- g_hash_table_remove(summaryview->msgid_table,
- msginfo->msgid);
- if (prefs_common.thread_by_subject &&
- msginfo->subject && *msginfo->subject &&
- node == subject_table_lookup(summaryview->subject_table,
- msginfo->subject)) {
- subject_table_remove(summaryview->subject_table,
- msginfo->subject);
- }
+ gtk_cmctree_node_set_row_data(ctree, node, NULL);
+
+ if (msginfo->msgid && *msginfo->msgid &&
+ node == g_hash_table_lookup(summaryview->msgid_table,
+ msginfo->msgid))
+ g_hash_table_remove(summaryview->msgid_table,
+ msginfo->msgid);
+ if (prefs_common.thread_by_subject &&
+ msginfo->subject && *msginfo->subject &&
+ node == subject_table_lookup(summaryview->subject_table,
+ msginfo->subject)) {
+ subject_table_remove(summaryview->subject_table,
+ msginfo->subject);
}
}
}
summaryview->mlist = NULL;
}
summaryview->msginfo_update_callback_id =
- hooks_register_hook(MSGINFO_UPDATE_HOOKLIST,
+ hooks_register_hook(MSGINFO_UPDATE_HOOKLIST,
summary_update_msg, (gpointer) summaryview);
}
GSList *cur;
/* search deleting messages and execute */
- if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
- gtk_cmctree_pre_recursive
- (ctree, NULL, summary_execute_delete_func, summaryview);
- }
+ gtk_cmctree_pre_recursive
+ (ctree, NULL, summary_execute_delete_func, summaryview);
+
if (!summaryview->mlist) return;
hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
summaryview->msginfo_update_callback_id =
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST,
summary_update_msg, (gpointer) summaryview);
- if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
- for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
- procmsg_msginfo_free((MsgInfo *)cur->data);
+
+ for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ procmsg_msginfo_free((MsgInfo **)&(cur->data));
}
+
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST,
summary_update_msg, (gpointer) summaryview);
for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
- procmsg_msginfo_free((MsgInfo *)cur->data);
+ procmsg_msginfo_free((MsgInfo **)&(cur->data));
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
if (node == summaryview->displayed)
summaryview->displayed = NULL;
+ summary_cancel_mark_read_timeout(summaryview);
+
for (top_parent = node;
GTK_CMCTREE_ROW(top_parent)->parent != NULL;
top_parent = GTK_CMCTREE_ROW(top_parent)->parent)
filtering_move_and_copy_msgs(mlist);
for (cur_list = mlist; cur_list; cur_list = cur_list->next) {
- procmsg_msginfo_free((MsgInfo *)cur_list->data);
+ procmsg_msginfo_free((MsgInfo **)&(cur_list->data));
}
g_slist_free(mlist);
}
}
} else
- g_warning("invalid number of color elements (%d)\n", n);
+ g_warning("invalid number of color elements (%d)", n);
/* reset "dont_toggle" state */
g_object_set_data(G_OBJECT(menu), "dont_toggle",
accel_path = g_strdup_printf("<ClawsColorLabels>/None");
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
g_free(accel_path);
-#if !GTK_CHECK_VERSION(2, 24, 0)
- gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
-#else
gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
-#endif
item = gtk_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
if (i < 9)
-#if !GTK_CHECK_VERSION(2, 24, 0)
- gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
-#else
gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
-#endif
g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
void summaryview_destroy(SummaryView *summaryview)
{
-#ifndef G_OS_WIN32
if(summaryview->simplify_subject_preg) {
regfree(summaryview->simplify_subject_preg);
g_free(summaryview->simplify_subject_preg);
summaryview->simplify_subject_preg = NULL;
}
-#endif
}
static void summary_tags_menu_item_apply_tags_activate_cb(GtkWidget *widget,
gpointer data)
return tag_b == NULL ? 0:1;
if (tag_b == NULL)
- return tag_a == NULL ? 0:1;
+ return 1;
return g_utf8_collate(tag_a, tag_b);
}
gchar *formatted = NULL;
MsgInfo *info = NULL;
GdkRectangle rect;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
if (!prefs_common.show_tooltips)
return FALSE;
formatted = g_strdup(text);
g_strstrip(formatted);
- if (!vert)
- gtk_tooltip_set_text (tooltip, formatted);
- else if (prefs_common.two_line_vert)
+ if ((vert_layout || small_layout) && prefs_common.two_line_vert)
gtk_tooltip_set_markup (tooltip, formatted);
+ else
+ gtk_tooltip_set_text (tooltip, formatted);
g_free(formatted);
rect.x = x - 2;
gchar *titles[N_SUMMARY_COLS];
SummaryColumnType type;
gint pos;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
memset(titles, 0, sizeof(titles));
col_state = prefs_summary_column_get_config();
ctree = gtk_sctree_new_with_titles
(N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
- /* get normal row height */
- gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
- normal_row_height = GTK_CMCLIST(ctree)->row_height;
-
if (prefs_common.show_col_headers == FALSE)
gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
FALSE);
if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
(pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
- pos == summaryview->col_pos[S_COL_DATE]) && vert &&
+ pos == summaryview->col_pos[S_COL_DATE]) && (vert_layout || small_layout) &&
prefs_common.two_line_vert)
gtk_cmclist_set_column_visibility
(GTK_CMCLIST(ctree), pos, FALSE);
(GTK_CMCLIST(ctree), pos, col_state[pos].visible);
}
if (prefs_common.two_line_vert)
- gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert);
+ gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert_layout||small_layout);
/* connect signal to the buttons for sorting */
#define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
g_signal_connect(G_OBJECT(ctree), "button_press_event",
G_CALLBACK(summary_button_pressed),
summaryview);
-#ifndef MAEMO
g_signal_connect(G_OBJECT(ctree), "popup-menu",
G_CALLBACK(summary_popup_menu), summaryview);
-#else
- gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL,
- GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
- g_signal_connect(G_OBJECT(ctree), "tap-and-hold",
- G_CALLBACK(summary_popup_menu), summaryview);
-#endif
g_signal_connect(G_OBJECT(ctree), "button_release_event",
G_CALLBACK(summary_button_released),
summaryview);
else
summary_redisplay_msg(summaryview);
- if (prefs_common.layout_mode == VERTICAL_LAYOUT &&
+ /* get normal row height */
+ gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
+ normal_row_height = GTK_CMCLIST(ctree)->row_height;
+
+ if ((prefs_common.layout_mode == SMALL_LAYOUT || prefs_common.layout_mode == VERTICAL_LAYOUT) &&
prefs_common.two_line_vert) {
gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 2*normal_row_height + 2);
- } else {
- gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 0);
}
}
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
+/* Copied from gtkcmclist.c, if it changes there, it has to change
+ * here as well. This is an ugly hack, there must be a better way to
+ * find out how much to move for page up/down. */
+#define CELL_SPACING 1
static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
SummaryView *summaryview)
{
MessageView *messageview;
GtkAdjustment *adj;
gboolean mod_pressed;
+ gfloat row_align = 0;
if (!event)
return TRUE;
gtk_widget_grab_focus(summaryview->folderview->ctree);
mainwindow_exit_folder(summaryview->mainwin);
return TRUE;
- case GDK_KEY_Home:
- case GDK_KEY_End:
+ case GDK_KEY_Home: case GDK_KEY_KP_Home:
+ case GDK_KEY_End: case GDK_KEY_KP_End:
+ case GDK_KEY_Up: case GDK_KEY_KP_Up:
+ case GDK_KEY_Down: case GDK_KEY_KP_Down:
+ case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
+ case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
if ((node = summaryview->selected) != NULL) {
GtkCMCTreeNode *next = NULL;
- next = (event->keyval == GDK_KEY_Home)
- ? gtk_cmctree_node_nth(ctree, 0)
- : gtk_cmctree_node_nth(ctree,
- g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
+ switch (event->keyval) {
+ case GDK_KEY_Home: case GDK_KEY_KP_Home:
+ next = gtk_cmctree_node_nth(ctree, 0);
+ break;
+ case GDK_KEY_End: case GDK_KEY_KP_End:
+ next = gtk_cmctree_node_nth(ctree,
+ g_list_length(GTK_CMCLIST(ctree)->row_list)-1);
+ row_align = 1;
+ break;
+ case GDK_KEY_Up: case GDK_KEY_KP_Up:
+ next = gtk_cmctree_node_nth(ctree,
+ MAX(0, GTK_CMCLIST(ctree)->focus_row - 1));
+ break;
+ case GDK_KEY_Down: case GDK_KEY_KP_Down:
+ next = gtk_cmctree_node_nth(ctree,
+ MIN(GTK_CMCLIST(ctree)->focus_row + 1, GTK_CMCLIST(ctree)->rows));
+ row_align = 1;
+ break;
+ case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
+ next = gtk_cmctree_node_nth(ctree,
+ MAX(0, GTK_CMCLIST(ctree)->focus_row -
+ (2 * GTK_CMCLIST(ctree)->clist_window_height -
+ GTK_CMCLIST(ctree)->row_height - CELL_SPACING) /
+ (2 * (GTK_CMCLIST(ctree)->row_height + CELL_SPACING))));
+ break;
+ case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+ next = gtk_cmctree_node_nth(ctree,
+ MIN(GTK_CMCLIST(ctree)->rows - 1, GTK_CMCLIST(ctree)->focus_row +
+ (2 * GTK_CMCLIST(ctree)->clist_window_height -
+ GTK_CMCLIST(ctree)->row_height - CELL_SPACING) /
+ (2 * (GTK_CMCLIST(ctree)->row_height + CELL_SPACING))));
+ row_align = 1;
+ break;
+ }
+
if (next) {
gtk_sctree_select_with_state
(GTK_SCTREE(ctree), next, (event->state & ~GDK_CONTROL_MASK) );
/* Deprecated - what are the non-deprecated equivalents? */
if (gtk_cmctree_node_is_visible(GTK_CMCTREE(ctree), next) != GTK_VISIBILITY_FULL)
- gtk_cmctree_node_moveto(GTK_CMCTREE(ctree), next, 0, 0, 0);
+ gtk_cmctree_node_moveto(GTK_CMCTREE(ctree), next, 0, row_align, 0);
summaryview->selected = next;
}
}
}
return FALSE;
}
+#undef CELL_SPACING
static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
{
static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
gint column, SummaryView *summaryview)
{
- GList *list, *cur;
+ const GList *list, *cur;
MessageView *msgview;
MsgInfo *msginfo;
gboolean marked_unread = FALSE;
static void summary_date_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_DATE);
+ if (summaryview->sort_key == SORT_BY_THREAD_DATE)
+ summary_sort_by_column_click(summaryview, SORT_BY_THREAD_DATE);
+ else
+ summary_sort_by_column_click(summaryview, SORT_BY_DATE);
}
static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
summary_show(summaryview, summaryview->folder_item);
}
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
- guint action)
-{
- GtkWidget *widget;
-
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadMessages");
- 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);
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(0));
-}
-
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
- guint action)
+static void summary_set_hide_menu (SummaryView *summaryview,
+ const gchar *menu_item,
+ guint action)
{
GtkWidget *widget;
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadThreads");
- 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);
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(0));
-}
-
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
- guint action)
-{
- GtkWidget *widget;
+ widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, menu_item);
+ cm_return_if_fail(widget != NULL);
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideDelMessages");
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);
g_list_free( msgList );
}
-#ifndef G_OS_WIN32
static regex_t *summary_compile_simplify_regexp(gchar *simplify_subject_regexp)
{
int err;
return preg;
}
-#endif
void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *item)
{
FolderSortKey sort_key;
cm_return_if_fail(item != NULL);
/* Subject simplification */
-#ifndef G_OS_WIN32
if(summaryview->simplify_subject_preg) {
regfree(summaryview->simplify_subject_preg);
g_free(summaryview->simplify_subject_preg);
if(item->prefs && item->prefs->simplify_subject_regexp &&
item->prefs->simplify_subject_regexp[0] && item->prefs->enable_simplify_subject)
summaryview->simplify_subject_preg = summary_compile_simplify_regexp(item->prefs->simplify_subject_regexp);
-#endif
+
/* Sorting */
sort_key = item->sort_key;
sort_type = item->sort_type;
guint new, unread, unreadmarked, marked, total;
guint replied, forwarded, locked, ignored, watched;
static gboolean tips_initialized = FALSE;
-#if !(GTK_CHECK_VERSION(2,12,0))
- GtkTooltips *tips = summaryview->tooltips;
-#endif
if (prefs_common.layout_mode != SMALL_LAYOUT) {
if (tips_initialized) {