From cc4647908caadb835103d1c55947b507beda9dbf Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 9 Jun 2009 17:54:33 -0600
Subject: [PATCH] Remove priority icon from preview pane.

The priority of the message can be determined from the message list
entry above so it is redundant information.
---
 imp/js/src/DimpBase.js        | 12 +-----------
 imp/lib/Views/ShowMessage.php |  6 ++++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 656b6de66..040699768 100644
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -962,19 +962,9 @@ var DimpBase = {
         DIMP.conf.msg_index = r.index;
         DIMP.conf.msg_folder = r.folder;
 
-        // Add subject/priority
+        // Add subject
         tmp = pm.select('.subject');
         tmp.invoke('update', r.subject === null ? '[' + DIMP.text.badsubject + ']' : r.subject);
-        switch (r.priority) {
-        case 'high':
-        case 'low':
-            // Can't use invoke() here - new Element must be created for
-            // each object.
-            tmp.each(function(t) {
-                t.insert({ top: new Element('DIV', { className: 'msgflags flag' + r.priority.capitalize() + 'priority' }) });
-            });
-            break;
-        }
 
         // Add date
         $('msgHeadersColl').select('.date').invoke('update', r.minidate);
diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php
index 34cdd9c9b..67ce70b9e 100644
--- a/imp/lib/Views/ShowMessage.php
+++ b/imp/lib/Views/ShowMessage.php
@@ -70,7 +70,6 @@ class IMP_Views_ShowMessage
      * 'folder' - The IMAP folder
      * 'index' - The IMAP UID
      * 'msgtext' - The text of the message
-     * 'priority' - The X-Priority of the message ('low', 'high', 'normal')
      * 'to' - The To addresses
      *
      * FOR PREVIEW MODE:
@@ -83,6 +82,7 @@ class IMP_Views_ShowMessage
      * 'bcc' - The Bcc addresses
      * 'headers' - An array of headers (not including basic headers)
      * 'list_info' - List information.
+     * 'priority' - The X-Priority of the message ('low', 'high', 'normal')
      * 'replyTo' - The Reply-to addresses
      * </pre>
      */
@@ -219,7 +219,9 @@ class IMP_Views_ShowMessage
             : htmlspecialchars(_("[No Subject]"));
 
         /* Get X-Priority. */
-        $result['priority'] = $imp_ui->getXpriority($mime_headers->getValue('x-priority'));
+        if (!$preview) {
+            $result['priority'] = $imp_ui->getXpriority($mime_headers->getValue('x-priority'));
+        }
 
         // Create message text and attachment list.
         $parts_list = $imp_contents->getContentTypeMap();
-- 
2.11.0