More quick fixes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@209 17fca916-40b9-46aa-a4ea-0a15b648b75c

7 files changed, 24 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index a47e5e0bd..4bb256236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+19 Jan 2007
+   [Pragma]
+   - Added the fixes for a couple of bugs introduced with the yesterday commit.
+     Thnx to Alexander Stillich for the detailed report :)
+
 18 Jan 2007
    [Pragma]
    - More Qt 4.x port. kvilib now compiles cleanly with both Qt 4.x and Qt 3.x.
diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
index 4d790de13..0b7d3955e 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
@@ -96,7 +96,8 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *)
 	}
 	
 	// we have no callback : output the results
-	pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%s\""),m_pDns->query());
+	QString szQuery = m_pDns->query();
+	pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%Q\""),&szQuery);
 
 	if(m_pDns->state() == KviDns::Failure)
 	{
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index 0dcfe8f46..ff482c368 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
@@ -153,7 +153,8 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns)
 		copy.run(o->window(),o->parameterList(),0,KviKvsScript::PreserveParams);
 
 	} else {
-		o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%s\""),o->dns()->query());
+		QString szQuery = o->dns()->query();
+		o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%Q\""),&szQuery);
 	
 		if(o->dns()->state() == KviDns::Failure)
 		{
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index b78b45faa..ec185c4fe 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -706,10 +706,13 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 						_retmsgtype = _type; \
 					break; \
 					default: /* also case KviCryptEngine::DecryptError: */ \
+					{ \
+						QString szEngineError = cinf->pEngine->lastError(); \
 						_target->output(KVI_OUT_SYSTEMERROR, \
-							__tr2qs("The following message appears to be encrypted, but the crypto engine failed to decode it: %s"), \
-							cinf->pEngine->lastError()); \
+							__tr2qs("The following message appears to be encrypted, but the crypto engine failed to decode it: %Q"), \
+							&szEngineError); \
 						_retptr = _txt + 1; _retmsgtype=_type; \
+					} \
 					break; \
 				} \
 			} else _retptr = _txt, _retmsgtype=_type; \
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index b87254573..cc5bf7b50 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -1061,9 +1061,12 @@ void KviChannel::ownMessage(const QString &buffer)
 					}
 					break;
 					default: // also case KviCryptEngine::EncryptError
+					{
+						QString szEngineError = cryptSessionInfo()->pEngine->lastError();
 						output(KVI_OUT_SYSTEMERROR,
-							__tr2qs("The crypto engine was unable to encrypt the current message (%Q): %s, no data sent to the server"),
-							&buffer,cryptSessionInfo()->pEngine->lastError());
+							__tr2qs("The crypto engine was unable to encrypt the current message (%Q): %Q, no data sent to the server"),
+							&buffer,&szEngineError);
+					}
 					break;
 				}
 				userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 185c9516e..650a74a7c 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -617,9 +617,12 @@ void KviQuery::ownMessage(const QString &buffer)
 					}
 					break;
 					default: // also case KviCryptEngine::EncryptError
+					{
+						QString szEngineError = cryptSessionInfo()->pEngine->lastError();
 						output(KVI_OUT_SYSTEMERROR,
 							__tr2qs("The crypto engine was unable to encrypt the current message (%Q): %s, no data sent to the server"),
-							&buffer,cryptSessionInfo()->pEngine->lastError());
+							&buffer,&szEngineError);
+					}
 					break;
 				}
 				userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index c04ea2c15..fbabdad85 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -1487,7 +1487,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 				m_bIpV6 = true;
 			} else {
 #else
-				c->warning(__tr2qs("Invalid IP address specified ('%Q')"),m_szLocalIp);
+				c->warning(__tr2qs("Invalid IP address specified ('%Q')"),&m_szLocalIp);
 				c->returnValue()->setBoolean(false);
 				reset();
 				return true;