From 3531e5b053d8cff1c880bfad26b1f3b1304bae2a Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 7 May 2010 15:59:12 -0600
Subject: [PATCH] Fix incomplete merging from a local branch

---
 imp/js/fullmessage-dimp.js    | 8 ++++++++
 imp/lib/Views/ShowMessage.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/imp/js/fullmessage-dimp.js b/imp/js/fullmessage-dimp.js
index d49cf116d..6e3083fee 100644
--- a/imp/js/fullmessage-dimp.js
+++ b/imp/js/fullmessage-dimp.js
@@ -149,6 +149,14 @@ var DimpFullmessage = {
                     DimpCompose.confirmCancel();
                 }
                 break;
+
+            default:
+                if (elt.hasClassName('printAtc')) {
+                    DimpCore.popupWindow(DimpCore.addURLParam(DIMP.conf.URI_VIEW, { uid: this.uid, mailbox: this.mailbox, actionID: 'print_attach', id: elt.getAttribute('mimeid') }, true), this.uid + '|' + this.mailbox + '|print', IMP.printWindow);
+                    e.stop();
+                    return;
+                }
+                break;
             }
 
             elt = elt.up();
diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php
index 9866e0b95..f379ce430 100644
--- a/imp/lib/Views/ShowMessage.php
+++ b/imp/lib/Views/ShowMessage.php
@@ -250,7 +250,7 @@ class IMP_Views_ShowMessage
             IMP_Contents::SUMMARY_DESCRIP_LINK |
             IMP_Contents::SUMMARY_DOWNLOAD |
             IMP_Contents::SUMMARY_DOWNLOAD_ZIP |
-            IMP_Contents::SUMMARY_PRINT;
+            IMP_Contents::SUMMARY_PRINT_STUB;
 
         $part_info = $part_info_display = array('icon', 'description', 'size', 'download', 'download_zip');
         $part_info_display[] = 'print';
-- 
2.11.0