diff options
Diffstat (limited to 'plugins/Scriver')
| -rw-r--r-- | plugins/Scriver/src/chat_window.cpp | 8 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msglog.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgs.cpp | 10 | ||||
| -rw-r--r-- | plugins/Scriver/src/srmm.cpp | 4 |
5 files changed, 11 insertions, 15 deletions
diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp index 1e15a44cb4..cf8ab79cda 100644 --- a/plugins/Scriver/src/chat_window.cpp +++ b/plugins/Scriver/src/chat_window.cpp @@ -922,8 +922,8 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) if (m_si->wState & GC_EVENT_HIGHLIGHT) {
m_si->wState &= ~GC_EVENT_HIGHLIGHT;
- if (pcli->pfnGetEvent(m_hContact, 0))
- pcli->pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);
+ if (g_CLI.pfnGetEvent(m_hContact, 0))
+ g_CLI.pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);
}
FixTabIcons();
@@ -1017,8 +1017,8 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) if (db_get_w(m_hContact, m_si->pszModule, "ApparentMode", 0) != 0)
db_set_w(m_hContact, m_si->pszModule, "ApparentMode", 0);
- if (pcli->pfnGetEvent(m_hContact, 0))
- pcli->pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);
+ if (g_CLI.pfnGetEvent(m_hContact, 0))
+ g_CLI.pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);
break;
case WM_NOTIFY:
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index dfe96a95af..76b691b2c9 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1308,7 +1308,7 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) DBEVENTINFO dbei = {};
db_event_get(hDbEvent, &dbei);
if (!(dbei.flags & DBEF_SENT) && (DbEventIsMessageOrCustom(&dbei) || dbei.eventType == EVENTTYPE_URL))
- pcli->pfnRemoveEvent(m_hContact, hDbEvent);
+ g_CLI.pfnRemoveEvent(m_hContact, hDbEvent);
hDbEvent = db_event_next(m_hContact, hDbEvent);
}
}
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index f594b637c1..15de2e0439 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -128,7 +128,7 @@ EventData* getEventFromDB(CSrmmWindow *dat, MCONTACT hContact, MEVENT hDbEvent) evt->custom = DbEventIsCustomForMsgWindow(&dbei);
if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_URL || evt->custom)) {
db_event_markRead(hContact, hDbEvent);
- pcli->pfnRemoveEvent(hContact, hDbEvent);
+ g_CLI.pfnRemoveEvent(hContact, hDbEvent);
}
else if (dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE)
db_event_markRead(hContact, hDbEvent);
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 9f92022b07..fcd32c8d2e 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -102,7 +102,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam) if (dbei.flags & DBEF_SENT || !DbEventIsMessageOrCustom(&dbei))
return 0;
- pcli->pfnRemoveEvent(hContact, 1);
+ g_CLI.pfnRemoveEvent(hContact, 1);
/* does a window for the contact exist? */
if (hwnd == nullptr) {
/* new message */
@@ -123,7 +123,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam) cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
cle.pszService = MS_MSG_READMESSAGE;
cle.szTooltip.w = toolTip;
- pcli->pfnAddEvent(&cle);
+ g_CLI.pfnAddEvent(&cle);
}
return 0;
}
@@ -197,7 +197,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam) wchar_t szTip[256];
mir_snwprintf(szTip, TranslateT("%s is typing a message"), Clist_GetContactDisplayName(hContact));
if (g_dat.flags2 & SMF2_SHOWTYPINGCLIST) {
- pcli->pfnRemoveEvent(hContact, 1);
+ g_CLI.pfnRemoveEvent(hContact, 1);
CLISTEVENT cle = {};
cle.hContact = hContact;
@@ -206,7 +206,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam) cle.hIcon = GetCachedIcon("scriver_TYPING");
cle.pszService = MS_MSG_TYPINGMESSAGE;
cle.szTooltip.w = szTip;
- pcli->pfnAddEvent(&cle);
+ g_CLI.pfnAddEvent(&cle);
}
else Clist_TrayNotifyW(nullptr, TranslateT("Typing notification"), szTip, NIIF_INFO, 1000 * 4);
}
@@ -280,7 +280,7 @@ static void RestoreUnreadMessageAlerts(void) mir_snwprintf(toolTip, TranslateT("Message from %s"), Clist_GetContactDisplayName(e->hContact));
cle.hContact = e->hContact;
cle.hDbEvent = e->hEvent;
- pcli->pfnAddEvent(&cle);
+ g_CLI.pfnAddEvent(&cle);
}
}
diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp index 3fe63d5923..5987790e72 100644 --- a/plugins/Scriver/src/srmm.cpp +++ b/plugins/Scriver/src/srmm.cpp @@ -27,7 +27,6 @@ int OnLoadModule(void); int OnUnloadModule(void);
CMPlugin g_plugin;
-CLIST_INTERFACE *pcli;
ITaskbarList3 *pTaskbarInterface;
@@ -58,9 +57,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRMM, extern "C" __declspec(dllexport) int Load(void)
{
- // set the memory manager
- pcli = Clist_GetInterface();
-
if (IsWinVer7Plus())
CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface);
|