static GdkBitmap *newxpmmask;
static GdkPixmap *unreadxpm;
static GdkBitmap *unreadxpmmask;
+static GdkPixmap *draftsxpm;
+static GdkBitmap *draftsxpmmask;
+static GdkPixmap *draftsopenxpm;
+static GdkBitmap *draftsopenxpmmask;
static void folderview_select_node (FolderView *folderview,
GtkCTreeNode *node);
void folderview_create_folder_node (FolderView *folderview,
FolderItem *item);
+gboolean folderview_update_folder (gpointer source,
+ gpointer userdata);
gboolean folderview_update_item (gpointer source,
gpointer data);
folderview->mbox_popup = mbox_popup;
folderview->mbox_factory = mbox_factory;
+ folderview->folder_update_callback_id =
+ hooks_register_hook(FOLDER_UPDATE_HOOKLIST, folderview_update_folder, (gpointer) folderview);
folderview->folder_item_update_callback_id =
hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm, &queuehrmxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm, &queueopenxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm, &queueopenhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm, &draftsxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm, &draftsopenxpmmask);
/* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
* instead text (text overflows making them unreadable and ugly) */
gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
-
-
- if (!normalfont)
- normalfont = gtkut_font_load(NORMAL_FONT);
- if (!boldfont)
- boldfont = gtkut_font_load(BOLD_FONT);
-
+ if (!normalfont) {
+ if (gtkut_font_load(NORMAL_FONT) == NULL) {
+ GtkStyle *style = gtk_style_new();
+ normalfont = style->font;
+ gdk_font_ref(normalfont);
+ gtk_style_unref(style);
+ }
+ else
+ normalfont = gtkut_font_load(NORMAL_FONT);
+ }
+
+ if (!boldfont) {
+ if (gtkut_font_load(BOLD_FONT) == NULL) {
+ GtkStyle *style = gtk_style_new();
+ boldfont = style->font;
+ gdk_font_ref(boldfont);
+ gtk_style_unref(style);
+ }
+ else
+ boldfont = gtkut_font_load(BOLD_FONT);
+ }
+
if (!bold_style) {
bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
bold_style->font = boldfont;
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
item = gtk_ctree_node_get_row_data(ctree, node);
- if (item && item->unread > 0 && item->stype != F_TRASH)
+ if (item && item->unread_msgs > 0 && item->stype != F_TRASH)
return node;
}
unread = atoi(unread_str);
total = atoi(total_str);
- /* CLAWS: don't know why but this always seems to be true
- * when deleting messages. Somewhere claws does a folder
- * scan which sets all new, unread & total to the correct
- * values. It then enters this function, but leaves it
- * because new, unread and total are the same... */
-#ifndef CLAWS
- if (prev_row == row &&
- item->new == new &&
- item->unread == unread &&
- item->total == total)
- return;
-#endif
-
prev_row = row;
folderview_update_node(folderview, row);
gpointer data)
{
GList *list;
- gchar *rootpath;
-
- if (FOLDER_IS_LOCAL(folder))
- rootpath = LOCAL_FOLDER(folder)->rootpath;
- else if (folder->type == F_IMAP && folder->account &&
- folder->account->recv_server)
- rootpath = folder->account->recv_server;
- else if (folder->type == F_NEWS && folder->account &&
- folder->account->nntp_server)
- rootpath = folder->account->nntp_server;
- else
- return;
for (list = folderview_list; list != NULL; list = list->next) {
FolderView *folderview = (FolderView *)list->data;
if (item->path)
str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
- rootpath, G_DIR_SEPARATOR,
+ item->folder->name, G_DIR_SEPARATOR,
item->path);
else
str = g_strdup_printf(_("Scanning folder %s ..."),
- rootpath);
+ item->folder->name);
STATUSBAR_PUSH(mainwin, str);
STATUSBAR_POP(mainwin);
g_return_if_fail(folder != NULL);
- if (!folder->scan_tree) return;
+ if (!folder->klass->scan_tree) return;
inc_lock();
window = label_window_create(_("Rebuilding folder tree..."));
folderview_set_all();
- folderview_check_new(folder);
-
- gtk_widget_destroy(window);
- inc_unlock();
-}
-
-#if 0
-void folderview_rescan_all(void)
-{
- GList *list;
- GtkWidget *window;
-
- inc_lock();
- window = label_window_create(_("Rescanning all folder trees..."));
-
- list = folder_get_list();
- for (; list != NULL; list = list->next) {
- Folder *folder = list->data;
-
- if (!folder->scan_tree) continue;
- folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
- folder_scan_tree(folder);
- folder_set_ui_func(folder, NULL, NULL);
- }
-
- folder_write_list();
- folderview_set_all();
-
- list = folder_get_list();
- for (; list != NULL; list = list->next) {
- Folder *folder = list->data;
-
- folderview_check_new(folder);
- }
-
gtk_widget_destroy(window);
inc_unlock();
}
-#endif
+/** folderview_check_new()
+ * Scan and update the folder and return the
+ * count the number of new messages since last check.
+ * \param folder the folder to check for new messages
+ * \return the number of new messages since last check
+ */
gint folderview_check_new(Folder *folder)
{
GList *list;
GtkCTree *ctree;
GtkCTreeNode *node;
gint new_msgs = 0;
+ gint former_new_msgs = 0;
+ gint former_new = 0;
for (list = folderview_list; list != NULL; list = list->next) {
folderview = (FolderView *)list->data;
if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
folderview_scan_tree_func(item->folder, item, NULL);
+ former_new = item->new_msgs;
if (folder_item_scan(item) < 0) {
if (folder && !FOLDER_IS_LOCAL(folder))
break;
}
folderview_update_node(folderview, node);
- new_msgs += item->new;
+ new_msgs += item->new_msgs;
+ former_new_msgs += former_new;
}
gtk_widget_set_sensitive(folderview->ctree, TRUE);
}
folder_write_list();
+ /* Number of new messages since last check is the just the difference
+ * between former_new_msgs and new_msgs. If new_msgs is less than
+ * former_new_msgs, that would mean another session accessed the folder
+ * and the result is not well defined.
+ */
+ new_msgs = (former_new_msgs < new_msgs ? new_msgs - former_new_msgs : 0);
return new_msgs;
}
if (node) {
item = gtk_ctree_node_get_row_data(ctree, node);
if (item) {
- if (item->new > 0 ||
- (item->stype == F_QUEUE && item->total > 0))
+ if (item->new_msgs > 0 ||
+ (item->stype == F_QUEUE && item->total_msgs > 0))
return TRUE;
}
node = GTK_CTREE_ROW(node)->children;
if (node) {
item = gtk_ctree_node_get_row_data(ctree, node);
if (item) {
- if (item->unread > 0 ||
- (item->stype == F_QUEUE && item->total > 0))
+ if (item->unread_msgs > 0 ||
+ (item->stype == F_QUEUE && item->total_msgs > 0))
return TRUE;
}
node = GTK_CTREE_ROW(node)->children;
openxpm = inboxopenxpm;
openmask = inboxopenxpmmask;
}
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
- item->name);
break;
case F_OUTBOX:
if (item->hide_read_msgs) {
openxpm = outboxopenxpm;
openmask = outboxopenxpmmask;
}
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
- item->name);
break;
case F_QUEUE:
if (item->hide_read_msgs) {
openxpm = queueopenxpm;
openmask = queueopenxpmmask;
}
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
- item->name);
break;
case F_TRASH:
if (item->hide_read_msgs) {
openxpm = trashopenxpm;
openmask = trashopenxpmmask;
}
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
- item->name);
break;
case F_DRAFT:
- xpm = folderxpm;
- mask = folderxpmmask;
- if (item->hide_read_msgs) {
- openxpm = folderopenhrmxpm;
- openmask = folderopenhrmxpmmask;
- } else {
- openxpm = folderopenxpm;
- openmask = folderopenxpmmask;
- }
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
- item->name);
+ xpm = draftsxpm;
+ mask = draftsxpmmask;
+ openxpm = draftsopenxpm;
+ openmask = draftsopenxpmmask;
break;
default:
if (item->hide_read_msgs) {
openxpm = folderopenxpm;
openmask = folderopenxpmmask;
}
- if (!item->parent) {
- switch (item->folder->type) {
- case F_MH:
- name = " (MH)"; break;
- case F_MBOX:
- name = " (mbox)"; break;
- case F_IMAP:
- name = " (IMAP4)"; break;
- case F_NEWS:
- name = " (News)"; break;
- default:
- name = "";
- }
- name = g_strconcat(item->name, name, NULL);
- } else {
- if (item->folder->type == F_NEWS &&
- item->path &&
- !strcmp2(item->name, item->path))
- name = get_abbrev_newsgroup_name
- (item->path,
- prefs_common.ng_abbrev_len);
- else
- name = g_strdup(item->name);
- }
}
+ name = folder_item_get_name(item);
if (!GTK_CTREE_ROW(node)->expanded &&
folderview_have_unread_children(folderview, node))
else
add_unread_mark = FALSE;
- if (item->stype == F_QUEUE && item->total > 0 &&
+ if (item->stype == F_QUEUE && item->total_msgs > 0 &&
prefs_common.display_folder_unread) {
- str = g_strdup_printf("%s (%d%s)", name, item->total,
+ str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
add_unread_mark ? "+" : "");
gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, mask, openxpm, openmask,
FALSE, GTK_CTREE_ROW(node)->expanded);
g_free(str);
- } else if ((item->unread > 0 || add_unread_mark) &&
+ } else if ((item->unread_msgs > 0 || add_unread_mark) &&
prefs_common.display_folder_unread) {
- if (item->unread > 0)
- str = g_strdup_printf("%s (%d%s%s)", name, item->unread,
+ if (item->unread_msgs > 0)
+ str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
add_unread_mark ? "+" : "",
- item->unreadmarked > 0 ? "!":"");
+ item->unreadmarked_msgs > 0 ? "!":"");
else
str = g_strdup_printf("%s (+)", name);
gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
g_free(str);
} else {
str = g_strdup_printf("%s%s", name,
- item->unreadmarked > 0 ? " (!)":"");
+ item->unreadmarked_msgs > 0 ? " (!)":"");
gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, mask, openxpm, openmask,
gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
gtk_ctree_node_set_text(ctree, node, COL_TOTAL, "-");
} else {
- gtk_ctree_node_set_text(ctree, node, COL_NEW, itos(item->new));
- gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread));
- gtk_ctree_node_set_text(ctree, node, COL_TOTAL, itos(item->total));
+ gtk_ctree_node_set_text(ctree, node, COL_NEW, itos(item->new_msgs));
+ gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread_msgs));
+ gtk_ctree_node_set_text(ctree, node, COL_TOTAL, itos(item->total_msgs));
}
if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
use_bold = use_color = FALSE;
} else if (item->stype == F_QUEUE) {
/* highlight queue folder if there are any messages */
- use_bold = use_color = (item->total > 0);
+ use_bold = use_color = (item->total_msgs > 0);
} else {
/* if unread messages exist, print with bold font */
- use_bold = (item->unread > 0) || add_unread_mark;
+ use_bold = (item->unread_msgs > 0) || add_unread_mark;
/* if new messages exist, print with colored letter */
use_color =
- (item->new > 0) ||
+ (item->new_msgs > 0) ||
(add_unread_mark &&
folderview_have_new_children(folderview, node));
}
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- switch (item->folder->type) {
+ switch (FOLDER_TYPE(item->folder)) {
case F_MBOX:
folderview_new_mbox_folder_cb(folderview, 0, NULL);
break;
if (!item->path) return;
if (item->stype != F_NORMAL) return;
- switch (item->folder->type) {
+ switch (FOLDER_TYPE(item->folder)) {
case F_MBOX:
folderview_rename_mbox_folder_cb(folderview, 0, NULL);
case F_MH:
if (!item->path) return;
if (item->stype != F_NORMAL) return;
- switch (item->folder->type) {
+ switch (FOLDER_TYPE(item->folder)) {
case F_MH:
case F_MBOX:
case F_MAILDIR:
if (item->parent != NULL)
delete_folder = folder_scoring = folder_processing = TRUE;
}
- if (item->unread < 1)
+ if (item->unread_msgs < 1)
mark_all_read = FALSE;
}
if (item->folder)
toolbar_set_compose_button
(folderview->mainwin->toolbar,
- item->folder->type == F_NEWS ?
+ FOLDER_TYPE(item->folder) == F_NEWS ?
COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
if (item->path)
}
/* Open Folder */
- buf = g_strdup_printf(_("Opening Folder %s..."), item->path);
+ buf = g_strdup_printf(_("Opening Folder %s..."), item->path ?
+ item->path : "(null)");
debug_print("%s\n", buf);
STATUSBAR_PUSH(folderview->mainwin, buf);
g_free(buf);
/* Show messages */
summary_set_prefs_from_folderitem(folderview->summaryview, item);
opened = summary_show(folderview->summaryview, item);
-
+
folder_clean_cache_memory();
if (!opened) {
_("NewFolder"));
if (!new_folder) return;
- if (item->folder->type != F_MBOX) {
+ if (FOLDER_TYPE(item->folder) != F_MBOX) {
if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
alertpanel_error(_("`%c' can't be included in folder name."),
G_DIR_SEPARATOR);
Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
old_id = folder_item_get_identifier(item);
- if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+ if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
g_free(old_id);
g_free(new_folder);
return;
return;
}
- if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+ if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
g_free(new_folder);
return;
}
Xstrdup_a(old_path, item->path, return);
old_id = folder_item_get_identifier(item);
- if (item->folder->remove_folder(item->folder, item) < 0) {
+ if (item->folder->klass->remove_folder(item->folder, item) < 0) {
alertpanel_error(_("Can't remove the folder `%s'."), name);
if (folderview->opened == folderview->selected)
summary_show(folderview->summaryview,
item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->type == F_IMAP);
+ g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
g_return_if_fail(item->folder->account != NULL);
new_folder = input_dialog
item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->type == F_IMAP);
+ g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
g_return_if_fail(item->folder->account != NULL);
name_ = trim_string(item->folder->name, 32);
g_return_if_fail(item != NULL);
folder = item->folder;
g_return_if_fail(folder != NULL);
- g_return_if_fail(folder->type == F_NEWS);
+ g_return_if_fail(FOLDER_TYPE(folder) == F_NEWS);
g_return_if_fail(folder->account != NULL);
if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->type == F_NEWS);
+ g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
g_return_if_fail(item->folder->account != NULL);
name_ = trim_string(item->path, 32);
folder_item_remove(item);
gtk_ctree_remove_node(ctree, folderview->selected);
folder_write_list();
+
+ prefs_filtering_delete_path(name);
}
static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->type == F_NEWS);
+ g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
g_return_if_fail(item->folder->account != NULL);
name_ = trim_string(item->folder->name, 32);
if (item->parent == NULL && item->folder->account)
account_open(item->folder->account);
- else
+ else {
+ summary_save_prefs_to_folderitem(folderview->summaryview, item);
prefs_folder_item_create(folderview, item);
+ }
}
static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
if (folderview->selected)
from_folder = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), folderview->selected);
- if (!from_folder || from_folder->folder->type == F_NEWS)
+ if (!from_folder || FOLDER_TYPE(from_folder->folder) == F_NEWS)
return;
to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
- if (!to_folder || to_folder->folder->type == F_NEWS)
+ if (!to_folder || FOLDER_TYPE(to_folder->folder) == F_NEWS)
return;
folderview_move_to(folderview, from_folder, to_folder);
inc_lock();
main_window_cursor_wait(folderview->mainwin);
statusbar_verbosity_set(TRUE);
+ folder_item_update_freeze();
if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
statusbar_verbosity_set(FALSE);
main_window_cursor_normal(folderview->mainwin);
STATUSBAR_POP(folderview->mainwin);
+ folder_item_update_thaw();
if (src_node)
gtk_ctree_remove_node(GTK_CTREE(folderview->ctree), src_node);
else
debug_print("can't remove src node: is null\n");
folderview_create_folder_node_recursive(folderview, new_folder);
+
+ folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
+
folderview_sort_folders(folderview,
gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree),
NULL, new_folder->parent), new_folder->folder);
statusbar_verbosity_set(FALSE);
main_window_cursor_normal(folderview->mainwin);
STATUSBAR_POP(folderview->mainwin);
+ folder_item_update_thaw();
switch (status) {
case F_MOVE_FAILED_DEST_IS_PARENT:
alertpanel_error(_("Source and destination are the same."));
FolderView *folderview)
{
gint row, column;
- FolderItem *item, *src_item;
+ FolderItem *item, *src_item = 0;
GtkCTreeNode *node = NULL;
gboolean acceptable = FALSE;
gint height = folderview->ctree->allocation.height;
if (item && item->folder && item->path &&
src_item && src_item != item) {
- switch (item->folder->type) {
+ switch (FOLDER_TYPE(item->folder)) {
case F_MH:
case F_MBOX:
case F_IMAP:
} else if (item && item->folder && folder_item_get_path(item) &&
src_item && src_item != item) {
/* a root folder - acceptable only from folderview */
- if (item->folder->type == F_MH || item->folder->type == F_IMAP)
+ if (FOLDER_TYPE(item->folder) == F_MH || FOLDER_TYPE(item->folder) == F_IMAP)
acceptable = TRUE;
}
/* re-check (due to acceptable possibly set for folder moves */
if (!(item && item->folder && item->path &&
src_item && src_item != item &&
- (item->folder->type == F_MH || item->folder->type == F_IMAP))) {
+ (FOLDER_TYPE(item->folder) == F_MH || FOLDER_TYPE(item->folder) == F_IMAP))) {
return;
}
if (item && src_item) {
case GDK_ACTION_MOVE:
case GDK_ACTION_DEFAULT:
default:
- if (src_item->folder->type != item->folder->type ||
- (item->folder->type == F_IMAP &&
+ if (FOLDER_TYPE(src_item->folder) != FOLDER_TYPE(item->folder) ||
+ (FOLDER_TYPE(item->folder) == F_IMAP &&
src_item->folder != item->folder))
summary_copy_selected_to(folderview->summaryview, item);
else
}
}
+gboolean folderview_update_folder(gpointer source, gpointer userdata)
+{
+ FolderUpdateData *hookdata;
+ FolderView *folderview;
+ GtkWidget *ctree;
+
+ hookdata = source;
+ folderview = (FolderView *) userdata;
+ g_return_val_if_fail(hookdata != NULL, FALSE);
+ g_return_val_if_fail(folderview != NULL, FALSE);
+
+ ctree = folderview->ctree;
+ g_return_val_if_fail(ctree != NULL, FALSE);
+
+ if (hookdata->update_flags & FOLDER_TREE_CHANGED) {
+ folderview_set(folderview);
+ }
+
+ return FALSE;
+}
projects / claws.git / blobdiff