From 115cb9519b974d89746ffcc0b2d4a2a47e0fe489 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <mcguire@kde.org>
Date: Wed, 19 Aug 2009 19:53:02 +0000
Subject: [PATCH] Merged revisions 1012404 via svnmerge from
 svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1012404 | winterz | 2009-08-17 18:06:43 +0200 (Mon, 17 Aug 2009) | 10 lines

  Merged revisions 1011410 via svnmerge from
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1011410 | tmcguire | 2009-08-14 11:37:29 -0400 (Fri, 14 Aug 2009) | 3 lines

    Also scroll when clicking an attachment in the header.
    Thanks to the *Eagle for his help!
  ........
................

svn path=/trunk/KDE/kdepim/; revision=1013411
---
 kmreaderwin.cpp       | 4 ++++
 urlhandlermanager.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index b1ee362b5..b0c3d845f 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -2887,6 +2887,10 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
   }
   attachmentDiv.setAttribute( "style", QString( "border:2px solid %1" )
       .arg( cssHelper()->pgpWarnColor().name() ) );
+
+  // Update rendering, otherwise the rendering is not updated when the user clicks on an attachment
+  // that causes scrolling and the open attachment dialog
+  doc.updateRendering();
 }
 
 void KMReaderWin::injectAttachments()
diff --git a/urlhandlermanager.cpp b/urlhandlermanager.cpp
index 00217cc92..1af714f71 100644
--- a/urlhandlermanager.cpp
+++ b/urlhandlermanager.cpp
@@ -556,9 +556,9 @@ namespace {
 
     const bool inHeader = attachmentIsInHeader( url );
     const bool shouldShowDialog = !node->isDisplayedEmbedded() || !inHeader;
-    if ( !shouldShowDialog )
+    if ( inHeader )
       w->scrollToAttachment( node );
-    else
+    if ( shouldShowDialog )
       // PENDING(romain_kdab) : replace with toLocalFile() ?
       w->openAttachment( node->nodeId(), w->tempFileUrlFromPartNode( node ).path() );
     return true;