diff options
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index fbb772ac56..aa6c0e5d45 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright (C) 2012-24 Miranda NG team
+Copyright (C) 2012-25 Miranda NG team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "jabber_iq.h"
#include "jabber_caps.h"
#include "jabber_disco.h"
-#include "jabber_secur.h"
#pragma warning(disable:4355)
@@ -53,12 +52,23 @@ static int compareListItems(const JABBER_LIST_ITEM *p1, const JABBER_LIST_ITEM * return mir_strcmpi(szp1, szp2);
}
+static int compareAuth(const TJabberAuth *p1, const TJabberAuth *p2)
+{
+ return p2->getPriority() - p1->getPriority(); // reverse sorting order
+}
+
+static int compareTasks(const TUpgradeTask *p1, const TUpgradeTask *p2)
+{
+ return p2->getPriority() - p1->getPriority(); // reverse sorting order
+}
+
CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
PROTO<CJabberProto>(aProtoName, aUserName),
m_impl(*this),
m_omemo(this),
m_arChatMarks(50, NumericKeySortT),
- m_arAuthMechs(1, &TJabberAuth::compare),
+ m_arAuthMechs(1, compareAuth),
+ m_arSaslUpgrade(1, compareTasks),
m_lstTransports(50, compareTransports),
m_lstRoster(50, compareListItems),
m_iqManager(this),
@@ -247,7 +257,7 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) : CJabberProto::~CJabberProto()
{
ConsoleUninit();
- GlobalMenuUninit();
+ MenuUninit();
if (m_hPopupClass)
Popup_UnregisterClass(m_hPopupClass);
@@ -286,7 +296,7 @@ void CJabberProto::OnModulesLoaded() m_pepServices.InitGui();
InitPopups();
- GlobalMenuInit();
+ MenuInit();
UpdateFeatHash();
StatusIconData sid = {};
|