2005-10-12 [colin] 1.9.15cvs31

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index a32814630a474bbd583c61df0f1ad8120923165f..45e728e6481a54cffc14171cbe849aa47a8af2e1 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1225,7 +1225,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
                {"/Copy..."                     , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Move to trash"               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
-               {"/Delete..."                   , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Delete..."                   , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Cancel a news message"       , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
 
                {"/Mark"                        , M_TARGET_EXIST},
@@ -3127,7 +3127,7 @@ static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
                }
 
                if (!found) {
-                       alertpanel_error(_("You're not the author of the article\n"));
+                       alertpanel_error(_("You're not the author of the article.\n"));
                }
                
                return found;
@@ -3144,9 +3144,6 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if (!check_permission(summaryview, msginfo))
-               return;
-
        if (MSG_IS_LOCKED(msginfo->flags)) return;
 
        if (MSG_IS_DELETED(msginfo->flags)) return;
@@ -3210,8 +3207,7 @@ void summary_delete(SummaryView *summaryview)
 
        if (summary_is_locked(summaryview)) return;
 
-       if (!summaryview->folder_item ||
-           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
+       if (!summaryview->folder_item) return;
 
        aval = alertpanel(_("Delete message(s)"),
                          _("Do you really want to delete selected message(s)?"),