From eabafdf4b42139ff85a8c8212cd0a9d287171e73 Mon Sep 17 00:00:00 2001 From: Szymon Tokarz Date: Tue, 11 Nov 2014 01:04:07 +0000 Subject: 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 --- protocols/Sametime/src/messaging.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'protocols/Sametime/src/messaging.cpp') diff --git a/protocols/Sametime/src/messaging.cpp b/protocols/Sametime/src/messaging.cpp index a82a574f82..55f49ea16f 100644 --- a/protocols/Sametime/src/messaging.cpp +++ b/protocols/Sametime/src/messaging.cpp @@ -49,9 +49,7 @@ void mwIm_conversation_closed(mwConversation* conv, guint32 err) proto->debugLog(_T("mwIm_conversation_closed() start err=[%d]"), err); if (err & ERR_FAILURE && err != CONNECTION_RESET) { - char* msg = mwError(err); - proto->showPopup(TranslateTS(_A2T(msg)), SAMETIME_POPUP_ERROR); - g_free(msg); + proto->showPopup(err); if (err == ERR_NO_COMMON_ENCRYPT && !(proto->options.encrypt_session)) proto->showPopup(TranslateT("No common encryption method. Try to enable encryption in protocol options."), SAMETIME_POPUP_INFO); } -- cgit v1.2.3