diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-08-14 05:30:24 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-08-14 05:30:24 +0000 |
| commit | 89450d6b70a44ab68839798ca414dc2c20747879 (patch) | |
| tree | 9ddb4636d3d8001907fa769bbc13150da5260a62 | |
| parent | ce7a393172adf13ad1e990e970c1acac896dea7f (diff) | |
correct version of #5669
git-svn-id: http://svn.miranda-ng.org/main/trunk@5675 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/JabberG/src/jabber_opt.cpp | 12 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 44f6c1c13b..90817831b1 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -582,6 +582,11 @@ private: return;
}
+ PSHNOTIFY pshn = {0};
+ pshn.hdr.code = PSN_APPLY;
+ pshn.hdr.hwndFrom = m_hwnd;
+ SendMessage(m_hwnd, WM_NOTIFY, 0, (LPARAM)&pshn);
+
ThreadData regInfo(m_proto, JABBER_SESSION_NORMAL);
m_txtUsername.GetText(regInfo.username, SIZEOF(regInfo.username));
m_txtPassword.GetText(regInfo.password, SIZEOF(regInfo.password));
@@ -589,7 +594,6 @@ private: if (m_chkManualHost.GetState() == BST_CHECKED) {
regInfo.port = (WORD)m_txtManualPort.GetInt();
m_txtManualHost.GetTextA(regInfo.manualHost, SIZEOF(regInfo.manualHost));
- regInfo.proto->m_options.ManualConnect = TRUE;
}
else {
regInfo.port = (WORD)m_txtPort.GetInt();
@@ -1907,6 +1911,11 @@ private: return;
}
+ PSHNOTIFY pshn = {0};
+ pshn.hdr.code = PSN_APPLY;
+ pshn.hdr.hwndFrom = m_hwnd;
+ SendMessage(m_hwnd, WM_NOTIFY, 0, (LPARAM)&pshn);
+
ThreadData regInfo(m_proto, JABBER_SESSION_NORMAL);
m_txtUsername.GetText(regInfo.username, SIZEOF(regInfo.username));
m_txtPassword.GetText(regInfo.password, SIZEOF(regInfo.password));
@@ -1915,7 +1924,6 @@ private: if (m_chkManualHost.GetState() == BST_CHECKED)
{
m_txtManualHost.GetTextA(regInfo.manualHost, SIZEOF(regInfo.manualHost));
- regInfo.proto->m_options.ManualConnect = TRUE;
} else
{
regInfo.manualHost[0] = '\0';
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 4fa1415eff..4de6540b5b 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -258,14 +258,13 @@ void CJabberProto::ServerThread(ThreadData* info) info->resolveID = -1;
info->auth = NULL;
- if (info->proto->m_options.ManualConnect == TRUE) {
+ if (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);
}
- if (getWord("ManualPort", JABBER_DEFAULT_PORT) != JABBER_DEFAULT_PORT)
- info->port = getWord("ManualPort", JABBER_DEFAULT_PORT);
+ info->port = getWord("ManualPort", JABBER_DEFAULT_PORT);
}
else info->port = getWord("Port", JABBER_DEFAULT_PORT);
|