aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-07-13 05:38:08 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-07-13 05:38:08 +0000
commitc20fa6239974ff4c40903d64844a21aa2190ceaa (patch)
treee2d6277fba298b168d4a596fdf08ea548c21d789
parent4dfe03d7e946f6be9384619a71feaec1145c32e6 (diff)
l
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2612 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--src/mainwindow.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 5438a46e..b0608949 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2159,6 +2159,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
#endif
{"/Tools/Execute marked process" , M_MSG_EXIST|M_EXEC},
{"/Tools/Delete duplicated messages" , M_MSG_EXIST|M_ALLOW_DELETE},
+ {"/Tools/Concatenate separated messages"
+ , M_TARGET_EXIST|M_UNLOCKED|M_ALLOW_DELETE},
{"/Configuration/Common preferences...", M_UNLOCKED},
{"/Configuration/Filter settings...", M_UNLOCKED},
@@ -3724,8 +3726,6 @@ static void concat_partial_cb(MainWindow *mainwin, guint action,
gchar *file;
FolderItem *item;
- g_print("concat_partial_cb\n");
-
if (summary_is_locked(mainwin->summaryview))
return;
@@ -3740,6 +3740,9 @@ static void concat_partial_cb(MainWindow *mainwin, guint action,
if (procmsg_concat_partial_messages(mlist, file) == 0) {
folder_item_add_msg(item, file, NULL, TRUE);
summary_show_queued_msgs(mainwin->summaryview);
+ } else {
+ alertpanel_error
+ (_("The selected messages could not be combined."));
}
g_free(file);