diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-23 23:29:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-23 23:29:25 +0300 |
| commit | 176e52e14fd0358a7f26ca8d7b0205244dfde2e7 (patch) | |
| tree | 10da2f8951d20103af0215c38d07ea96ba61c191 /protocols/SkypeWeb | |
| parent | 91b13500b47a51f3a284d9f409b7b8dac167a06d (diff) | |
no need to initialize pcli variable in each plugin (only in Clist_*)
Diffstat (limited to 'protocols/SkypeWeb')
| -rw-r--r-- | protocols/SkypeWeb/src/main.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_trouter.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/protocols/SkypeWeb/src/main.cpp b/protocols/SkypeWeb/src/main.cpp index 394126f175..1f280d8763 100644 --- a/protocols/SkypeWeb/src/main.cpp +++ b/protocols/SkypeWeb/src/main.cpp @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. CMPlugin g_plugin;
CHAT_MANAGER *pci;
-CLIST_INTERFACE *pcli;
char g_szMirVer[100];
HANDLE g_hCallEvent;
@@ -63,7 +62,6 @@ int CSkypeProto::OnModulesLoaded(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
- pcli = Clist_GetInterface();
pci = Chat_GetInterface();
Miranda_GetVersionText(g_szMirVer, sizeof(g_szMirVer));
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index 65e4108808..0b39aeea58 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -201,7 +201,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &) CMStringW tooltip(FORMAT, TranslateT("Incoming call from %s"), Clist_GetContactDisplayName(hContact));
cle.szTooltip.w = tooltip.GetBuffer();
- pcli->pfnAddEvent(&cle);
+ g_CLI.pfnAddEvent(&cle);
ShowNotification(Clist_GetContactDisplayName(hContact), TranslateT("Incoming call"), hContact, SKYPE_DB_EVENT_TYPE_INCOMING_CALL);
}
@@ -224,9 +224,9 @@ INT_PTR CSkypeProto::OnIncomingCallCLE(WPARAM, LPARAM lParam) INT_PTR CSkypeProto::OnIncomingCallPP(WPARAM wParam, LPARAM hContact)
{
- while (CLISTEVENT *cle = pcli->pfnGetEvent(hContact, 0)) {
+ while (CLISTEVENT *cle = g_CLI.pfnGetEvent(hContact, 0)) {
if (cle->lParam == SKYPE_DB_EVENT_TYPE_INCOMING_CALL) {
- pcli->pfnRemoveEvent(hContact, cle->hDbEvent);
+ g_CLI.pfnRemoveEvent(hContact, cle->hDbEvent);
break;
}
}
|