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

List:       kmail-devel
Subject:    patches for bug 37948
From:       "Sean O'Dubhghaill" <sean () doyle55 ! freeserve ! co ! uk>
Date:       2004-03-28 21:11:25
Message-ID: 200403282211.25466.sean () doyle55 ! freeserve ! co ! uk
[Download RAW message or body]

hi

Here are my first ever patches for any project so if someone could have a wee 
look to see if i have done anything stupid that will help. They should close 
bug 37948 as they include the servers name in the error message.

imap4.diff is for kde 3.2.1
imap4cvs is for you guessed it cvs

I'm not subscribed to this list so please CC me.

cheers,
sean

["imap4.diff" (text/x-diff)]

--- kioslave/imap4/imap4.cc	2004-02-28 09:44:23.000000000 +0000
+++ imap4.cc	2004-03-28 21:07:18.000000000 +0100
@@ -1508,13 +1508,13 @@
           "password."));
       else if (!clientLogin (myUser, myPass, resultInfo))
         error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to login. Probably the "
-        "password is wrong.\nThe server replied:\n%1").arg(resultInfo));
+        "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
     }
     else
     {
       if (!clientAuthenticate (myUser, myPass, myAuth, mySSL, resultInfo))
         error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to authenticate via %1.\n"
-        "The server replied:\n%2").arg(myAuth).arg(resultInfo));
+        "The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
     }
   }
 

["imap4cvs.diff" (text/x-diff)]

--- kioslave/imap4/imap4.cc	2004-03-28 21:31:02.000000000 +0100
+++ imap4.cc	2004-03-26 21:20:41.000000000 +0000
@@ -1509,13 +1509,13 @@
           "password."));
       else if (!clientLogin (myUser, myPass, resultInfo))
         error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to login. Probably the "
-        "password is wrong.\nThe server %1 replied:\n%2").arg(myHost).arg(resultInfo));
+        "password is wrong.\nThe server replied:\n%1").arg(resultInfo));
     }
     else
     {
       if (!clientAuthenticate (myUser, myPass, myAuth, mySSL, resultInfo))
         error(KIO::ERR_COULD_NOT_LOGIN, i18n("Unable to authenticate via %1.\n"
-        "The server %2 replied:\n%3").arg(myAuth).arg(myHost).arg(resultInfo));
+        "The server replied:\n%2").arg(myAuth).arg(resultInfo));
     }
   }
 


_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel


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