static GdkPixmap *readxpm;
static GdkBitmap *readxpmmask;
-
static void folderview_select_node (FolderView *folderview,
GtkCTreeNode *node);
static void folderview_set_folders (FolderView *folderview);
GdkDragContext *drag_context,
FolderView *folderview);
-void folderview_create_folder_node (FolderView *folderview,
+static void folderview_create_folder_node (FolderView *folderview,
FolderItem *item);
-gboolean folderview_update_folder (gpointer source,
+static gboolean folderview_update_folder (gpointer source,
gpointer userdata);
-gboolean folderview_update_item_claws (gpointer source,
+static gboolean folderview_update_item_claws (gpointer source,
gpointer data);
static void folderview_processing_cb(FolderView *folderview, guint action,
GtkWidget *widget);
}
-GtkWidget *folderview_ctree_create(FolderView *folderview)
+static GtkWidget *folderview_ctree_create(FolderView *folderview)
{
GtkWidget *ctree;
gint *col_pos;
folderview->target_list = gtk_target_list_new(folderview_drag_types, 2);
folderview_list = g_list_append(folderview_list, folderview);
+ folderview->deferred_refresh_id = -1;
return folderview;
}
}
}
+static gboolean folderview_defer_set(gpointer data)
+{
+ FolderView *folderview = (FolderView *)data;
+ MainWindow *mainwin = folderview->mainwin;
+
+ if (!mainwin)
+ return FALSE;
+ if (mainwin->lock_count)
+ return TRUE;
+
+ printf("doing deferred folderview_set now\n");
+ folderview_set(folderview);
+
+ folderview->deferred_refresh_id = -1;
+ return FALSE;
+}
+
void folderview_set(FolderView *folderview)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
MainWindow *mainwin = folderview->mainwin;
+ FolderItem *sel_item = NULL, *op_item = NULL;
if (!mainwin)
return;
+ if (mainwin->lock_count) {
+ if (folderview->deferred_refresh_id == -1)
+ folderview->deferred_refresh_id =
+ g_timeout_add(500, folderview_defer_set, folderview);
+ printf("deferred folderview_set\n");
+ return;
+ }
+
+ inc_lock();
debug_print("Setting folder info...\n");
STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
main_window_cursor_wait(mainwin);
+ if (folderview->selected)
+ sel_item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+ if (folderview->opened)
+ op_item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+
folderview->selected = NULL;
folderview->opened = NULL;
gtk_clist_freeze(GTK_CLIST(ctree));
gtk_clist_clear(GTK_CLIST(ctree));
- gtk_clist_thaw(GTK_CLIST(ctree));
- gtk_clist_freeze(GTK_CLIST(ctree));
folderview_set_folders(folderview);
+ if (sel_item)
+ folderview->selected = gtk_ctree_find_by_row_data(ctree, NULL, sel_item);
+ if (op_item)
+ folderview->opened = gtk_ctree_find_by_row_data(ctree, NULL, op_item);
+
gtk_clist_thaw(GTK_CLIST(ctree));
main_window_cursor_normal(mainwin);
STATUSBAR_POP(mainwin);
+ inc_unlock();
}
void folderview_set_all(void)
return gtk_ctree_node_get_row_data(ctree, folderview->selected);
}
-void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
-{
- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
- static GtkCTreeNode *prev_row = NULL;
- FolderItem *item;
- gint new, unread, total;
- gchar *new_str, *unread_str, *total_str;
- gint *col_pos = folderview->col_pos;
-
- if (!row) return;
-
- item = gtk_ctree_node_get_row_data(ctree, row);
- if (!item) return;
-
- gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_NEW], &new_str);
- gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_UNREAD], &unread_str);
- gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_TOTAL], &total_str);
- new = atoi(new_str);
- unread = atoi(unread_str);
- total = atoi(total_str);
-
- prev_row = row;
-
- folderview_update_node(folderview, row);
-}
-
-void folderview_append_item(FolderItem *item)
-{
- GList *list;
-
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- if (folder_item_parent(item)) return;
-
- for (list = folderview_list; list != NULL; list = list->next) {
- FolderView *folderview = (FolderView *)list->data;
- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
- GtkCTreeNode *node, *child;
- gint *col_pos = folderview->col_pos;
-
- node = gtk_ctree_find_by_row_data(ctree, NULL,
- folder_item_parent(item));
- if (node) {
- child = gtk_ctree_find_by_row_data(ctree, node, item);
- if (!child) {
- gchar *text[N_FOLDER_COLS] =
- {NULL, "0", "0", "0"};
-
- gtk_clist_freeze(GTK_CLIST(ctree));
-
- text[col_pos[F_COL_FOLDER]] = item->name;
- child = gtk_sctree_insert_node
- (ctree, node, NULL, text,
- FOLDER_SPACING,
- folderxpm, folderxpmmask,
- folderopenxpm, folderopenxpmmask,
- FALSE, FALSE);
- gtk_ctree_node_set_row_data(ctree, child, item);
- gtk_ctree_expand(ctree, node);
- folderview_update_node(folderview, child);
- folderview_sort_folders(folderview, node,
- item->folder);
-
- gtk_clist_thaw(GTK_CLIST(ctree));
- }
- }
- }
-}
-
static void folderview_set_folders(FolderView *folderview)
{
GList *list;
if (folder) {
summaryview_unlock(folderview->summaryview, item);
if (FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) {
- log_error(_("Couldn't scan folder %s\n"),
+ log_error(LOG_PROTOCOL, _("Couldn't scan folder %s\n"),
item->path ? item->path:item->name);
continue;
} else if (!FOLDER_IS_LOCAL(folder)) {
mask = openmask = searchmask;
}
- if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0 &&
- prefs_common.display_folder_unread) {
- str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
- add_unread_mark ? "+" : "");
- gtk_sctree_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_msgs > 0 || add_unread_mark) &&
- prefs_common.display_folder_unread)
- || add_sub_match_mark) {
-
- if (item->unread_msgs > 0)
- str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
- add_unread_mark || add_sub_match_mark ? "+" : "",
- item->unreadmarked_msgs > 0 ? "!":"");
- else
- str = g_strdup_printf("%s (+)", name);
- gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
- xpm, mask, openxpm, openmask,
- FALSE, GTK_CTREE_ROW(node)->expanded);
- g_free(str);
+ str = NULL;
+ if (prefs_common.display_folder_unread) {
+ if (folder_has_parent_of_type(item, F_QUEUE)) {
+ /* only total_msgs matters here */
+ if (item->total_msgs > 0) {
+ /* show total number (should be equal to the unread number)
+ and signs if any */
+ str = g_strdup_printf("%s (%d%s%s)",
+ name, item->total_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
} else {
- str = g_strdup_printf("%s%s", name,
- item->unreadmarked_msgs > 0 ? " (!)":"");
-
+ if (prefs_common.display_folder_unread == 1) {
+ if (item->unread_msgs > 0) {
+ /* show unread number and signs */
+ str = g_strdup_printf("%s (%d%s%s)",
+ name, item->unread_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ } else {
+ if (item->total_msgs > 0) {
+ /* show unread number, total number and signs if any */
+ str = g_strdup_printf("%s (%d/%d%s%s)",
+ name, item->unread_msgs, item->total_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ }
+ }
+ if ((str == NULL) &&
+ (add_unread_mark || add_sub_match_mark || (item->unreadmarked_msgs > 0))) {
+ /* no unread/total numbers, but at least one sign */
+ str = g_strdup_printf("%s (%s%s)",
+ name,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ }
+ if (str == NULL) {
+ /* last fallback, folder name only or with ! sign */
+ str = g_strdup_printf("%s%s",
+ name, (item->unreadmarked_msgs > 0) ? " (!)" : "");
+ }
gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, mask, openxpm, openmask,
FALSE, GTK_CTREE_ROW(node)->expanded);
g_free(str);
- }
g_free(name);
if (!folder_item_parent(item)) {
}
}
-gboolean folderview_update_item_claws(gpointer source, gpointer data)
+static gboolean folderview_update_item_claws(gpointer source, gpointer data)
{
FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
FolderView *folderview = (FolderView *)data;
if (node) {
if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
folderview_update_node(folderview, node);
- if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+
+ if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) &&
+ update_info->item == folderview->summaryview->folder_item &&
+ update_info->item != NULL)
if (!quicksearch_is_active(folderview->summaryview->quicksearch))
summary_show(folderview->summaryview, update_info->item);
}
return FALSE;
}
-static void folderview_update_item_foreach_func(gpointer key, gpointer val,
- gpointer data)
-{
- /* CLAWS: share this joy with other hook functions ... */
- folder_item_update((FolderItem *)key,
- (FolderItemUpdateFlags)GPOINTER_TO_INT(data));
-}
-
-void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
-{
- GList *list;
- FolderItemUpdateFlags flags;
-
- flags = update_summary ? F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT
- : 0;
- for (list = folderview_list; list != NULL; list = list->next)
- g_hash_table_foreach(table, folderview_update_item_foreach_func,
- GINT_TO_POINTER(flags));
-}
-
static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
GNode *gnode, GtkCTreeNode *cnode,
gpointer data)
return FALSE;
}
+void folderview_close_opened(FolderView *folderview)
+{
+ if (folderview->opened) {
+ FolderItem *olditem;
+
+ olditem = gtk_ctree_node_get_row_data(folderview->ctree, folderview->opened);
+ if (olditem) {
+ gchar *buf = g_strdup_printf(_("Closing Folder %s..."),
+ olditem->path ? olditem->path:olditem->name);
+ /* will be null if we just moved the previously opened folder */
+ STATUSBAR_PUSH(folderview->mainwin, buf);
+ main_window_cursor_wait(folderview->mainwin);
+ g_free(buf);
+ summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+ summary_show(folderview->summaryview, NULL);
+ folder_item_close(olditem);
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+ }
+ }
+ folderview->opened = NULL;
+}
static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
gint column, FolderView *folderview)
{
START_TIMING("");
folderview->selected = row;
+ debug_print("newly selected %p, opened %p\n", folderview->selected,
+ folderview->opened);
if (folderview->opened == row) {
folderview->open_folder = FALSE;
END_TIMING();
gtkut_ctree_set_focus_row(ctree, folderview->opened);
gtk_ctree_select(ctree, folderview->opened);
}
+ folderview->open_folder = FALSE;
END_TIMING();
return;
}
/* Save cache for old folder */
/* We don't want to lose all caches if sylpheed crashed */
- if (folderview->opened) {
- FolderItem *olditem;
-
- olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
- if (olditem) {
- buf = g_strdup_printf(_("Closing Folder %s..."),
- olditem->path ? olditem->path:olditem->name);
- /* will be null if we just moved the previously opened folder */
- STATUSBAR_PUSH(folderview->mainwin, buf);
- main_window_cursor_wait(folderview->mainwin);
- g_free(buf);
- summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
- summary_show(folderview->summaryview, NULL);
- folder_item_close(olditem);
- main_window_cursor_normal(folderview->mainwin);
- STATUSBAR_POP(folderview->mainwin);
- }
- }
+ folderview_close_opened(folderview);
/* CLAWS: set compose button type: news folder items
* always have a news folder as parent */
prefs_common.folder_col_size[type] = width;
}
-void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
+static void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
{
GNode *srcnode;
}
}
-void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
+static void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
_("Can't move a folder to one of its children."));
break;
case F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX:
- alertpanel_error(_("Folder moving cannot be done between different mailboxes."));
+ alertpanel_error(_("A folder cannot be moved between different mailboxes."));
break;
default:
alertpanel_error(copy ? _("Copy failed!"):_("Move failed!"));
}
}
-gboolean folderview_update_folder(gpointer source, gpointer userdata)
+static gboolean folderview_update_folder(gpointer source, gpointer userdata)
{
FolderUpdateData *hookdata;
FolderView *folderview;
GtkCTreeNode *node;
node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
- if (node != NULL)
+ if (node != NULL) {
gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+ if (folderview->selected == node)
+ folderview->selected = NULL;
+ if (folderview->opened == node)
+ folderview->opened = NULL;
+ }
} else if (hookdata->update_flags & (FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDER | FOLDER_REMOVE_FOLDER))
folderview_set(folderview);
if (!(item && item->folder && folder_item_parent(item) != NULL
&& FOLDER_CLASS(item->folder)->add_msg != NULL))
{
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ debug_print("item doesn't fit\n");
return;
}
if (!list) {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ debug_print("list is empty\n");
return;
}
for (tmp = list; tmp != NULL; tmp = tmp->next) {
info->msginfo = NULL;
info->file = (gchar *)tmp->data;
msglist = g_slist_prepend(msglist, info);
+ debug_print("file is a mail\n");
+ } else {
+ debug_print("file isn't a mail\n");
}
}
if (msglist) {
node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
if (!node) {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ debug_print("no node\n");
return;
}
item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
if (!item) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ debug_print("no item\n");
return;
}
folderview_finish_dnd(data->data, drag_context, time, item);