From 44a76a025acf5dbe9c6e31d2822d96fbffd519b9 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Wed, 11 Mar 2009 14:43:58 +0000 Subject: [PATCH] Backport r938141 by tmcguire from trunk to the 4.2 branch: Merged revisions 934942 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r934942 | tmcguire | 2009-03-04 10:27:01 +0100 (Wed, 04 Mar 2009) | 12 lines Merged revisions 931708 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r931708 | winterz | 2009-02-25 18:39:48 +0100 (Wed, 25 Feb 2009) | 5 lines in makeShowAuditLogLink, return empty QString if the auditLog is empty. fixes kolab/issue3436 Should be merged into all branches. ........ ................ svn path=/branches/KDE/4.2/kdepim/; revision=938246 --- objecttreeparser.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/objecttreeparser.cpp b/objecttreeparser.cpp index 1ff6370ce..0146019f0 100644 --- a/objecttreeparser.cpp +++ b/objecttreeparser.cpp @@ -2099,12 +2099,16 @@ static QString makeShowAuditLogLink( const QString & auditLog ) { if ( auditLog.isEmpty() ) return i18n("No Audit Log available"); - KUrl url; - url.setProtocol( "kmail" ); - url.setPath( "showAuditLog" ); - url.addQueryItem( "log", auditLog ); + if ( !auditLog.isEmpty() ) { + KUrl url; + url.setProtocol( "kmail" ); + url.setPath( "showAuditLog" ); + url.addQueryItem( "log", auditLog ); - return "" + i18nc("The Audit Log is a detailed error log from the gnupg backend", "Show Audit Log") + ""; + return "" + i18nc("The Audit Log is a detailed error log from the gnupg backend", "Show Audit Log") + ""; + } + + return QString(); } static QString endVerboseSigstatHeader( const PartMetaData & pmd )