diff options
| author | Szymon Tokarz <wsx22@o2.pl> | 2014-11-11 01:04:07 +0000 |
|---|---|---|
| committer | Szymon Tokarz <wsx22@o2.pl> | 2014-11-11 01:04:07 +0000 |
| commit | eabafdf4b42139ff85a8c8212cd0a9d287171e73 (patch) | |
| tree | ef952efd34dddb609a4590f79cdc5e481f647a8e /protocols/Sametime/src/sametime_session.cpp | |
| parent | b43b7abf33f5b2ab480a85584df0e3ce8c76a8ca (diff) | |
Sametime protocol:
- Add more options to client major/minor version settings, add gui combobox (db settings ClientVersionMajor, ClientVersionMinor used and still works if set from db)
Enables connect to more modern servers
- More ClientIDs on combobox list.
- Better list of error codes, now translateable.
- Merge some 3rd party patches to meanwhile lib.
https://gist.github.com/jricesterenator/c67dfbdd0887f7ecc26a
https://github.com/mrcsparker/meanwhile/commit/e2299d3c70a3351ab148f4febdebceb71f7b526d
https://github.com/mrcsparker/meanwhile/commit/2e68651f13aebeab9e71312e59da204d3d72092c
git-svn-id: http://svn.miranda-ng.org/main/trunk@10949 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Sametime/src/sametime_session.cpp')
| -rw-r--r-- | protocols/Sametime/src/sametime_session.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 5abc64a675..64b5894f28 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -69,14 +69,9 @@ void CSametimeProto::InitMeanwhileServices() mwSession_setProperty(session, mwSession_AUTH_PASSWORD, options.pword, NULL);
mwSession_setProperty(session, mwSession_CLIENT_TYPE_ID, (void*)options.client_id, NULL);
- if (options.use_old_default_client_ver) {
- mwSession_setProperty(session, mwSession_CLIENT_VER_MAJOR, GUINT_TO_POINTER(db_get_w(0, m_szModuleName, "ClientVersionMajor", MW_PROTOCOL_VERSION_MAJOR)), 0);
- mwSession_setProperty(session, mwSession_CLIENT_VER_MINOR, GUINT_TO_POINTER(db_get_w(0, m_szModuleName, "ClientVersionMinor", MW_PROTOCOL_VERSION_MINOR)), 0);
- }
- else {
- mwSession_setProperty(session, mwSession_CLIENT_VER_MAJOR, GUINT_TO_POINTER(db_get_w(0, m_szModuleName, "ClientVersionMajor", 0x001e)), 0);
- mwSession_setProperty(session, mwSession_CLIENT_VER_MINOR, GUINT_TO_POINTER(db_get_w(0, m_szModuleName, "ClientVersionMinor", 0x196f)), 0);
- }
+ mwSession_setProperty(session, mwSession_CLIENT_VER_MAJOR, (void*)options.client_versionMajor, NULL);
+ mwSession_setProperty(session, mwSession_CLIENT_VER_MINOR, (void*)options.client_versionMinor, NULL);
+
}
void CSametimeProto::DeinitMeanwhileServices()
@@ -111,11 +106,7 @@ void __cdecl SessionStateChange(mwSession* session, mwSessionState state, gpoint case mwSession_STOPPING:
if ((int)info) {// & ERR_FAILURE) {
- char *msg = mwError((int)info);
- TCHAR *msgT = mir_utf8decodeT(msg);
- proto->showPopup(TranslateTS(msgT), SAMETIME_POPUP_ERROR);
- mir_free(msgT);
- g_free(msg);
+ proto->showPopup((int)info);
}
proto->SessionStopping();
break;
|