diff options
| author | George Hazan <ghazan@miranda.im> | 2020-01-25 14:24:53 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-01-25 14:24:53 +0300 |
| commit | 9cca190bc3022311915eb1e95b3cc3bb89aed328 (patch) | |
| tree | f0e27680e6dae1a0df044ae59ad86ccac59d0db7 /protocols/Sametime/src | |
| parent | cf83f17e172253faf44737b8f4c27945e9f671e5 (diff) | |
massive code cleaning:
- GCHOOK structure normalized (i.e. inlined SESSION_INFO fields replaced with a reference to SESSION_INFO);
- fake CMsgDialog declaration added to m_srmm_int.h, thus duplicated declarations in plugins aren't needed anymore
- other minor changes
Diffstat (limited to 'protocols/Sametime/src')
| -rw-r--r-- | protocols/Sametime/src/StdAfx.h | 2 | ||||
| -rw-r--r-- | protocols/Sametime/src/conference.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/Sametime/src/StdAfx.h b/protocols/Sametime/src/StdAfx.h index 86a25658ad..1d16c4493a 100644 --- a/protocols/Sametime/src/StdAfx.h +++ b/protocols/Sametime/src/StdAfx.h @@ -71,6 +71,6 @@ extern "C" { #include <m_idle.h>
#include <m_contacts.h>
#include <m_popup.h>
-#include <m_chat.h>
+#include <m_chat_int.h>
#include <m_genmenu.h>
#include <m_icolib.h>
diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index 666ed44cfe..ee0a6a35b9 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -281,12 +281,12 @@ int CSametimeProto::GcEventHook(WPARAM, LPARAM lParam) { GCHOOK* gch = (GCHOOK*)lParam;
- if (strcmp(gch->pszModule, m_szModuleName) != 0) return 0;
+ if (strcmp(gch->si->pszModule, m_szModuleName) != 0) return 0;
GList *conferences = mwServiceConference_getConferences(service_conference);
for (GList *conf = conferences;conf;conf = conf->next) {
wchar_t* tszConfId = mir_utf8decodeW(mwConference_getName((mwConference*)conf->data));
- if (mir_wstrcmp(gch->ptszID, tszConfId) == 0) {
+ if (mir_wstrcmp(gch->si->ptszID, tszConfId) == 0) {
switch(gch->iType) {
case GC_USER_MESSAGE:
{
|