From 8d6fe5753b2e570c064c9e0d438cf019a2d3e3d3 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 13 Aug 2013 16:18:58 +0000 Subject: fixed port saving when registering new jid git-svn-id: http://svn.miranda-ng.org/main/trunk@5669 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_thread.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'protocols/JabberG/src/jabber_thread.cpp') diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index e7047594cc..4fa1415eff 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -258,13 +258,14 @@ void CJabberProto::ServerThread(ThreadData* info) info->resolveID = -1; info->auth = NULL; - if (m_options.ManualConnect == TRUE) { + if (info->proto->m_options.ManualConnect == TRUE) { if ( !getString("ManualHost", &dbv)) { strncpy(info->manualHost, dbv.pszVal, SIZEOF(info->manualHost)); info->manualHost[SIZEOF(info->manualHost)-1] = '\0'; db_free(&dbv); } - info->port = getWord("ManualPort", JABBER_DEFAULT_PORT); + if (getWord("ManualPort", JABBER_DEFAULT_PORT) != JABBER_DEFAULT_PORT) + info->port = getWord("ManualPort", JABBER_DEFAULT_PORT); } else info->port = getWord("Port", JABBER_DEFAULT_PORT); @@ -2100,7 +2101,7 @@ int ThreadData::send(const char* fmt, ...) va_start(vararg, fmt); int size = 512; char* str = (char*)mir_alloc(size); - while (_vsnprintf(str, size, fmt, vararg) == -1) { + while (mir_vsnprintf(str, size, fmt, vararg) == -1) { size += 512; str = (char*)mir_realloc(str, size); } -- cgit v1.2.3