1 files changed, 9 insertions, 10 deletions

diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 6a1b505..d5a528c 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -184,3 +184,3 @@ void SMTPwrapper::connect_server()
 {
-    const char *server, *user, *pass;
+    QString server, user, pass;
     bool ssl;
@@ -190,3 +190,2 @@ void SMTPwrapper::connect_server()
     bool force_tls=false;
-    server = user = pass = 0;
     QString failuretext = "";
@@ -196,3 +195,3 @@ void SMTPwrapper::connect_server()
     }
-    server = m_SmtpAccount->getServer().latin1();
+    server = m_SmtpAccount->getServer();
     if  ( m_SmtpAccount->ConnectionType() == 2 ) {
@@ -217,6 +216,6 @@ void SMTPwrapper::connect_server()
         ; // odebug << "SSL session" << oendl; 
-        err = mailsmtp_ssl_connect( m_smtp, server, port );
+        err = mailsmtp_ssl_connect( m_smtp, server.latin1(), port );
     } else {
         ; // odebug << "No SSL session" << oendl; 
-        err = mailsmtp_socket_connect( m_smtp, server, port );
+        err = mailsmtp_socket_connect( m_smtp, server.latin1(), port );
     }
@@ -260,4 +259,4 @@ void SMTPwrapper::connect_server()
                 // ok
-                user = login.getUser().latin1();
-                pass = login.getPassword().latin1();
+                user = login.getUser();
+                pass = login.getPassword();
             } else {
@@ -267,4 +266,4 @@ void SMTPwrapper::connect_server()
         } else {
-            user = m_SmtpAccount->getUser().latin1();
-            pass = m_SmtpAccount->getPassword().latin1();
+            user = m_SmtpAccount->getUser();
+            pass = m_SmtpAccount->getPassword();
         }
@@ -272,3 +271,3 @@ void SMTPwrapper::connect_server()
         if (result) {
-            err = mailsmtp_auth( m_smtp, (char*)user, (char*)pass );
+            err = mailsmtp_auth( m_smtp, (char*)user.latin1(), (char*)pass.latin1() );
             if ( err == MAILSMTP_NO_ERROR ) {