#include <glib.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkpixmap.h>
#include "addressbook.h"
#include "addr_compl.h"
#include "scoring.h"
+#include "prefs_folder_item.h"
#include "pixmaps/dir-open.xpm"
#include "pixmaps/mark.xpm"
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
{N_("/Reply to a_ll"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ {N_("/Reply to author"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_AUTHOR, NULL},
{N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
{N_("/Forward as an a_ttachment"),
NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
GtkWidget *toggle_arrow;
GtkWidget *popupmenu;
GtkItemFactory *popupfactory;
- GtkBindingSet *binding_set;
gint n_entries;
gint i;
"<SummaryView>", &popupfactory,
summaryview);
- /* bind keys */
- binding_set = gtk_binding_set_by_class
- (GTK_CLIST_CLASS(GTK_OBJECT(ctree)->klass));
-
- gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
- "scroll_vertical", 2,
- GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
- GTK_TYPE_FLOAT, 0.0);
- gtk_binding_entry_add_signal(binding_set, GDK_p, GDK_CONTROL_MASK,
- "scroll_vertical", 2,
- GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
- GTK_TYPE_FLOAT, 0.0);
- gtk_binding_entry_clear(binding_set, GDK_space, 0);
-
/* connect signals */
gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
GTK_SIGNAL_FUNC(summary_selected), summaryview);
STATUSBAR_POP(summaryview->mainwin);
- is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
+ is_refresh = (!prefs_common.open_inbox_on_inc &&
+ item == summaryview->folder_item) ? TRUE : FALSE;
if (is_refresh) {
prev_msgnum = summary_get_current_msgnum(summaryview);
if (prev_msgnum < 1)
return FALSE;
} else
#endif
- summary_write_cache(summaryview);
+ if (!is_refresh)
+ summary_write_cache(summaryview);
gtk_clist_freeze(GTK_CLIST(ctree));
sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
menu_set_sensitive(ifactory, "/Reply", sens);
menu_set_sensitive(ifactory, "/Reply to all", sens);
+ menu_set_sensitive(ifactory, "/Reply to author", sens);
menu_set_sensitive(ifactory, "/Forward", sens);
menu_set_sensitive(ifactory, "/Forward as an attachment", sens);
menu_set_sensitive(ifactory, "/Open in new window", sens);
menu_set_sensitive(ifactory, "/View source", sens);
menu_set_sensitive(ifactory, "/Show all header", sens);
- if (summaryview->folder_item->stype == F_DRAFT)
+ if ((summaryview->folder_item->stype == F_DRAFT) ||
+ (summaryview->folder_item->stype == F_OUTBOX) ||
+ (summaryview->folder_item->stype == F_QUEUE))
menu_set_sensitive(ifactory, "/Reedit", sens);
menu_set_sensitive(ifactory, "/Save as...", sens);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCListCompareFunc cmp_func;
+ if (!summaryview->folder_item)
+ return;
+
switch (type) {
case SORT_BY_NUMBER:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_num;
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
+ MsgInfo *parentinfo;
+ MsgInfo *cur_msginfo;
GtkCTreeNode *node, *parent;
gchar *text[N_SUMMARY_COLS];
GHashTable *msgid_table;
+ GSList * cur;
+ GtkCTreeNode *cur_parent;
if (!mlist) return;
if (prefs_common.use_addr_book)
start_address_completion();
+
+ main_window_set_thread_option(summaryview->mainwin);
+
+ for (cur = mlist ; cur != NULL; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ msginfo->threadscore = msginfo->score;
+ }
- if (prefs_common.enable_thread) {
+ /* if (prefs_common.enable_thread) { */
+ if (summaryview->folder_item->prefs->enable_thread) {
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
parent = NULL;
- summary_set_header(text, msginfo);
-
/* search parent node for threading */
- if (msginfo->inreplyto && *msginfo->inreplyto)
+ if (msginfo->inreplyto && *msginfo->inreplyto) {
parent = g_hash_table_lookup
(msgid_table, msginfo->inreplyto);
+ }
+
+ summary_set_header(text, msginfo);
node = gtk_ctree_insert_node
(ctree, parent, NULL, text, 2,
== NULL)
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
+
+ cur_parent = parent;
+ cur_msginfo = msginfo;
+ while (cur_parent != NULL) {
+ parentinfo = gtk_ctree_node_get_row_data(ctree, cur_parent);
+
+ if (!parentinfo)
+ break;
+
+ if (parentinfo->threadscore <
+ cur_msginfo->threadscore) {
+ gchar * s;
+ parentinfo->threadscore =
+ cur_msginfo->threadscore;
+#if 0
+ s = itos(parentinfo->threadscore);
+ gtk_ctree_node_set_text(ctree, cur_parent, S_COL_SCORE, s);
+#endif
+ }
+ else break;
+
+ cur_msginfo = parentinfo;
+ if (cur_msginfo->inreplyto &&
+ *cur_msginfo->inreplyto) {
+ cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
+ }
+ }
}
/* complete the thread */
if (!summaryview->folder_item || !summaryview->folder_item->path)
return -1;
+ if (summaryview->folder_item->folder->update_mark != NULL)
+ summaryview->folder_item->folder->update_mark(summaryview->folder_item->folder, summaryview->folder_item);
+
cachefile = folder_item_get_cache_file(summaryview->folder_item);
g_return_val_if_fail(cachefile != NULL, -1);
if ((fps.cache_fp = fopen(cachefile, "w")) == NULL) {
text[S_COL_MIME] = NULL;
text[S_COL_NUMBER] = itos_buf(col_number, msginfo->msgnum);
text[S_COL_SIZE] = to_human_readable(msginfo->size);
+#if 0
+ text[S_COL_SCORE] = itos_buf(col_score, msginfo->threadscore);
+#else
text[S_COL_SCORE] = itos_buf(col_score, msginfo->score);
+#endif
if (msginfo->date_t) {
procheader_date_get_localtime(date_modified,
text[S_COL_FROM] = msginfo->fromname ? msginfo->fromname :
_("(No From)");
if (prefs_common.swap_from && msginfo->from && msginfo->to &&
- cur_account && cur_account->address) {
+ cur_account && cur_account->address &&
+ !MSG_IS_NEWS(msginfo->flags)) {
gchar *from;
Xalloca(from, strlen(msginfo->from) + 1, return);
_("(No Subject)");
}
+#define CHANGE_FLAGS(msginfo) \
+{ \
+if (msginfo->folder->folder->change_flags != NULL) \
+msginfo->folder->folder->change_flags(msginfo->folder->folder, \
+ msginfo->folder, \
+ msginfo); \
+}
+
static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
gboolean new_window)
{
summaryview->unread--;
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
gtk_clist_thaw(GTK_CLIST(ctree));
summary_status_show(summaryview);
if (!summaryview->selected) return;
if (!summaryview->folder_item ||
- summaryview->folder_item->stype != F_DRAFT) return;
+ (summaryview->folder_item->stype != F_DRAFT &&
+ summaryview->folder_item->stype != F_OUTBOX &&
+ summaryview->folder_item->stype != F_QUEUE)) return;
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
summaryview->selected);
summaryview->copied--;
MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED | MSG_MOVE | MSG_COPY);
MSG_SET_FLAGS(msginfo->flags, MSG_MARKED);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
debug_print(_("Message %d is marked\n"), msginfo->msgnum);
}
summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
/* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
+ summary_status_show(summaryview);
}
static void summary_mark_row_as_read(SummaryView *summaryview,
if (MSG_IS_NEW(msginfo->flags) ||
MSG_IS_UNREAD(msginfo->flags)) {
MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
debug_print(_("Message %d is marked as being read\n"),
msginfo->msgnum);
MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
if (!MSG_IS_UNREAD(msginfo->flags)) {
MSG_SET_FLAGS(msginfo->flags, MSG_UNREAD);
+
gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
unreadxpm, unreadxpmmask);
summaryview->unread++;
debug_print(_("Message %d is marked as unread\n"),
msginfo->msgnum);
}
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
}
MSG_MOVE |
MSG_COPY);
MSG_SET_FLAGS(msginfo->flags, MSG_DELETED);
+
+ CHANGE_FLAGS(msginfo);
+
summaryview->deleted++;
if (!prefs_common.immediate_exec)
MSG_DELETED |
MSG_MOVE |
MSG_COPY);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
debug_print(_("Message %s/%d is unmarked\n"),
MSG_SET_FLAGS(msginfo->flags, MSG_MOVE);
summaryview->moved++;
}
+
if (!prefs_common.immediate_exec)
summary_set_row_marks(summaryview, row);
MSG_SET_FLAGS(msginfo->flags, MSG_COPY);
summaryview->copied++;
}
+
if (!prefs_common.immediate_exec)
summary_set_row_marks(summaryview, row);
strchr(p + 2, '%')) {
alertpanel_error(_("Print command line is invalid:\n`%s'"),
cmdline);
+ g_free(cmdline);
return;
}
(ctree, GTK_CTREE_NODE(cur->data));
if (msginfo) procmsg_print_message(msginfo, cmdline);
}
+
+ g_free(cmdline);
}
void summary_execute(SummaryView *summaryview)
gtk_clist_freeze(clist);
- if (prefs_common.enable_thread)
+ if (summaryview->folder_item->prefs->enable_thread)
+ /* if (prefs_common.enable_thread) */
summary_unthread_for_exec(summaryview);
summary_execute_move(summaryview);
node = next;
}
- if (prefs_common.enable_thread)
+ if (summaryview->folder_item->prefs->enable_thread)
+ /* if (prefs_common.enable_thread) */
summary_thread_build(summaryview);
summaryview->selected = clist->selection ?
g_slist_append(summaryview->mlist, msginfo);
MSG_UNSET_FLAGS(msginfo->flags, MSG_COPY);
+
summary_set_row_marks(summaryview, node);
}
}
if (!summaryview->mlist) return;
+ for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
+ MsgInfo * msginfo = cur->data;
+ MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+ }
+
folder_item_move_msgs_with_dest(trash, summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
case S_COL_MARK:
if (MSG_IS_MARKED(msginfo->flags)) {
MSG_UNSET_FLAGS(msginfo->flags, MSG_MARKED);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
} else
summary_mark_row(summaryview, row);
switch ((ComposeReplyMode)action) {
case COMPOSE_REPLY:
- compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, FALSE);
break;
case COMPOSE_REPLY_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE);
+ compose_reply(msginfo, TRUE, FALSE, FALSE);
break;
case COMPOSE_REPLY_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE);
+ compose_reply(msginfo, FALSE, FALSE, FALSE);
break;
case COMPOSE_REPLY_TO_ALL:
- compose_reply(msginfo, prefs_common.reply_with_quote, TRUE);
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ TRUE, FALSE);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE);
+ compose_reply(msginfo, TRUE, TRUE, FALSE);
break;
case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE);
+ compose_reply(msginfo, FALSE, TRUE, FALSE);
+ break;
+ case COMPOSE_REPLY_TO_AUTHOR:
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, TRUE);
+ break;
+ case COMPOSE_REPLY_TO_AUTHOR_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, TRUE);
+ break;
+ case COMPOSE_REPLY_TO_AUTHOR_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, TRUE);
break;
case COMPOSE_FORWARD:
- compose_forward(msginfo, FALSE);
+ compose_forward(NULL, msginfo, FALSE);
break;
case COMPOSE_FORWARD_AS_ATTACH:
- compose_forward(msginfo, TRUE);
+ compose_forward(NULL, msginfo, TRUE);
break;
default:
- compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, FALSE);
}
summary_set_marks_selected(summaryview);
GtkMenuShell *menushell;
GtkWidget *menu;
GtkWidget *menuitem;
- GList *child = menushell->children;
+ GList *child;
gboolean found = FALSE;
MsgInfo *msginfo;
gchar *from_address;
menushell = GTK_MENU_SHELL(summaryview->popupmenu);
- g_return_if_fail(GTK_MENU_SHELL(summaryview->popupmenu));
+ g_return_if_fail(menushell != NULL);
+ child = menushell->children;
+ g_return_if_fail(child);
/* we're iterating each menu item searching for the one with
* a "contacts" object data. if not found add the menu,
/* if score are equal, sort by date */
- diff = msginfo1->score - msginfo2->score;
+ diff = msginfo1->threadscore - msginfo2->threadscore;
if (diff != 0)
return diff;
else
projects / claws.git / blobdiff