static void summary_add_address_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
+static void summary_create_filter_cb (SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget);
static void summary_mark_clicked (GtkWidget *button,
SummaryView *summaryview);
gconstpointer ptr1,
gconstpointer ptr2);
+static void news_process_crossposted (MsgInfo *msginfo);
+static void news_flag_crosspost (MsgInfo *msginfo);
+
GtkTargetEntry summary_drag_types[1] =
{
{"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Add sender to address boo_k"),
NULL, summary_add_address_cb, 0, NULL},
+ {N_("/Create f_ilter rule"), NULL, NULL, 0, "<Branch>"},
+ {N_("/Create f_ilter rule/_Automatically"),
+ NULL, summary_create_filter_cb, FILTER_BY_AUTO, NULL},
+ {N_("/Create f_ilter rule/by _From"),
+ NULL, summary_create_filter_cb, FILTER_BY_FROM, NULL},
+ {N_("/Create f_ilter rule/by _To"),
+ 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_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/Open in new _window"),
GtkWidget *scrolledwin;
GtkWidget *ctree;
GtkWidget *hbox;
+ GtkWidget *hbox_l;
GtkWidget *statlabel_folder;
GtkWidget *statlabel_select;
GtkWidget *statlabel_msgs;
+ GtkWidget *hbox_spc;
GtkWidget *toggle_view_btn;
GtkWidget *toggle_view_arrow;
GtkWidget *popupmenu;
hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_l = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
+
statlabel_folder = gtk_label_new("");
- gtk_box_pack_start(GTK_BOX(hbox), statlabel_folder, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
statlabel_select = gtk_label_new("");
- gtk_box_pack_start(GTK_BOX(hbox), statlabel_select, FALSE, FALSE, 16);
+ gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
/* toggle view buttons */
toggle_view_btn = gtk_button_new();
statlabel_msgs = gtk_label_new("");
gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
+ hbox_spc = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox), hbox_spc, FALSE, FALSE, 6);
+
/* create popup menu */
n_entries = sizeof(summary_popup_entries) /
sizeof(summary_popup_entries[0]);
summaryview->scrolledwin = scrolledwin;
summaryview->ctree = ctree;
summaryview->hbox = hbox;
+ summaryview->hbox_l = hbox_l;
summaryview->statlabel_folder = statlabel_folder;
summaryview->statlabel_select = statlabel_select;
summaryview->statlabel_msgs = statlabel_msgs;
gtk_widget_set_style(summaryview->statlabel_select, style);
gtk_widget_set_style(summaryview->statlabel_msgs, style);
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
- gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 0);
+ 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_box_reorder_child(GTK_BOX(summaryview->hbox_l), pixmap, 0);
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
val = alertpanel(_("Process mark"),
_("Some marks are left. Process it?"),
_("Yes"), _("No"), _("Cancel"));
- if (G_ALERTDEFAULT == val)
+ if (G_ALERTDEFAULT == val) {
+ summary_unlock(summaryview);
summary_execute(summaryview);
- else if (G_ALERTALTERNATE == val)
+ summary_lock(summaryview);
+ } else if (G_ALERTALTERNATE == val)
summary_write_cache(summaryview);
else {
summary_unlock(summaryview);
g_free(buf);
summaryview->folder_item = item;
+ item->opened = TRUE;
gtk_signal_handler_block_by_data(GTK_OBJECT(ctree), summaryview);
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree),
NULL, summary_free_msginfo_func, NULL);
- summaryview->folder_item = NULL;
+ if (summaryview->folder_item) {
+ summaryview->folder_item->opened = FALSE;
+ summaryview->folder_item = NULL;
+ }
summaryview->display_msg = FALSE;
return;
}
- if (summaryview->folder_item->folder->type != F_NEWS) {
+ if (summaryview->folder_item->folder->type != F_NEWS)
menu_set_sensitive(ifactory, "/Move...", TRUE);
- }
+ else
+ menu_set_sensitive(ifactory, "/Move...", FALSE);
+
menu_set_sensitive(ifactory, "/Delete", TRUE);
menu_set_sensitive(ifactory, "/Select thread", TRUE);
menu_set_sensitive(ifactory, "/Select all", TRUE);
menu_set_sensitive(ifactory, "/Bounce", TRUE);
menu_set_sensitive(ifactory, "/Add sender to address book", sens);
+ menu_set_sensitive(ifactory, "/Create filter rule", sens);
menu_set_sensitive(ifactory, "/View", sens);
menu_set_sensitive(ifactory, "/View/Open in new window", sens);
summaryview->folder_item->stype == F_DRAFT ||
summaryview->folder_item->stype == F_QUEUE)
menu_set_sensitive(ifactory, "/Re-edit", sens);
+ else
+ menu_set_sensitive(ifactory, "/Re-edit", FALSE);
menu_set_sensitive(ifactory, "/Save as...", sens);
menu_set_sensitive(ifactory, "/Print...", TRUE);
msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (MSG_IS_NEWS(msginfo->flags))
+ 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))
n_selected++;
}
- gtk_label_set(GTK_LABEL(summaryview->statlabel_folder),
- summaryview->folder_item &&
- summaryview->folder_item->folder->type == F_NEWS
- ? g_basename(summaryview->folder_item->path)
- : summaryview->folder_item->path);
+ if (summaryview->folder_item->folder->type == F_NEWS &&
+ prefs_common.ng_abbrev_len < strlen(summaryview->folder_item->path)) {
+ gchar *group;
+ group = get_abbrev_newsgroup_name
+ (g_basename(summaryview->folder_item->path));
+ gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
+ g_free(group);
+ } else {
+ gtk_label_set(GTK_LABEL(summaryview->statlabel_folder),
+ summaryview->folder_item->path);
+ }
if (summaryview->deleted)
del = g_strdup_printf(_("%d deleted"), summaryview->deleted);
gint ver = CACHE_VERSION;
gchar *buf;
gchar *cachefile, *markfile;
- GSList * cur;
+ GSList *cur;
gint filemode = 0;
PrefsFolderItem *prefs;
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) {
+ if ((fps.cache_fp = fopen(cachefile, "wb")) == NULL) {
FILE_OP_ERROR(cachefile, "fopen");
g_free(cachefile);
return -1;
g_free(cachefile);
markfile = folder_item_get_mark_file(summaryview->folder_item);
- if ((fps.mark_fp = fopen(markfile, "w")) == NULL) {
+ if ((fps.mark_fp = fopen(markfile, "wb")) == NULL) {
FILE_OP_ERROR(markfile, "fopen");
fclose(fps.cache_fp);
g_free(markfile);
gtk_ctree_pre_recursive(ctree, NULL, summary_write_cache_func, &fps);
- for(cur = summaryview->killed_messages ; cur != NULL ;
- cur = g_slist_next(cur)) {
- MsgInfo *msginfo = (MsgInfo *) cur->data;
-
+ for (cur = summaryview->killed_messages; cur != NULL; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
procmsg_write_cache(msginfo, fps.cache_fp);
procmsg_write_flags(msginfo, fps.mark_fp);
}
+ procmsg_flush_mark_queue(summaryview->folder_item, fps.mark_fp);
+
fclose(fps.cache_fp);
fclose(fps.mark_fp);
procmsg_write_flags(msginfo, fps->mark_fp);
}
+static gchar *summary_complete_address(const gchar *addr)
+{
+ gint count;
+ gchar *res, *tmp, *email_addr;
+
+ Xstrdup_a(email_addr, addr, return NULL);
+ extract_address(email_addr);
+ g_return_val_if_fail(*email_addr, NULL);
+
+ /*
+ * completion stuff must be already initialized
+ */
+ res = NULL;
+ if (1 < (count = complete_address(email_addr))) {
+ tmp = get_complete_address(1);
+ res = procheader_get_fromname(tmp);
+ g_free(tmp);
+ }
+
+ return res;
+}
+
static void summary_set_header(SummaryView *summaryview, gchar *text[],
MsgInfo *msginfo)
{
_("(No From)");
if (prefs_common.swap_from && msginfo->from && msginfo->to &&
!MSG_IS_NEWS(msginfo->flags)) {
- gchar *from;
+ gchar *addr = NULL;
- Xstrdup_a(from, msginfo->from, return);
- extract_address(from);
- if (account_find_from_address(from)) {
+ if (prefs_common.use_addr_book) {
+ Xstrdup_a(addr, msginfo->from, return);
+ extract_address(addr);
+
+ if (account_find_from_address(addr)) {
+ addr = summary_complete_address(msginfo->to);
g_free(to);
- to = g_strconcat("-->", msginfo->to, NULL);
+ to = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
text[col_pos[S_COL_FROM]] = to;
+ }
}
}
- if ((text[col_pos[S_COL_FROM]] != to) && prefs_common.use_addr_book &&
- msginfo->from) {
- gint count;
+ /*
+ * CLAWS: note that the "text[col_pos[S_COL_FROM]] != to" is really a hack,
+ * checking whether the above block (which handles the special case of
+ * the --> in sent boxes) was executed.
+ */
+ if (text[col_pos[S_COL_FROM]] != to && prefs_common.use_addr_book && msginfo->from) {
gchar *from;
-
- Xstrdup_a(from, msginfo->from, return);
- extract_address(from);
- if (*from) {
- count = complete_address(from);
- if (count > 1) {
- g_free(from_name);
- from = get_complete_address(1);
- from_name = procheader_get_fromname(from);
- g_free(from);
- text[col_pos[S_COL_FROM]] = from_name;
- }
- }
+ from = summary_complete_address(msginfo->from);
+ if (from) {
+ /*
+ * FIXME: this text[col_pos[S_COL_FROM]] should be freed
+ * but may have been assigned _("No From"). Should be
+ * freed???
+ */
+ text[col_pos[S_COL_FROM]] = from;
+ }
}
if (prefs->enable_simplify_subject
from_name =
g_strdup_printf("%s",
account->address);
-
- if (g_strcasecmp(from_name, msginfo->from) == 0) {
+
+ if (g_strcasecmp(from_name, msginfo->from) == 0) {
+ g_free(from_name);
+ found = TRUE;
+ break;
+ }
g_free(from_name);
- found = TRUE;
- break;
}
- g_free(from_name);
+
+ if (!found) {
+ alertpanel_error(_("You're not the author of the article\n"));
}
return found;
}
src = procmsg_get_message_file(msginfo);
- copy_file(src, dest);
+ if (copy_file(src, dest) < 0) {
+ alertpanel_error(_("Can't save the file `%s'."),
+ g_basename(dest));
+ }
g_free(src);
}
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
+ if (!prefs_common.immediate_exec &&
+ msginfo->to_folder->op_count > 0)
+ msginfo->to_folder->op_count--;
+
g_hash_table_insert(summaryview->folder_table,
msginfo->to_folder, GINT_TO_POINTER(1));
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
+ if (!prefs_common.immediate_exec &&
+ msginfo->to_folder->op_count > 0)
+ msginfo->to_folder->op_count--;
+
g_hash_table_insert(summaryview->folder_table,
msginfo->to_folder, GINT_TO_POINTER(1));
void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
{
- static HeaderEntry hentry[] = {{"List-Id:", NULL, FALSE},
+ static HeaderEntry hentry[] = {{"X-BeenThere:", NULL, FALSE},
{"X-ML-Name:", NULL, FALSE},
{"X-List:", NULL, FALSE},
{"X-Mailing-list:", NULL, FALSE},
+ {"List-Id:", NULL, FALSE},
{NULL, NULL, FALSE}};
+
+ static gchar *header_strs[] = {"From", "from", "To", "to", "Subject", "subject"};
+
+ static gchar *hentry_strs[] = {"X-BeenThere", "X-ML-Name", "X-List",
+ "X-Mailing-List", "List-Id",
+ "header \"X-BeenThere\"", "header \"X-ML-Name\"",
+ "header \"X-List\"", "header \"X-Mailing-List\"",
+ "header \"List-Id\""};
enum
{
- H_LIST_ID = 0,
+ H_X_BEENTHERE = 0,
H_X_ML_NAME = 1,
H_X_LIST = 2,
- H_X_MAILING_LIST = 3
+ H_X_MAILING_LIST = 3,
+ H_LIST_ID = 4
+ };
+
+ enum
+ {
+ H_FROM = 0,
+ H_TO = 2,
+ H_SUBJECT = 4
};
MsgInfo *msginfo;
gchar *header = NULL;
gchar *key = NULL;
FILE *fp;
+ int header_offset;
+ int hentry_offset;
if (!summaryview->selected) return;
summaryview->selected);
if (!msginfo) return;
+ if (global_processing) {
+ header_offset = 1;
+ hentry_offset = 5;
+ }
+ else {
+ header_offset = 0;
+ hentry_offset = 0;
+ }
+
switch (type) {
case FILTER_BY_NONE:
break;
procheader_get_header_fields(fp, hentry);
fclose(fp);
- if (hentry[H_LIST_ID].body != NULL) {
- header = "List-Id";
- Xstrdup_a(key, hentry[H_LIST_ID].body, );
+ if (hentry[H_X_BEENTHERE].body != NULL) {
+ header = hentry_strs[H_X_BEENTHERE + hentry_offset];
+ Xstrdup_a(key, hentry[H_X_BEENTHERE].body, );
} else if (hentry[H_X_ML_NAME].body != NULL) {
- header = "X-ML-Name";
+ header = hentry_strs[H_X_ML_NAME + hentry_offset];
Xstrdup_a(key, hentry[H_X_ML_NAME].body, );
} else if (hentry[H_X_LIST].body != NULL) {
- header = "X-List";
+ header = hentry_strs[H_X_LIST + hentry_offset];
Xstrdup_a(key, hentry[H_X_LIST].body, );
} else if (hentry[H_X_MAILING_LIST].body != NULL) {
- header = "X-Mailing-list";
+ header = hentry_strs[H_X_MAILING_LIST + hentry_offset];
Xstrdup_a(key, hentry[H_X_MAILING_LIST].body, );
+ } else if (hentry[H_LIST_ID].body != NULL) {
+ header = hentry_strs[H_LIST_ID + hentry_offset];
+ Xstrdup_a(key, hentry[H_LIST_ID].body, );
} else if (msginfo->subject) {
- header = "Subject";
+ header = header_strs[H_SUBJECT + header_offset];
key = msginfo->subject;
}
- g_free(hentry[H_LIST_ID].body);
- hentry[H_LIST_ID].body = NULL;
+ g_free(hentry[H_X_BEENTHERE].body);
+ hentry[H_X_BEENTHERE].body = NULL;
g_free(hentry[H_X_ML_NAME].body);
hentry[H_X_ML_NAME].body = NULL;
g_free(hentry[H_X_LIST].body);
hentry[H_X_LIST].body = NULL;
g_free(hentry[H_X_MAILING_LIST].body);
hentry[H_X_MAILING_LIST].body = NULL;
+ g_free(hentry[H_LIST_ID].body);
+ hentry[H_LIST_ID].body = NULL;
break;
case FILTER_BY_FROM:
- header = "From";
+ header = header_strs[H_FROM + header_offset];
key = msginfo->from;
break;
case FILTER_BY_TO:
- header = "To";
+ header = header_strs[H_TO + header_offset];
key = msginfo->to;
break;
case FILTER_BY_SUBJECT:
- header = "Subject";
+ header = header_strs[H_SUBJECT + header_offset];
key = msginfo->subject;
break;
default:
break;
}
- prefs_filter_open(header, key);
+ /*
+ * NOTE: key may be allocated on the stack, so
+ * prefs_filter[ing]_open() should have completed
+ * and have set entries. Otherwise we're hosed.
+ */
+
+ if (global_processing)
+ prefs_filtering_open(NULL, header, key);
+ else
+ prefs_filter_open(header, key);
}
void summary_reply(SummaryView *summaryview, ComposeMode mode)
summary_add_address(summaryview);
}
+static void summary_create_filter_cb(SummaryView *summaryview,
+ guint action, GtkWidget *widget)
+{
+ summary_filter_open(summaryview, (PrefsFilterType)action);
+}
+
static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
{
summary_sort(summaryview, SORT_BY_MARK);
return MSG_GET_COLORLABEL(msginfo1->flags) -
MSG_GET_COLORLABEL(msginfo2->flags);
}
+
+static void news_flag_crosspost(MsgInfo *msginfo)
+{
+ GString *line;
+ gpointer key;
+ gpointer value;
+ MsgPermFlags flags;
+ Folder *mff = msginfo->folder->folder;
+
+ if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
+ line = g_string_sized_new(128);
+ g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
+ debug_print(_("nfcp: checking <%s>"), line->str);
+ if (mff->newsart &&
+ g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {
+ debug_print(_(" <%s>"), value);
+ if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+ MSG_SET_COLORLABEL_VALUE(msginfo->flags, mff->account->crosspost_col);
+ }
+ g_hash_table_remove(mff->newsart, key);
+ g_free(key);
+ }
+ g_string_free(line, TRUE);
+ debug_print(_("\n"));
+ }
+}
+
+static void news_process_crossposted(MsgInfo *msginfo)
+{
+ gchar **crossref;
+ gchar **crp;
+ gchar *cp;
+ gint cnt;
+ static char *read = "read";
+ Folder *mff = msginfo->folder->folder;
+
+ /* Get the Xref: line */
+ if (msginfo->xref) {
+ /* Retrieve the cross-posted groups and message ids */
+ /* Format of Xref is Xref: server message:id message:id ... */
+ crossref = g_strsplit(msginfo->xref, " ", 1024);
+ for (crp = crossref+2, cnt = 0; *crp; crp++, cnt++) {
+ if ((cp = strchr(*crp, ':'))) {
+ *cp = '\0';
+ if (!strcmp(*crp, msginfo->folder->path)) continue;
+ *cp = ':';
+
+ /* On first pass, create a GHashTable to hold the list of
+ * article numbers per newsgroup that have been read. */
+ if (!mff->newsart) {
+ mff->newsart = g_hash_table_new(g_str_hash, g_str_equal);
+ }
+ /* When a summary is selected, the articles for that
+ * newsgroup are marked based on this entry */
+ g_hash_table_insert(mff->newsart, g_strdup(*crp), read);
+ debug_print(_("Cross-reference %d: Hash <%s>\n"), cnt, *crp);
+ }
+ }
+ g_strfreev(crossref);
+ }
+}
+
static gint summary_cmp_by_score(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
folderview_select(summaryview->folderview, summaryview->folder_item);
}
+/*
+ * Harvest addresses for selected messages in summary view.
+ */
+void summary_harvest_address( SummaryView *summaryview ) {
+ GtkCTree *ctree = GTK_CTREE( summaryview->ctree );
+ GList *cur;
+ GList *msgList;
+ MsgInfo *msginfo;
+
+ msgList = NULL;
+ for( cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next ) {
+ msginfo = gtk_ctree_node_get_row_data( ctree, GTK_CTREE_NODE(cur->data) );
+ msgList = g_list_append( msgList, GUINT_TO_POINTER( msginfo->msgnum ) );
+ }
+ addressbook_harvest( summaryview->folder_item, TRUE, msgList );
+ g_list_free( msgList );
+}
/*
* End of Source.
projects / claws.git / blobdiff