/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "prefs_folder_item.h"
#include "account.h"
#include "folder.h"
+#include "foldersel.h"
#include "inc.h"
#include "statusbar.h"
+#include "hooks.h"
typedef enum
{
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);
-void folderview_update_item (FolderItem *item,
- gboolean update_summary,
- gpointer data);
+gboolean folderview_update_item (gpointer source,
+ 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 void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
+ FolderItem *to_folder);
+static void folderview_move_to_cb(FolderView *folderview);
+
static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
{
{N_("/Create _new folder..."), NULL, folderview_new_mbox_folder_cb, 0, NULL},
{N_("/_Rename folder..."), NULL, folderview_rename_mbox_folder_cb, 0, NULL},
+ {N_("/M_ove folder..."), NULL, folderview_move_to_cb, 0, NULL},
{N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _mailbox"), NULL, folderview_remove_mailbox_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Create _new folder..."), NULL, folderview_new_folder_cb, 0, NULL},
{N_("/_Rename folder..."), NULL, folderview_rename_folder_cb, 0, NULL},
+ {N_("/M_ove folder..."), NULL, folderview_move_to_cb, 0, NULL},
{N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Check for new messages"),
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Create _new folder..."), NULL, folderview_new_imap_folder_cb, 0, NULL},
{N_("/_Rename folder..."), NULL, folderview_rename_folder_cb, 0, NULL},
+ {N_("/M_ove folder..."), NULL, folderview_move_to_cb, 0, NULL},
{N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Check for new messages"),
{N_("/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Subscribe to newsgroup..."),
- NULL, folderview_new_news_group_cb, 0, NULL},
- {N_("/_Remove newsgroup"), NULL, folderview_rm_news_group_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Remove _news account"), NULL, folderview_rm_news_server_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Search folder..."), NULL, folderview_search_cb, 0, NULL},
- {N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
- {N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
+ NULL, folderview_new_news_group_cb, 0, NULL},
+ {N_("/_Remove newsgroup"), NULL, folderview_rm_news_group_cb, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Check for new messages"),
+ NULL, folderview_update_tree_cb, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/Remove _news account"), NULL, folderview_rm_news_server_cb, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Search folder..."), NULL, folderview_search_cb, 0, NULL},
+ {N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
+ {N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/S_coring..."), NULL, folderview_scoring_cb, 0, NULL}
};
folderview->mbox_factory = mbox_factory;
folderview->folder_item_update_callback_id =
- folder_item_update_callback_register(folderview_update_item, (gpointer) folderview);
+ hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
gtk_widget_show_all(scrolledwin);
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) */
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;
}
#endif
-void folderview_check_new(Folder *folder)
+/** 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;
FolderItem *item;
FolderView *folderview;
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;
if (folder_item_scan(item) < 0) {
if (folder && !FOLDER_IS_LOCAL(folder))
break;
}
folderview_update_node(folderview, node);
+ new_msgs += item->new;
+ 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;
}
void folderview_check_new_all(void)
item->name);
break;
case F_DRAFT:
- xpm = folderxpm;
- mask = folderxpmmask;
- if (item->hide_read_msgs) {
- openxpm = folderopenhrmxpm;
- openmask = folderopenhrmxpmmask;
- } else {
- openxpm = folderopenxpm;
- openmask = folderopenxpmmask;
- }
+ xpm = draftsxpm;
+ mask = draftsxpmmask;
+ openxpm = draftsopenxpm;
+ openmask = draftsopenxpmmask;
name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
!strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
item->name);
} else {
if (item->folder->type == F_NEWS &&
item->path &&
- !strcmp2(item->name, item->path) &&
- prefs_common.ng_abbrev_len < strlen(item->path))
- name = get_abbrev_newsgroup_name(item->path, prefs_common.ng_abbrev_len);
+ !strcmp2(item->name, item->path))
+ name = get_abbrev_newsgroup_name
+ (item->path,
+ prefs_common.ng_abbrev_len);
else
name = g_strdup(item->name);
}
prefs_common.display_folder_unread) {
if (item->unread > 0)
- str = g_strdup_printf("%s (%d%s)", name, item->unread,
- add_unread_mark ? "+" : "");
+ str = g_strdup_printf("%s (%d%s%s)", name, item->unread,
+ add_unread_mark ? "+" : "",
+ item->unreadmarked > 0 ? "!":"");
else
str = g_strdup_printf("%s (+)", name);
gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, mask, openxpm, openmask,
FALSE, GTK_CTREE_ROW(node)->expanded);
g_free(str);
- } else
- gtk_ctree_set_node_info(ctree, node, name, FOLDER_SPACING,
+ } else {
+ str = g_strdup_printf("%s%s", name,
+ item->unreadmarked > 0 ? " (!)":"");
+
+ gtk_ctree_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 (!item->parent) {
use_color =
(item->new > 0) ||
(add_unread_mark &&
- folderview_have_new_children(folderview, node));
+ folderview_have_new_children(folderview, node));
}
gtk_ctree_node_set_foreground(ctree, node, NULL);
gtk_ctree_node_set_row_style(ctree, node, style);
- item->need_update = FALSE;
-
if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
folderview_update_node(folderview, node);
}
-void folderview_update_item(FolderItem *item, gboolean update_summary, gpointer data)
+gboolean folderview_update_item(gpointer source, gpointer data)
{
+ FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
FolderView *folderview = (FolderView *)data;
GtkCTree *ctree;
GtkCTreeNode *node;
- g_return_if_fail(folderview != NULL);
- g_return_if_fail(item != NULL);
+ g_return_val_if_fail(update_info != NULL, TRUE);
+ g_return_val_if_fail(update_info->item != NULL, TRUE);
+ g_return_val_if_fail(folderview != NULL, FALSE);
ctree = GTK_CTREE(folderview->ctree);
- node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+ node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
if (node) {
- folderview_update_node(folderview, node);
- if (update_summary && folderview->opened == node)
- summary_show(folderview->summaryview, item);
+ if (update_info->update_flags & F_ITEM_UPDATE_MSGCNT)
+ folderview_update_node(folderview, node);
+ if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+ summary_show(folderview->summaryview, update_info->item);
}
+
+ return FALSE;
}
static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
gboolean mark_all_read = FALSE;
gboolean new_folder = FALSE;
gboolean rename_folder = FALSE;
+ gboolean move_folder = FALSE;
gboolean delete_folder = FALSE;
gboolean update_tree = FALSE;
gboolean rescan_tree = FALSE;
if (item->parent == NULL)
update_tree = rescan_tree = TRUE;
else if (item->stype == F_NORMAL)
- rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
+ move_folder = rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
else if (item->stype == F_INBOX)
folder_scoring = folder_processing = TRUE;
else if (item->stype == F_TRASH)
SET_SENS(mail_factory, "/Mark all read", mark_all_read);
SET_SENS(mail_factory, "/Create new folder...", new_folder);
SET_SENS(mail_factory, "/Rename folder...", rename_folder);
+ SET_SENS(mail_factory, "/Move folder...", move_folder);
SET_SENS(mail_factory, "/Delete folder", delete_folder);
SET_SENS(mail_factory, "/Check for new messages", update_tree);
SET_SENS(mail_factory, "/Rebuild folder tree", rescan_tree);
SET_SENS(imap_factory, "/Mark all read", mark_all_read);
SET_SENS(imap_factory, "/Create new folder...", new_folder);
SET_SENS(imap_factory, "/Rename folder...", rename_folder);
+ SET_SENS(imap_factory, "/Move folder...", move_folder);
SET_SENS(imap_factory, "/Delete folder", delete_folder);
SET_SENS(imap_factory, "/Check for new messages", update_tree);
SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
SET_SENS(news_factory, "/Mark all read", mark_all_read);
SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
-#if 0
SET_SENS(news_factory, "/Check for new messages", update_tree);
-#endif
SET_SENS(news_factory, "/Remove news account", remove_tree);
SET_SENS(news_factory, "/Search folder...", search_folder);
SET_SENS(news_factory, "/Properties...", folder_property);
menu_set_insensitive_all(GTK_MENU_SHELL(popup));
SET_SENS(mbox_factory, "/Create new folder...", new_folder);
SET_SENS(mbox_factory, "/Rename folder...", rename_folder);
+ SET_SENS(mbox_factory, "/Move folder...", move_folder);
SET_SENS(mbox_factory, "/Delete folder", delete_folder);
SET_SENS(news_factory, "/Properties...", folder_property);
SET_SENS(mbox_factory, "/Processing...", folder_processing);
olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
if (olditem) {
/* will be null if we just moved the previously opened folder */
- folder_item_write_cache(olditem);
summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
folder_item_close(olditem);
}
main_window_cursor_normal(folderview->mainwin);
STATUSBAR_POP(folderview->mainwin);
- alertpanel_error(_("Folder cound not be opened."));
+ alertpanel_error(_("Folder could not be opened."));
return;
}
/* Show messages */
summary_set_prefs_from_folderitem(folderview->summaryview, item);
opened = summary_show(folderview->summaryview, item);
+
+ /* messageview could have deleted messages in this folder */
+ if (prefs_common.immediate_exec)
+ summary_execute(folderview->summaryview);
folder_clean_cache_memory();
folderview_check_new(item->folder);
else
folderview_rescan_tree(item->folder);
-
- if (folderview->opened) {
- item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
- if (item)
- folder_update_item(item, TRUE);
- }
}
void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
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,
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
-#if CLAWS
- prefs_folder_item_create(folderview, item);
-#else
- /*
- * CLAWS: wait till Hiro has completed his stuff
- */
if (item->parent == NULL && item->folder->account)
account_open(item->folder->account);
- else
- prefs_folder_item_open(item);
-#endif
+ else {
+ summary_save_prefs_to_folderitem(folderview->summaryview, item);
+ prefs_folder_item_create(folderview, item);
+ }
+}
+
+static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
+{
+ GSList *list = NULL;
+ GSList *done = NULL;
+ GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+ for (list = folderview->nodes_to_recollapse; list != NULL; list = g_slist_next(list)) {
+ if (!gtkut_ctree_node_is_parent(GTK_CTREE_NODE(list->data), node)
+ && list->data != node) {
+ gtk_ctree_collapse(ctree, GTK_CTREE_NODE(list->data));
+ done = g_slist_append(done, GTK_CTREE_NODE(list->data));
+ }
+ }
+ for (list = done; list != NULL; list = g_slist_next(list)) {
+ folderview->nodes_to_recollapse = g_slist_remove(folderview->nodes_to_recollapse,
+ list->data);
+ }
+ g_slist_free(done);
+}
+
+static void folderview_move_to_cb(FolderView *folderview)
+{
+ FolderItem *from_folder = NULL, *to_folder = NULL;
+
+ 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)
+ return;
+
+ to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
+
+ if (!to_folder || to_folder->folder->type == F_NEWS)
+ return;
+
+ folderview_move_to(folderview, from_folder, to_folder);
+}
+
+static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
+ FolderItem *to_folder)
+{
+ FolderItem *from_parent = NULL;
+ FolderItem *new_folder = NULL;
+ GtkCTreeNode *src_node = NULL;
+ gchar *buf;
+ gint status;
+
+ src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
+ from_parent = from_folder->parent;
+ buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
+ STATUSBAR_PUSH(folderview->mainwin, buf);
+ g_free(buf);
+ summary_clear_all(folderview->summaryview);
+ folderview->opened = NULL;
+ folderview->selected = NULL;
+ gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
+ inc_lock();
+ main_window_cursor_wait(folderview->mainwin);
+ statusbar_verbosity_set(TRUE);
+ 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);
+ 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);
+ folderview_sort_folders(folderview,
+ gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree),
+ NULL, new_folder->parent), new_folder->folder);
+ folderview_select(folderview, new_folder);
+ } else {
+ statusbar_verbosity_set(FALSE);
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+ switch (status) {
+ case F_MOVE_FAILED_DEST_IS_PARENT:
+ alertpanel_error(_("Source and destination are the same."));
+ break;
+ case F_MOVE_FAILED_DEST_IS_CHILD:
+ alertpanel_error(_("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."));
+ break;
+ default:
+ alertpanel_error(_("Move failed!"));
+ break;
+ }
+ }
+ inc_unlock();
+ gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
}
static gboolean folderview_drag_motion_cb(GtkWidget *widget,
FolderItem *item, *src_item;
GtkCTreeNode *node = NULL;
gboolean acceptable = FALSE;
+ gint height = folderview->ctree->allocation.height;
+ gint total_height = folderview->ctree->requisition.height;
+ GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+ gfloat vpos = pos->value;
if (gtk_clist_get_selection_info
(GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+ if (y > height - 24 && height + vpos < total_height)
+ gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
+
+ if (y < 24 && y > 0)
+ gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+
node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
src_item = folderview->summaryview->folder_item;
src_item && src_item != item) {
switch (item->folder->type) {
case F_MH:
+ case F_MBOX:
case F_IMAP:
acceptable = TRUE;
break;
}
+ if (acceptable || (src_item && src_item == item)) {
+ folderview_recollapse_nodes(folderview, node);
+ if (item->collapsed) {
+ gtk_ctree_expand(GTK_CTREE(widget), node);
+ folderview->nodes_to_recollapse = g_slist_append(
+ folderview->nodes_to_recollapse,
+ node);
+ }
+ }
+
if (acceptable) {
gtk_signal_handler_block_by_func
(GTK_OBJECT(widget),
} else {
/* comes from folderview */
char *source;
- char *buf;
- GtkCTreeNode *src_node;
- FolderItem *new_item, *src_parent;
source = data->data + 17;
if (gtk_clist_get_selection_info
}
node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
- src_item = folder_find_item_from_path(source);
+ src_item = folder_find_item_from_identifier(source);
- if (!src_item || src_item->stype != F_NORMAL) {
+ if (!item || !src_item || src_item->stype != F_NORMAL) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
return;
}
- src_parent = src_item->parent;
- src_node = gtk_ctree_find_by_row_data(GTK_CTREE(widget), NULL, src_item);
- buf = g_strdup_printf(_("Moving %s to %s..."), src_item->name, item->name);
- STATUSBAR_PUSH(folderview->mainwin, buf);
- g_free(buf);
- main_window_cursor_wait(folderview->mainwin);
- gtk_widget_set_sensitive(folderview->ctree, FALSE);
- inc_lock();
- if ((new_item = folder_item_move_to(src_item, item)) != NULL) {
- gtk_drag_finish(drag_context, TRUE, TRUE, time);
-
- if (src_node)
- gtk_ctree_remove_node(GTK_CTREE(widget), src_node);
- else
- debug_print("can't remove src node: is null\n");
-
- folderview_create_folder_node_recursive(folderview, new_item);
- 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);
- STATUSBAR_PUSH(folderview->mainwin, _("Done."));
- main_window_cursor_normal(folderview->mainwin);
- summary_clear_all(folderview->summaryview);
- folderview->opened = NULL;
- folderview->selected = NULL;
- folderview_select(folderview, new_item);
- } else {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
- STATUSBAR_PUSH(folderview->mainwin, _("Done."));
- main_window_cursor_normal(folderview->mainwin);
- }
- inc_unlock();
- gtk_widget_set_sensitive(folderview->ctree, TRUE);
- statusbar_pop_all();
+ folderview_move_to(folderview, src_item, item);
+ gtk_drag_finish(drag_context, TRUE, TRUE, time);
}
+ folderview->nodes_to_recollapse = NULL;
}
static gint folderview_clist_compare(GtkCList *clist,
list = gtk_target_list_new(folderview_drag_types, 1);
+ folderview->nodes_to_recollapse = NULL; /* in case the last drag has been cancelled */
+
context = gtk_drag_begin(widget, list,
GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
gtk_drag_set_icon_default(context);
(GTK_CTREE(folderview->ctree),
GTK_CTREE_NODE(cur->data));
if (item) {
- source = g_strdup_printf ("FROM_OTHER_FOLDER%s", item->path);
+ source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
gtk_selection_data_set(selection_data,
selection_data->target, 8,
source, strlen(source));