[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/kmail
From:       Allen Winter <winter () kde ! org>
Date:       2009-02-25 17:39:51
Message-ID: 1235583591.758264.16617.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 931708 by winterz:

in makeShowAuditLogLink, return empty QString if the auditLog is empty.
fixes kolab/issue3436

Should be merged into all branches.


 M  +10 -6     objecttreeparser.cpp  


--- branches/kdepim/enterprise/kdepim/kmail/objecttreeparser.cpp #931707:931708
@@ -2100,12 +2100,16 @@
     }
   }
 
-  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 "<a href=\"" + url.htmlURL() + "\">" + i18n("The Audit Log is a detailed \
error log from the gnupg backend", "Show Audit Log") + "</a>"; +    return "<a \
href=\"" + url.htmlURL() + "\">" + i18n("The Audit Log is a detailed error log from \
the gnupg backend", "Show Audit Log") + "</a>"; +  }
+
+  return QString::null;
 }
 
 static QString endVerboseSigstatHeader( const PartMetaData & pmd )
@@ -2251,7 +2255,7 @@
                     if( block.keyId.isEmpty() )
                         certificate = i18n("certificate");
                     else
-                        certificate = startKeyHREF + i18n("certificate") + "</a>"; 
+                        certificate = startKeyHREF + i18n("certificate") + "</a>";
                     if( !blockAddrs.empty() ){
                         if( blockAddrs.grep(
                                 msgFrom,


[prev in list] [next in list] [prev in thread] [next in thread]