static void summary_set_header (SummaryView *summaryview,
gchar *text[],
MsgInfo *msginfo,
- gboolean *free_from_to);
+ gboolean *free_from);
static void summary_display_msg (SummaryView *summaryview,
GtkCTreeNode *row);
static void summary_display_msg_full (SummaryView *summaryview,
#if 0
void summary_processing(SummaryView *summaryview, GSList * mlist);
#endif
-static void summary_filter_func (GtkCTree *ctree,
- GtkCTreeNode *node,
- gpointer data);
+static void summary_filter_func (MsgInfo *msginfo);
static void summary_colorlabel_menu_item_activate_cb
(GtkWidget *widget,
( (m->msgnum == displayed_msgnum) \
&& (!g_ascii_strcasecmp(m->folder->name,item->name)) )
+static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
+{
+ gboolean show_from = FALSE, show_to = FALSE;
+ gboolean showing_from = FALSE, showing_to = FALSE;
+ gint from_pos = 0, to_pos = 0;
+ SummaryColumnState *col_state = summaryview->col_state;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+ if (!item)
+ return;
+ if (folder_has_parent_of_type(item, F_OUTBOX)
+ || folder_has_parent_of_type(item, F_DRAFT)
+ || folder_has_parent_of_type(item, F_QUEUE))
+ show_to = TRUE;
+ else
+ show_from = TRUE;
+
+ from_pos = summaryview->col_pos[S_COL_FROM];
+ to_pos = summaryview->col_pos[S_COL_TO];
+ showing_from = col_state[from_pos].visible;
+ showing_to = col_state[to_pos].visible;
+
+ if (showing_from && showing_to) {
+ debug_print("showing both\n");
+ return;
+ }
+
+ if (!showing_from && !showing_to) {
+ debug_print("showing none\n");
+ return;
+ }
+
+ debug_print("showing %s %s, must show %s %s\n",
+ showing_from?"From":"",
+ showing_to?"To":"",
+ show_from?"From":"",
+ show_to?"To":"");
+
+ if (showing_from == show_from && showing_to == show_to)
+ return;
+ /* else we'll switch both */
+
+ debug_print("switching columns\n");
+ col_state[from_pos].type = S_COL_TO;
+ col_state[from_pos].visible = show_to;
+
+ col_state[to_pos].type = S_COL_FROM;
+ col_state[to_pos].visible = show_from;
+
+ summaryview->col_pos[S_COL_TO] = from_pos;
+ summaryview->col_pos[S_COL_FROM] = to_pos;
+
+ gtk_clist_set_column_visibility
+ (GTK_CLIST(ctree), from_pos, col_state[from_pos].visible);
+ gtk_clist_set_column_visibility
+ (GTK_CLIST(ctree), to_pos, col_state[to_pos].visible);
+
+ summary_set_column_titles(summaryview);
+}
+
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
if (!summaryview->mainwin)
return FALSE;
+ summary_switch_from_to(summaryview, item);
+
inc_lock();
summary_lock(summaryview);
if (quicksearch_is_active(summaryview->quicksearch)) {
GSList *not_killed;
-
+
not_killed = NULL;
for (cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
+ GTK_EVENTS_FLUSH();
+ if (!quicksearch_is_active(summaryview->quicksearch)) {
+ break;
+ }
}
hidden_removed = TRUE;
if (quicksearch_is_running(summaryview->quicksearch)) {
summaryview->folder_item);
main_window_cursor_normal(summaryview->mainwin);
}
-
+
+ if (!quicksearch_is_active(summaryview->quicksearch)) {
+ debug_print("search cancelled!\n");
+ gtk_clist_thaw(GTK_CLIST(ctree));
+ STATUSBAR_POP(summaryview->mainwin);
+ main_window_cursor_normal(summaryview->mainwin);
+ summary_unlock(summaryview);
+ inc_unlock();
+ summary_show(summaryview, summaryview->folder_item);
+ return FALSE;
+ }
g_slist_free(mlist);
mlist = not_killed;
}
toolbar_main_set_sensitive(summaryview->mainwin);
gtk_clist_thaw(GTK_CLIST(ctree));
-
debug_print("\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
STATUSBAR_POP(summaryview->mainwin);
msginfo = gtk_ctree_node_get_row_data(ctree, node);
/* Find msg with matching flags but ignore messages with
ignore flags, if searching for new or unread messages */
- if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) &&
- (msginfo && (msginfo->flags.perm_flags & flags) != 0))
+ if ((msginfo && (msginfo->flags.perm_flags & flags) != 0) &&
+ !(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags))
+ )
break;
}
gint *col_pos = summaryview->col_pos;
const gchar *msgid = msginfo->msgid;
GHashTable *msgid_table = summaryview->msgid_table;
- gboolean free_from_to = FALSE;
+ gboolean free_from = FALSE;
- summary_set_header(summaryview, text, msginfo, &free_from_to);
+ summary_set_header(summaryview, text, msginfo, &free_from);
gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
NULL, NULL, NULL, NULL, FALSE,
SET_TEXT(S_COL_TO);
/* SET_TEXT(S_COL_SUBJECT); already set by node info */
- if (free_from_to) {
+ if (free_from) {
g_free(text[col_pos[S_COL_FROM]]);
- g_free(text[col_pos[S_COL_TO]]);
text[col_pos[S_COL_FROM]] = NULL;
- text[col_pos[S_COL_TO]] = NULL;
}
#undef SET_TEXT
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
- gboolean free_from_to = FALSE;
+ gboolean free_from = FALSE;
gint *col_pos = summaryview->col_pos;
cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
- summary_set_header(summaryview, text, msginfo, &free_from_to);
+ summary_set_header(summaryview, text, msginfo, &free_from);
node = gtk_sctree_insert_node
(ctree, NULL, node, text, 2,
NULL, NULL, NULL, NULL,
FALSE, FALSE);
- if (free_from_to) {
+ if (free_from) {
g_free(text[col_pos[S_COL_FROM]]);
- g_free(text[col_pos[S_COL_TO]]);
text[col_pos[S_COL_FROM]] = NULL;
- text[col_pos[S_COL_TO]] = NULL;
}
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
}
static void summary_set_header(SummaryView *summaryview, gchar *text[],
- MsgInfo *msginfo, gboolean *free_from_to)
+ MsgInfo *msginfo, gboolean *free_from)
{
static gchar date_modified[80];
static gchar col_score[11];
else
text[col_pos[S_COL_DATE]] = _("(No Date)");
- if (prefs_common.swap_from && msginfo->from && msginfo->to) {
+ if (prefs_common.swap_from && msginfo->from && msginfo->to
+ && !summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible) {
gchar *addr = NULL;
addr = g_strdup(msginfo->from);
)
);
+ text[col_pos[S_COL_TO]] = to_text;
if (!should_swap) {
text[col_pos[S_COL_FROM]] = from_text;
- text[col_pos[S_COL_TO]] = to_text;
- *free_from_to = FALSE;
+ *free_from = FALSE;
} else {
gchar *tmp = NULL;
tmp = g_strconcat("-->", to_text, NULL);
text[col_pos[S_COL_FROM]] = tmp;
- tmp = g_strconcat("<--", from_text, NULL);
- text[col_pos[S_COL_TO]] = tmp;
- *free_from_to = TRUE;
+ *free_from = TRUE;
}
if (summaryview->simplify_subject_preg != NULL)
if (GTK_CLIST(ctree)->selection->next) {
GList *item;
for (item = GTK_CLIST(ctree)->selection->next; item != NULL; item=item->next) {
- msginfo = gtk_ctree_node_get_row_data(ctree, (GtkCTreeNode*)item->data);
+ msginfo = gtk_ctree_node_get_row_data(ctree, GTK_CTREE_NODE(item->data));
if (!msginfo) break;
src = procmsg_get_message_file(msginfo);
if (append_file(src, dest, TRUE) < 0)
void summary_filter(SummaryView *summaryview, gboolean selected_only)
{
+ GSList *mlist = NULL, *cur_list;
summary_lock(summaryview);
folder_item_update_freeze();
for (cur = GTK_CLIST(summaryview->ctree)->selection;
cur != NULL && cur->data != NULL; cur = cur->next) {
- summary_filter_func(GTK_CTREE(summaryview->ctree),
- GTK_CTREE_NODE(cur->data),
- summaryview);
+ mlist = g_slist_prepend(mlist,
+ procmsg_msginfo_new_ref(
+ GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data)));
}
+ mlist = g_slist_reverse(mlist);
} else {
- gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
- GTK_CTREE_FUNC(summary_filter_func),
- summaryview);
+ mlist = folder_item_get_msg_list(summaryview->folder_item);
}
+ for (cur_list = mlist; cur_list; cur_list = cur_list->next) {
+ summary_filter_func((MsgInfo *)cur_list->data);
+ }
+ filtering_move_and_copy_msgs(mlist);
+ for (cur_list = mlist; cur_list; cur_list = cur_list->next) {
+ procmsg_msginfo_free((MsgInfo *)cur_list->data);
+ }
+ g_slist_free(mlist);
+
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
folder_item_update_thaw();
summary_show(summaryview, summaryview->folder_item);
}
-static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
- gpointer data)
+static void summary_filter_func(MsgInfo *msginfo)
{
MailFilteringData mail_filtering_data;
- MsgInfo *msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
mail_filtering_data.msginfo = msginfo;
if (hooks_invoke(MAIL_MANUAL_FILTERING_HOOKLIST, &mail_filtering_data))
static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_FROM);
+ if (summaryview->col_state[summaryview->col_pos[S_COL_FROM]].visible)
+ summary_sort_by_column_click(summaryview, SORT_BY_FROM);
+ else
+ summary_sort_by_column_click(summaryview, SORT_BY_TO);
}
static void summary_to_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_TO);
+ if (summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible)
+ summary_sort_by_column_click(summaryview, SORT_BY_TO);
+ else
+ summary_sort_by_column_click(summaryview, SORT_BY_FROM);
}
static void summary_subject_clicked(GtkWidget *button,
return FALSE;
} else if (gtk_drag_get_source_widget(context) ==
mainwindow_get_mainwindow()->folderview->ctree) {
+ /* no folders */
+ gdk_drag_status(context, 0, time);
+ return FALSE;
+ } else if (gtk_drag_get_source_widget(context) ==
+ summaryview->ctree) {
+ /* not from same folder */
gdk_drag_status(context, 0, time);
return FALSE;
} else {
summary_ignore_thread(summaryview);
}
-#if 0 /* OLD PROCESSING */
-static gboolean processing_apply_func(GNode *node, gpointer data)
-{
- FolderItem *item;
- GSList * processing;
- SummaryView * summaryview = (SummaryView *) data;
-
- if (node == NULL)
- return FALSE;
-
- item = node->data;
- /* prevent from the warning */
- if (item->path == NULL)
- return FALSE;
- processing = item->prefs->processing;
-
-
- if (processing != NULL) {
- gchar * buf;
- GSList * mlist;
- GSList * cur;
-
- buf = g_strdup_printf(_("Processing (%s)..."), item->path);
- debug_print(buf);
- STATUSBAR_PUSH(summaryview->mainwin, buf);
- g_free(buf);
-
- mlist = folder_item_get_msg_list(item);
- for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = cur->next) {
- MsgInfo * msginfo;
-
- msginfo = (MsgInfo *) cur->data;
- filter_message_by_msginfo(processing, msginfo, NULL);
- procmsg_msginfo_free(msginfo);
- }
-
- g_slist_free(mlist);
-
- STATUSBAR_POP(summaryview->mainwin);
- }
-
-
- return FALSE;
-}
-
-void processing_apply(SummaryView * summaryview)
-{
- GList * cur;
-
- for (cur = folder_get_list() ; cur != NULL && cur->data != NULL ; cur = g_list_next(cur)) {
- Folder *folder;
-
- folder = (Folder *) cur->data;
- g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
- processing_apply_func, summaryview);
- }
-}
-#endif
-
void summary_toggle_show_read_messages(SummaryView *summaryview)
{
FolderItemUpdateData source;
projects / claws.git / blobdiff