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

List:       kde-commits
Subject:    kdenetwork/kmail
From:       David Faure <faure () kde ! org>
Date:       2003-01-17 13:37:41
[Download RAW message or body]

CVS commit by faure: 

Don't display the password in the error dialog box - now using htmlURL()


  M +1 -1      cachedimapjob.cpp   1.7
  M +7 -0      imapaccountbase.cpp   1.5
  M +7 -3      imapaccountbase.h   1.6


--- kdenetwork/kmail/cachedimapjob.cpp  #1.6:1.7
@@ -299,5 +299,5 @@ void CachedImapJob::slotPutMessageResult
     QStringList errors = job->detailedErrorStrings();
     QString myError = "<qt><p><b>" + i18n("Error while uploading message")
-      + "</b></p><p>" + i18n("Could not upload the message %1 on the server from \
folder %2 with URL %3.").arg((*it).items[0]).arg(mFolder->name()).arg((*it).url) +    \
+ "</b></p><p>" + i18n("Could not upload the message %1 on the server from folder %2 \
                with URL \
                %3.").arg((*it).items[0]).arg(mFolder->name()).arg((*it).htmlURL())
       + "</p><p>" + i18n("This could be because you don't have permission to do \
                this. The error message from the server communication is here:") + \
                "</p>";
     KMessageBox::error( 0, myError + errors[1] + '\n' + errors[2], errors[0] );

--- kdenetwork/kmail/imapaccountbase.cpp  #1.4:1.5
@@ -462,4 +462,11 @@ namespace KMail {
   }
 
+  //-----------------------------------------------------------------------------
+  QString ImapAccountBase::jobData::htmlURL() const
+  {
+    KURL u(  url );
+    return u.htmlURL();
+  }
+
 }; // namespace KMail
 

--- kdenetwork/kmail/imapaccountbase.h  #1.5:1.6
@@ -92,9 +92,13 @@ namespace KMail {
      // Needed by QMap, don't use
      jobData() : url(QString::null), parent(0), total(1), done(0), offset(0), \
                inboxOnly(false), quiet(false) {}
-      jobData( QString _url, KMFolder *_parent = 0,
+      // Real constructor
+      jobData( const QString& _url, KMFolder *_parent = 0,
           int _total = 1, int _done = 0, bool _quiet = false, bool _inboxOnly = \
                false )
         : url(_url), parent(_parent), total(_total), done(_done), offset(0),
       inboxOnly(_inboxOnly), quiet(_quiet)
       {}
+      // Return "url" in a form that can be displayed in HTML (w/o password)
+      QString htmlURL() const;
+
       QString path;
       QString url;


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