From 7524e8b875b924bb3cee484e90f6cc6bc01515a4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 13 Jun 2022 12:55:16 +0300 Subject: code cleaning --- protocols/Gadu-Gadu/src/popups.cpp | 10 +++++----- protocols/JabberG/src/jabber_proto.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/protocols/Gadu-Gadu/src/popups.cpp b/protocols/Gadu-Gadu/src/popups.cpp index 8d6d96e7f9..7ae48ba9c6 100644 --- a/protocols/Gadu-Gadu/src/popups.cpp +++ b/protocols/Gadu-Gadu/src/popups.cpp @@ -108,16 +108,16 @@ void CALLBACK sttMainThreadCallback(PVOID dwParam) GaduProto *gg = puData->gg; char szName[256]; + if (puData->flags & GG_POPUP_ERROR || puData->flags & GG_POPUP_WARNING) + mir_snprintf(szName, "%s_%s", gg->m_szModuleName, "Error"); + else + mir_snprintf(szName, "%s_%s", gg->m_szModuleName, "Notify"); + POPUPDATACLASS ppd = { sizeof(ppd) }; ppd.szTitle.w = puData->title; ppd.szText.w = puData->text; ppd.PluginData = puData; ppd.pszClassName = szName; - - if (puData->flags & GG_POPUP_ERROR || puData->flags & GG_POPUP_WARNING) - mir_snprintf(szName, "%s_%s", gg->m_szModuleName, "Error"); - else - mir_snprintf(szName, "%s_%s", gg->m_szModuleName, "Notify"); Popup_AddClass(&ppd); } diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 24c9f5b7ba..0aa73bbca2 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -76,10 +76,10 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) : m_uEnabledFeatCapsDynamic(0), m_StrmMgmt(this), - m_bAcceptHttpAuth(this, "m_bAcceptHttpAuth", true), + m_bAcceptHttpAuth(this, "AcceptHttpAuth", true), m_bAcceptNotes(this, "AcceptNotes", true), m_bAllowTimeReplies(this, "AllowTimeReplies", true), - m_bAllowVersionRequests(this, "m_bAllowVersionRequests", true), + m_bAllowVersionRequests(this, "AllowVersionRequests", true), m_bAutoAcceptAuthorization(this, "AutoAcceptAuthorization", false), m_bAutoAcceptMUC(this, "AutoAcceptMUC", false), m_bAutoAdd(this, "AutoAdd", true), -- cgit v1.2.3