GtkCTreeNode *node,
gpointer data);
-void summary_set_menu_sensitive (SummaryView *summaryview);
+void summary_set_menu_sensitive (SummaryView *summaryview);
+guint summary_get_msgnum (SummaryView *summaryview,
+ GtkCTreeNode *node);
+
static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
guint action);
-static guint summary_get_msgnum (SummaryView *summaryview,
- GtkCTreeNode *node);
-
static GtkCTreeNode *summary_find_prev_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
( (m->msgnum == displayed_msgnum) \
&& (!g_ascii_strcasecmp(m->folder->name,item->name)) )
+#define FOLDER_SHOWS_TO_HDR(i) \
+( folder_has_parent_of_type(i, F_OUTBOX) \
+ || folder_has_parent_of_type(i, F_DRAFT) \
+ || folder_has_parent_of_type(i, F_QUEUE) )
+
static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
{
gboolean show_from = FALSE, show_to = FALSE;
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))
+ if(FOLDER_SHOWS_TO_HDR(item))
show_to = TRUE;
else
show_from = TRUE;
inc_lock();
summary_lock(summaryview);
+ is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
+
if (!prefs_common.summary_quicksearch_sticky
&& !prefs_common.summary_quicksearch_recurse
- && !quicksearch_is_running(summaryview->quicksearch)) {
+ && !quicksearch_is_running(summaryview->quicksearch)
+ && !is_refresh) {
quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
}
/* STATUSBAR_POP(summaryview->mainwin); */
- is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
-
if (is_refresh) {
selected_msgnum = summary_get_msgnum(summaryview,
summaryview->selected);
if (quicksearch_is_active(summaryview->quicksearch)) {
GSList *not_killed;
-
+ gint num = 0, total = summaryview->folder_item->total_msgs;
+ statusbar_print_all(_("Searching in %s... \n"),
+ summaryview->folder_item->path ?
+ summaryview->folder_item->path : "(null)");
not_killed = NULL;
for (cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
+ statusbar_progress_all(num++,total, 50);
+
if (!msginfo->hidden && quicksearch_match(summaryview->quicksearch, msginfo))
not_killed = g_slist_prepend(not_killed, msginfo);
else
break;
}
}
+ statusbar_progress_all(0,0,0);
+ statusbar_pop_all();
+
hidden_removed = TRUE;
if (quicksearch_is_running(summaryview->quicksearch)) {
/* only scan subfolders when quicksearch changed,
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ if (summary_is_locked(summaryview))
+ return;
if (!summaryview->folder_item)
return;
if (node) {
gtkut_ctree_expand_parent_all(ctree, node);
if (do_refresh) {
+ summary_lock(summaryview);
GTK_EVENTS_FLUSH();
+ summary_unlock(summaryview);
gtk_widget_grab_focus(GTK_WIDGET(ctree));
if (GTK_CTREE_ROW(node) == NULL) {
g_warning("crash avoidance hack 1\n");
}
}
-static guint summary_get_msgnum(SummaryView *summaryview, GtkCTreeNode *node)
+guint summary_get_msgnum(SummaryView *summaryview, GtkCTreeNode *node)
{
GtkCTree *ctree =NULL;
MsgInfo *msginfo;
if (!node)
return 0;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- return msginfo->msgnum;
+ if (msginfo)
+ return msginfo->msgnum;
+ else
+ return -1;
}
static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (msginfo->folder && msginfo->folder->folder &&
+ if (msginfo && msginfo->folder && msginfo->folder->folder &&
msginfo->folder->folder->klass->type == F_NEWS)
news_flag_crosspost(msginfo);
static void summary_set_column_titles(SummaryView *summaryview)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
+ FolderItem *item = summaryview->folder_item;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *arrow;
case S_COL_TO:
case S_COL_DATE:
case S_COL_NUMBER:
+ if(type == S_COL_FROM && item != NULL &&
+ FOLDER_SHOWS_TO_HDR(item))
+ type = S_COL_TO;
if (prefs_common.trans_hdr)
title = gettext(col_label[type]);
else
if (last_font && !strcmp(last_font, NORMAL_FONT))
update_font = FALSE;
- if (last_font)
- g_free(last_font);
+ g_free(last_font);
last_font = g_strdup(NORMAL_FONT);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
+
if (new_window) {
MessageView *msgview;
if (!summaryview->selected) return;
if (!summaryview->folder_item) return;
- if (!folder_has_parent_of_type(summaryview->folder_item, F_OUTBOX)
- && !folder_has_parent_of_type(summaryview->folder_item, F_DRAFT)
- && !folder_has_parent_of_type(summaryview->folder_item, F_QUEUE))
+ if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item))
return;
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags))
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
if (!MSG_IS_LOCKED(msginfo->flags))
return;
procmsg_msginfo_set_to_folder(msginfo, NULL);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
return;
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, row);
- msgs = g_slist_prepend(msgs, msginfo);
+ if (msginfo)
+ msgs = g_slist_prepend(msgs, msginfo);
}
if (procmsg_spam_learner_learn(NULL, msgs, is_spam) == 0) {
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ if (!msginfo)
+ continue;
if (is_spam) {
summary_msginfo_change_flags(msginfo, MSG_SPAM, 0, MSG_NEW|MSG_UNREAD, 0);
if (procmsg_spam_get_folder() != summaryview->folder_item) {
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
if (MSG_IS_DELETED(msginfo->flags)) {
procmsg_msginfo_set_to_folder(msginfo, NULL);
summary_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
if (MSG_IS_LOCKED(msginfo->flags)) return;
cur = cur->next) {
GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (msginfo->total_size != 0 &&
+ if (msginfo && msginfo->total_size != 0 &&
msginfo->size != (off_t)msginfo->total_size)
partial_mark_for_delete(msginfo);
}
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags))
g_return_if_fail(to_folder != NULL);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
if (MSG_IS_LOCKED(msginfo->flags))
return;
g_return_if_fail(to_folder != NULL);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
procmsg_msginfo_set_to_folder(msginfo, to_folder);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
gtk_clist_freeze(clist);
+ main_window_cursor_wait(summaryview->mainwin);
+
if (summaryview->threaded)
summary_unthread_for_exec(summaryview);
(summaryview, node);
}
- gtk_ctree_remove_node(ctree, node);
+ gtk_sctree_remove_node(ctree, node);
}
folder_item_update_thaw();
gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
summary_unlock(summaryview);
-
+
+ main_window_cursor_normal(summaryview->mainwin);
+
if (move_val < 0)
summary_show(summaryview, summaryview->folder_item);
return TRUE;
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
+ return val;
}
- return val;
+ return 0;
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
}
}
-void summary_unthread(SummaryView *summaryview)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- GtkCTreeNode *child;
- GtkCTreeNode *sibling;
- GtkCTreeNode *next_child;
-
- summary_lock(summaryview);
-
- debug_print("Unthreading...");
- STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
- main_window_cursor_wait(summaryview->mainwin);
-
- 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);
- node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
- child = GTK_CTREE_ROW(node)->children;
- sibling = GTK_CTREE_ROW(node)->sibling;
-
- while (child != NULL) {
- next_child = GTK_CTREE_ROW(child)->sibling;
- gtk_ctree_move(ctree, child, NULL, sibling);
- child = next_child;
- }
- }
-
- /* CLAWS: and sort it */
- gtk_sctree_sort_recursive(ctree, NULL);
-
- gtk_clist_thaw(GTK_CLIST(ctree));
- g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
- G_CALLBACK(summary_tree_collapsed), summaryview);
-
- debug_print("done.\n");
- STATUSBAR_POP(summaryview->mainwin);
- main_window_cursor_normal(summaryview->mainwin);
-
- summaryview->threaded = FALSE;
-
- summary_unlock(summaryview);
-}
-
static void summary_unthread_for_exec(SummaryView *summaryview)
{
GtkCTreeNode *node;
gint color_index;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ g_return_if_fail(msginfo);
color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
summary_msginfo_change_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0,
MSG_CLABEL_FLAG_MASK, 0);
if (!sel) return;
menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
+
g_return_if_fail(menu != NULL);
Xalloca(items, (N_COLOR_LABELS + 1) * sizeof(GtkWidget *), return);
g_object_set_data(G_OBJECT(item), "summaryview", summaryview);
gtk_widget_show(item);
+ gtk_widget_add_accelerator(item, "activate",
+ summaryview->popupfactory->accel_group,
+ GDK_0, GDK_CONTROL_MASK,
+ GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
+
item = gtk_menu_item_new();
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, refresh);
+ item = colorlabel_create_check_color_menu_item(
+ i, refresh, SUMMARY_COLORMENU);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(summary_colorlabel_menu_item_activate_cb),
case GDK_Escape:
gtk_widget_grab_focus(summaryview->folderview->ctree);
return TRUE;
- case GDK_Up:
- case GDK_Down:
- if ((node = summaryview->selected) != NULL) {
- GtkCTreeNode *next = NULL;
- do {
- next = (event->keyval == GDK_Down)
- ? gtkut_ctree_node_next(ctree, next ? next:node)
- : gtkut_ctree_node_prev(ctree, next ? next:node);
- } while (next && !gtk_ctree_is_viewable(ctree, next));
-
- 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;
case GDK_Home:
case GDK_End:
if ((node = summaryview->selected) != NULL) {
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
- if (folder_has_parent_of_type(summaryview->folder_item, F_OUTBOX)
- || folder_has_parent_of_type(summaryview->folder_item, F_DRAFT)
- || folder_has_parent_of_type(summaryview->folder_item, F_QUEUE))
+ if (FOLDER_SHOWS_TO_HDR(summaryview->folder_item))
summary_reedit(summaryview);
else
summary_open_msg(summaryview);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
summary_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo);
summary_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
if (*found_ignore) return;
else {
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- *found_ignore = MSG_IS_IGNORE_THREAD(msginfo->flags);
+ *found_ignore = msginfo && MSG_IS_IGNORE_THREAD(msginfo->flags);
}
}
msgList = NULL;
for( cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next ) {
msginfo = gtk_ctree_node_get_row_data( ctree, GTK_CTREE_NODE(cur->data) );
+ if (!msginfo)
+ continue;
msgList = g_list_append( msgList, GUINT_TO_POINTER( msginfo->msgnum ) );
}
addressbook_harvest( summaryview->folder_item, TRUE, msgList );
projects / claws.git / blobdiff