From b72670de8259131d9d7986d145720edb06e80e28 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 1 Sep 2009 21:07:30 -0600
Subject: [PATCH] Remove 'none' option for 'parts_display' pref

---
 imp/config/prefs.php.dist     | 7 +++----
 imp/lib/Views/ShowMessage.php | 5 +++--
 imp/message.php               | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 11944d495..8ae0ce8ef 100644
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -909,7 +909,7 @@ $_prefs['emoticons'] = array(
     'type' => 'checkbox',
     'desc' => _("Convert textual emoticons into graphical ones?"));
 
-// how do we display message parts?
+// how do we display message parts in the summary?
 $_prefs['parts_display'] = array(
     'value' => 'atc',
     'locked' => false,
@@ -917,10 +917,9 @@ $_prefs['parts_display'] = array(
     'type' => 'enum',
     'enum' => array(
         'all' => _("Show all parts"),
-        'atc' => _("Show attachments only"),
-        'none' => _("Don't show any parts")
+        'atc' => _("Show attachments only")
     ),
-    'desc' => _("How do you want to display the parts of a message by default?"));
+    'desc' => _("Which message parts do you want to display in the summary?"));
 
 // Display custom headers (configured via the identity screen) when viewing
 // messages?
diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php
index 197535a9b..bf8c57a99 100644
--- a/imp/lib/Views/ShowMessage.php
+++ b/imp/lib/Views/ShowMessage.php
@@ -303,7 +303,8 @@ class IMP_Views_ShowMessage
             $result['msgtext'] = $imp_ui->formatStatusMsg(array('text' => array(_("There are no parts that can be shown inline."))));
         }
 
-        if (count($atc_parts) || (count($display_ids) > 2)) {
+        if (count($atc_parts) ||
+            (($show_parts == 'all') && count($display_ids) > 2)) {
             $result['atc_label'] = ($show_parts == 'all')
                 ? _("Parts")
                 : sprintf(ngettext("%d Attachment", "%d Attachments", count($atc_parts)), count($atc_parts));
@@ -313,7 +314,7 @@ class IMP_Views_ShowMessage
         }
 
         /* Show attachment information in headers? */
-        if (!empty($atc_parts) && ($show_parts != 'none')) {
+        if (!empty($atc_parts)) {
             $tmp = '';
 
             if ($show_parts == 'all') {
diff --git a/imp/message.php b/imp/message.php
index 294cb1f1d..daecd4ab2 100644
--- a/imp/message.php
+++ b/imp/message.php
@@ -672,7 +672,7 @@ if (count($display_ids) > 2) {
 }
 
 /* Show attachment information in headers? */
-if (!empty($atc_parts) && ($show_parts != 'none')) {
+if (!empty($atc_parts)) {
     $tmp = array();
 
     if ($show_parts == 'all') {
-- 
2.11.0