+2002-11-09 [christoph] 0.8.5claws104
+
+ * src/compose.c
+ * src/folder.[ch]
+ * src/folderview.[ch]
+ * src/import.c
+ * src/inc.c
+ * src/main.c
+ * src/mainwindow.c
+ * src/messageview.c
+ * src/prefs_folder_item.c
+ * src/procmsg.c
+ * src/summaryview.c
+ implement a callback system for folder item updates
+
2002-11-09 [colin] 0.8.5claws103
* src/folderview.c
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws103
+EXTRA_VERSION=claws104
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
g_free(msgpath);
folder_item_remove_msg(folder, msgnum);
- folderview_update_item(folder, TRUE);
+ folder_update_item(folder, TRUE);
return val;
}
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
if (compose->targetinfo)
- folderview_update_item
+ folder_update_item
(compose->targetinfo->folder, TRUE);
}
/* save message to outbox */
alertpanel_error
(_("Can't save the message to Sent."));
else
- folderview_update_item(outbox, TRUE);
+ folder_update_item(outbox, TRUE);
}
}
if (procmsg_msg_exist(msginfo)) {
folder_item_remove_msg(drafts, msginfo->msgnum);
- folderview_update_item(drafts, TRUE);
+ folder_update_item(drafts, TRUE);
}
}
compose_remove_reedit_target(compose);
if (compose->targetinfo &&
compose->targetinfo->folder != queue)
- folderview_update_item
+ folder_update_item
(compose->targetinfo->folder, TRUE);
}
- folderview_update_item(queue, TRUE);
+ folder_update_item(queue, TRUE);
if ((msgnum != NULL) && (item != NULL)) {
*msgnum = num;
compose_remove_reedit_target(compose);
if (compose->targetinfo &&
compose->targetinfo->folder != draft)
- folderview_update_item(compose->targetinfo->folder,
+ folder_update_item(compose->targetinfo->folder,
TRUE);
}
newmsginfo = folder_item_fetch_msginfo(draft, msgnum);
procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
MSG_SET_TMP_FLAGS(newmsginfo->flags, MSG_DRAFT);
- folderview_update_item(draft, TRUE);
+ folder_update_item(draft, TRUE);
procmsg_msginfo_free(newmsginfo);
lock = FALSE;
#include "intl.h"
#include "folder.h"
-#include "folderview.h"
#include "session.h"
#include "imap.h"
#include "news.h"
#include "xml.h"
#include "codeconv.h"
#include "prefs.h"
-#include "prefs_common.h"
#include "account.h"
-#include "prefs_account.h"
#include "filtering.h"
#include "scoring.h"
#include "prefs_folder_item.h"
#include "procheader.h"
#include "statusbar.h"
+/* Dependecies to be removed ?! */
+#include "prefs_common.h"
+#include "prefs_account.h"
+#include "prefs_folder_item.h"
+
static GList *folder_list = NULL;
static void folder_init (Folder *folder,
folder_persist_prefs_free(pptable);
prefs_matcher_read_config();
+
+ folder_write_list();
}
FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
GSList *folder_list = NULL, *cache_list = NULL, *folder_list_cur, *cache_list_cur, *new_list = NULL;
guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
-
+ gboolean contentchange = FALSE;
+
g_return_val_if_fail(item != NULL, -1);
if (item->path == NULL) return -1;
else
folder_cur_num = G_MAXINT;
+ contentchange = TRUE;
+
continue;
}
else
cache_cur_num = G_MAXINT;
+ contentchange = TRUE;
+
continue;
}
else
folder_cur_num = G_MAXINT;
+ contentchange = TRUE;
+
continue;
}
}
g_slist_free(new_list);
- folderview_update_item(item, FALSE);
+ folder_update_item(item, contentchange);
return 0;
}
fputs(" />\n", fp);
}
-static void folder_update_op_count_rec(GNode *node) {
+static void folder_update_op_count_rec(GNode *node)
+{
FolderItem *fitem = FOLDER_ITEM(node->data);
if (g_node_depth(node) > 0) {
if (fitem->op_count > 0) {
fitem->op_count = 0;
- folderview_update_item(fitem, 0);
+ folder_update_item(fitem, FALSE);
}
if (node->children) {
GNode *child;
procmsg_msginfo_free(msginfo);
}
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
g_slist_free(mlist);
}
+
+GSList *folder_item_update_callbacks_list = NULL;
+gint folder_item_update_callbacks_nextid = 0;
+
+struct FolderItemUpdateCallback
+{
+ gint id;
+ FolderItemUpdateFunc func;
+ gpointer data;
+};
+
+gint folder_item_update_callback_register(FolderItemUpdateFunc func, gpointer data)
+{
+ struct FolderItemUpdateCallback *callback;
+
+ g_return_val_if_fail(func != NULL, -1);
+
+ folder_item_update_callbacks_nextid++;
+
+ callback = g_new0(struct FolderItemUpdateCallback, 1);
+ callback->id = folder_item_update_callbacks_nextid;
+ callback->func = func;
+ callback->data = data;
+
+ folder_item_update_callbacks_list =
+ g_slist_append(folder_item_update_callbacks_list, callback);
+
+ return folder_item_update_callbacks_nextid;
+}
+
+void folder_item_update_callback_unregister(gint id)
+{
+ GSList *list, *next;
+
+ for (list = folder_item_update_callbacks_list; list != NULL; list = next) {
+ struct FolderItemUpdateCallback *callback;
+
+ next = list->next;
+
+ callback = list->data;
+ if (callback->id == id) {
+ folder_item_update_callbacks_list =
+ g_slist_remove(folder_item_update_callbacks_list, callback);
+ g_free(callback);
+ }
+ }
+}
+
+static void folder_item_update_callback_execute(FolderItem *item, gboolean contentchange)
+{
+ GSList *list;
+
+ for (list = folder_item_update_callbacks_list; list != NULL; list = list->next) {
+ struct FolderItemUpdateCallback *callback;
+
+ callback = list->data;
+ callback->func(item, contentchange, callback->data);
+ }
+}
+
+void folder_update_item(FolderItem *item, gboolean contentchange)
+{
+ folder_item_update_callback_execute(item, contentchange);
+}
+
+static void folder_update_item_func(FolderItem *item, gpointer data)
+{
+ gboolean contentchange = GPOINTER_TO_INT(data);
+
+ if (item->need_update) {
+ folder_item_update_callback_execute(item, contentchange);
+ item->need_update = FALSE;
+ }
+}
+
+void folder_update_items_when_required(gboolean contentchange)
+{
+ folder_func_to_all_folders(folder_update_item_func, GINT_TO_POINTER(contentchange));
+}
+
+void folder_update_item_recursive(FolderItem *item, gboolean update_summary)
+{
+ GNode *node = item->folder->node;
+ node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+ node = node->children;
+ folder_item_update_callback_execute(item, update_summary);
+ while (node != NULL) {
+ if (node && node->data) {
+ FolderItem *next_item = (FolderItem*) node->data;
+ folder_item_update_callback_execute(next_item, update_summary);
+ }
+ node = node->next;
+ }
+}
gpointer data);
typedef void (*FolderItemFunc) (FolderItem *item,
gpointer data);
+typedef void (*FolderItemUpdateFunc) (FolderItem *item,
+ gboolean contentchange,
+ gpointer data);
struct _Folder
{
void folder_item_apply_processing (FolderItem *item);
+void folder_update_item (FolderItem *item,
+ gboolean contentchange);
+void folder_update_items_when_required (gboolean contentchange);
+void folder_update_item_recursive (FolderItem *item,
+ gboolean update_summary);
+gint folder_item_update_callback_register(FolderItemUpdateFunc func,
+ gpointer data);
+void folder_item_update_callback_unregister(gint id);
+
#endif /* __FOLDER_H__ */
void folderview_create_folder_node (FolderView *folderview,
FolderItem *item);
+void folderview_update_item (FolderItem *item,
+ gboolean update_summary,
+ gpointer data);
static void folderview_scoring_cb(FolderView *folderview, guint action,
GtkWidget *widget);
static void folderview_processing_cb(FolderView *folderview, guint action,
GtkWidget *widget);
-
static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
{
{N_("/Create _new folder..."), NULL, folderview_new_mbox_folder_cb, 0, NULL},
folderview->mbox_popup = mbox_popup;
folderview->mbox_factory = mbox_factory;
+ folderview->folder_item_update_callback_id =
+ folder_item_update_callback_register(folderview_update_item, (gpointer) folderview);
+
gtk_widget_show_all(scrolledwin);
folderview_list = g_list_append(folderview_list, folderview);
folder_scan_tree(folder);
folder_set_ui_func(folder, NULL, NULL);
- folder_write_list();
folderview_set_all();
folderview_check_new(folder);
folderview_update_node(folderview, node);
}
-void folderview_update_item(FolderItem *item, gboolean update_summary)
+void folderview_update_item(FolderItem *item, gboolean update_summary, gpointer data)
{
- GList *list;
- FolderView *folderview;
+ FolderView *folderview = (FolderView *)data;
GtkCTree *ctree;
GtkCTreeNode *node;
+ g_return_if_fail(folderview != NULL);
g_return_if_fail(item != NULL);
- for (list = folderview_list; list != NULL; list = list->next) {
- folderview = (FolderView *)list->data;
- ctree = GTK_CTREE(folderview->ctree);
-
- node = gtk_ctree_find_by_row_data(ctree, NULL, item);
- if (node) {
- folderview_update_node(folderview, node);
- if (update_summary && folderview->opened == node)
- summary_show(folderview->summaryview, item);
- }
- }
-}
-
-static void folderview_update_item_recursive (FolderItem *item, gboolean update_summary)
-{
- GNode *node = item->folder->node;
- node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
- node = node->children;
- folderview_update_item(item, update_summary);
- while (node != NULL) {
- if (node && node->data) {
- FolderItem *next_item = (FolderItem*) node->data;
- folderview_update_item(next_item, update_summary);
- }
- node = node->next;
- }
-}
-
-void folderview_update_items_when_required(gboolean update_summary)
-{
- GList *list;
- FolderView *folderview;
- GtkCTree *ctree;
- GtkCTreeNode *node;
- FolderItem *item;
-
- for (list = folderview_list; list != NULL; list = list->next) {
- folderview = (FolderView *)list->data;
- ctree = GTK_CTREE(folderview->ctree);
-
- for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
- item = gtk_ctree_node_get_row_data(ctree, node);
+ ctree = GTK_CTREE(folderview->ctree);
- if (item->need_update) {
- folderview_update_node(folderview, node);
- if (update_summary && folderview->opened == node)
- summary_show(folderview->summaryview, item);
- }
- }
+ node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+ if (node) {
+ folderview_update_node(folderview, node);
+ if (update_summary && folderview->opened == node)
+ summary_show(folderview->summaryview, item);
}
}
-static void folderview_update_item_foreach_func(gpointer key, gpointer val,
- gpointer data)
-{
- folderview_update_item((FolderItem *)key, (gboolean)data);
-}
-
-void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
-{
- g_hash_table_foreach(table, folderview_update_item_foreach_func,
- (gpointer)update_summary);
-}
-
static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
GNode *gnode, GtkCTreeNode *cnode,
gpointer data)
if (folderview->opened) {
item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
if (item)
- folderview_update_item(item, TRUE);
+ folder_update_item(item, TRUE);
}
}
debug_print("can't remove src node: is null\n");
folderview_create_folder_node_recursive(folderview, new_item);
- folderview_update_item(src_parent, TRUE);
- folderview_update_item_recursive(new_item, TRUE);
+ folder_update_item(src_parent, TRUE);
+ folder_update_item_recursive(new_item, TRUE);
folderview_sort_folders(folderview,
gtk_ctree_find_by_row_data(GTK_CTREE(widget),
NULL, new_item->parent), new_item->folder);
MainWindow *mainwin;
SummaryView *summaryview;
+
+ gint folder_item_update_callback_id;
};
FolderView *folderview_create (void);
void folderview_check_new (Folder *folder);
void folderview_check_new_all (void);
-void folderview_update_item (FolderItem *item,
- gboolean update_summary);
-void folderview_update_items_when_required
- (gboolean update_summary);
-void folderview_update_item_foreach (GHashTable *table,
- gboolean update_summary);
-
void folderview_new_folder (FolderView *folderview);
void folderview_rename_folder (FolderView *folderview);
void folderview_delete_folder (FolderView *folderview);
g_warning("Can't find the folder.\n");
} else {
ok = proc_mbox(dest, filename);
- folderview_update_item(dest, TRUE);
+ folder_update_item(dest, TRUE);
}
}
}
} else if (prefs_common.scan_all_after_inc) {
item = mainwin->summaryview->folder_item;
if (FOLDER_SUMMARY_MISMATCH(item, mainwin->summaryview)) {
- folderview_update_item(item, TRUE);
+ folder_update_item(item, TRUE);
}
}
}
folderview_check_new(FOLDER(account->folder));
if (!prefs_common.scan_all_after_inc && item != NULL &&
FOLDER(account->folder) == item->folder)
- folderview_update_item(item, TRUE);
+ folder_update_item(item, TRUE);
return 1;
case A_POP3:
folderview_check_new(FOLDER(account->folder));
if (!prefs_common.scan_all_after_inc && item != NULL &&
FOLDER(account->folder) == item->folder)
- folderview_update_item(item, TRUE);
+ folder_update_item(item, TRUE);
}
}
new_msgs += pop3_state->cur_total_num;
if (!prefs_common.scan_all_after_inc) {
- folderview_update_items_when_required
+ folder_update_items_when_required
(!prefs_common.open_inbox_on_inc);
}
unlock_mbox(mbox, lockfd, LOCK_FLOCK);
if (!prefs_common.scan_all_after_inc) {
- folderview_update_items_when_required
+ folder_update_items_when_required
(!prefs_common.open_inbox_on_inc);
} else if (!prefs_common.scan_all_after_inc) {
- folderview_update_item(dest, TRUE);
+ folder_update_item(dest, TRUE);
}
return msgs;
alertpanel_error(_("Some errors occurred while sending queued messages."));
statusbar_pop_all();
folder_item_scan(folder->queue);
- folderview_update_item(folder->queue, TRUE);
if (prefs_common.savemsg && folder->outbox) {
- folderview_update_item(folder->outbox, TRUE);
+ folder_update_item(folder->outbox, TRUE);
if (folder->outbox == def_outbox)
def_outbox = NULL;
}
}
if (prefs_common.savemsg && def_outbox)
- folderview_update_item(def_outbox, TRUE);
+ folder_update_item(def_outbox, TRUE);
}
for (list = folder_get_list(); list != NULL; list = list->next) {
folder = list->data;
if (folder && folder->trash) {
- folderview_update_item(folder->trash, TRUE);
+ folder_update_item(folder->trash, TRUE);
}
}
alertpanel_error(_("Some errors occurred while sending queued messages."));
statusbar_pop_all();
folder_item_scan(folder->queue);
- folderview_update_item(folder->queue, TRUE);
+ folder_update_item(folder->queue, TRUE);
}
}
}
}
g_free(tmp);
- folderview_update_item(queue, TRUE);
+ folder_update_item(queue, TRUE);
return 0;
}
prefs->color = dialog->item->prefs->color;
/* update folder view */
if (prefs->color > 0)
- folderview_update_item(dialog->item, FALSE);
+ folder_update_item(dialog->item, FALSE);
prefs_folder_item_save_config(dialog->item);
prefs_folder_item_destroy(dialog);
procmsg_msginfo_free(msginfo);
}
- folderview_update_item(queue, FALSE);
+ folder_update_item(queue, FALSE);
return ret;
}
g_node_destroy(root);
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
summary_thread_init(summaryview);
} else {
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
procmsg_msginfo_unset_flags
(msginfo, MSG_NEW | MSG_UNREAD, 0);
- folderview_update_item(msginfo->folder, FALSE);
+ folder_update_item(msginfo->folder, FALSE);
summary_set_row_marks(summaryview, row);
gtk_clist_thaw(GTK_CLIST(ctree));
summary_status_show(summaryview);
if (changed && !prefs_common.immediate_exec) {
msginfo->to_folder->op_count--;
if (msginfo->to_folder->op_count == 0)
- folderview_update_item(msginfo->to_folder, 0);
+ folder_update_item(msginfo->to_folder, FALSE);
}
msginfo->to_folder = NULL;
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
if (changed && !prefs_common.immediate_exec) {
msginfo->to_folder->op_count--;
if (msginfo->to_folder->op_count == 0)
- folderview_update_item(msginfo->to_folder, 0);
+ folder_update_item(msginfo->to_folder, FALSE);
}
msginfo->to_folder = NULL;
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
GTK_CTREE_NODE(cur->data));
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
summary_set_row_marks(summaryview, node);
}
gtk_clist_thaw(clist);
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_unread(summaryview,
GTK_CTREE_NODE(cur->data));
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
if (changed && !prefs_common.immediate_exec) {
msginfo->to_folder->op_count--;
if (msginfo->to_folder->op_count == 0)
- folderview_update_item(msginfo->to_folder, 0);
+ folder_update_item(msginfo->to_folder, FALSE);
}
msginfo->to_folder = NULL;
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
if (changed && !prefs_common.immediate_exec) {
msginfo->to_folder->op_count--;
if (msginfo->to_folder->op_count == 0)
- folderview_update_item(msginfo->to_folder, 0);
+ folder_update_item(msginfo->to_folder, FALSE);
}
msginfo->to_folder = NULL;
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
if (!prefs_common.immediate_exec) {
msginfo->to_folder->op_count--;
if (msginfo->to_folder->op_count == 0) {
- folderview_update_item(msginfo->to_folder, 0);
+ folder_update_item(msginfo->to_folder, FALSE);
changed = TRUE;
}
}
if (changed) {
msginfo->to_folder->op_count++;
if (msginfo->to_folder->op_count == 1)
- folderview_update_item(msginfo->to_folder, 0);
+ folder_update_item(msginfo->to_folder, FALSE);
}
}
else {
summary_status_show(summaryview);
- folderview_update_item(to_folder, 0);
+ folder_update_item(to_folder, FALSE);
}
if (!summaryview->selected) { /* this was the last message */
if (!prefs_common.immediate_exec) {
msginfo->to_folder->op_count--;
if (msginfo->to_folder->op_count == 0) {
- folderview_update_item(msginfo->to_folder, 0);
+ folder_update_item(msginfo->to_folder, FALSE);
changed = TRUE;
}
}
if (changed) {
msginfo->to_folder->op_count++;
if (msginfo->to_folder->op_count == 1)
- folderview_update_item(msginfo->to_folder, 0);
+ folder_update_item(msginfo->to_folder, FALSE);
}
}
else {
summary_status_show(summaryview);
- folderview_update_item(to_folder, 0);
+ folder_update_item(to_folder, FALSE);
}
}
if (summaryview->mlist) {
procmsg_move_messages(summaryview->mlist);
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
summaryview->mlist = NULL;
}
- folderview_update_item(summaryview->folder_item, FALSE);
+ folder_update_item(summaryview->folder_item, FALSE);
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
if (summaryview->mlist) {
procmsg_copy_messages(summaryview->mlist);
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
summaryview->mlist = NULL;
if ((summaryview->folder_item != trash) && (trash != NULL)) {
- folderview_update_item(trash, FALSE);
+ folder_update_item(trash, FALSE);
}
- folderview_update_item(summaryview->folder_item, FALSE);
+ folder_update_item(summaryview->folder_item, FALSE);
}
static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
}
debug_print("done.\n");
debug_print(" <%s>", (gchar *)value);
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- folderview_update_item(msginfo->folder, FALSE);
+ folder_update_item(msginfo->folder, FALSE);
procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
}
g_hash_table_remove(mff->newsart, key);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_ignore_thread_func), summaryview);
}
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_unignore_thread_func), summaryview);
}
- folderview_update_items_when_required(FALSE);
+ folder_update_items_when_required(FALSE);
summary_status_show(summaryview);
}