( cvs diff -u -r 1.36.2.40 -r 1.36.2.41 src/common/utils.c; ) > 1.9.13cvs62.patchset
( cvs diff -u -r 1.179.2.60 -r 1.179.2.61 src/imap.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/imap-thread.h; cvs diff -u -r 1.1 -r 1.2 src/gtk/.cvsignore; ) > 1.9.13cvs63.patchset
( cvs diff -u -r 1.25.2.5 -r 1.25.2.6 tools/Makefile.am; diff -u /dev/null tools/asus_mailled.sh; ) > 1.9.13cvs64.patchset
+( cvs diff -u -r 1.213.2.53 -r 1.213.2.54 src/folder.c; cvs diff -u -r 1.150.2.41 -r 1.150.2.42 src/procmsg.c; cvs diff -u -r 1.60.2.15 -r 1.60.2.16 src/procmsg.h; cvs diff -u -r 1.395.2.116 -r 1.395.2.117 src/summaryview.c; ) > 1.9.13cvs65.patchset
return root;
}
-void procmsg_move_messages(GSList *mlist)
+gint procmsg_move_messages(GSList *mlist)
{
GSList *cur, *movelist = NULL;
MsgInfo *msginfo;
FolderItem *dest = NULL;
+ gint retval = 0;
- if (!mlist) return;
+ if (!mlist) return 0;
folder_item_update_freeze();
}
if (movelist) {
- folder_item_move_msgs(dest, movelist);
+ retval = folder_item_move_msgs(dest, movelist);
g_slist_free(movelist);
}
folder_item_update_thaw();
+ return retval;
}
void procmsg_copy_messages(GSList *mlist)
GtkCTreeNode *row,
FolderItem *to_folder);
-static void summary_execute_move (SummaryView *summaryview);
+static gint summary_execute_move (SummaryView *summaryview);
static void summary_execute_move_func (GtkCTree *ctree,
GtkCTreeNode *node,
gpointer data);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCTreeNode *node, *next;
GtkCTreeNode *new_selected = NULL;
+ gint move_val = -1;
if (!summaryview->folder_item) return FALSE;
summary_unthread_for_exec(summaryview);
folder_item_update_freeze();
- summary_execute_move(summaryview);
+ move_val = summary_execute_move(summaryview);
summary_execute_copy(summaryview);
summary_execute_delete(summaryview);
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
summary_unlock(summaryview);
+
+ if (move_val < 0)
+ summary_show(summaryview, summaryview->folder_item);
return TRUE;
}
-static void summary_execute_move(SummaryView *summaryview)
+static gint summary_execute_move(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GSList *cur;
-
+ gint val = -1;
/* search moving messages and execute */
gtk_ctree_pre_recursive(ctree, NULL, summary_execute_move_func,
summaryview);
if (summaryview->mlist) {
- procmsg_move_messages(summaryview->mlist);
+ val = procmsg_move_messages(summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
+ return val;
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,