global variable name standardization

18 files changed, 32 insertions, 32 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 10a3436df4..81416b50c4 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1000,7 +1000,7 @@ retry:
 					cle.lParam = (LPARAM)img;

 					cle.pszService = service;

 					cle.szTooltip.a = Translate("Incoming image");

-					g_CLI.pfnAddEvent(&cle);

+					g_clistApi.pfnAddEvent(&cle);

 					ReleaseIconEx("image", FALSE);

 				}

 			}

diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp
index 95aeb08146..c8fb37df03 100644
--- a/protocols/Gadu-Gadu/src/links.cpp
+++ b/protocols/Gadu-Gadu/src/links.cpp
@@ -75,7 +75,7 @@ static INT_PTR gg_parselink(WPARAM, LPARAM lParam)
 

 		HMENU hMenu = CreatePopupMenu();

 		Menu_Build(hMenu, hInstanceMenu);

-		int cmd = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, g_CLI.hwndContactList, nullptr);

+		int cmd = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, g_clistApi.hwndContactList, nullptr);

 		DestroyMenu(hMenu);

 

 		if (cmd)

diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index ff43d197c8..4c6b695325 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -73,9 +73,9 @@ BOOL CIrcProto::CList_AddDCCChat(const CMStringW& name, const CMStringW& hostmas
 		cle.szTooltip.w = szNick;

 		cle.lParam = (LPARAM)pdci;

 

-		if (g_CLI.pfnGetEvent(hContact, 0))

-			g_CLI.pfnRemoveEvent(hContact, -100);

-		g_CLI.pfnAddEvent(&cle);

+		if (g_clistApi.pfnGetEvent(hContact, 0))

+			g_clistApi.pfnRemoveEvent(hContact, -100);

+		g_clistApi.pfnAddEvent(&cle);

 	}

 	return TRUE;

 }

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 63f729f9b5..5e9654f1ad 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -1172,17 +1172,17 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 		break;

 

 	case IDM_CPY_NICK:

-		JabberCopyText(g_CLI.hwndContactList, him->m_tszResourceName);

+		JabberCopyText(g_clistApi.hwndContactList, him->m_tszResourceName);

 		break;

 

 	case IDM_RJID_COPY:

 	case IDM_CPY_RJID:

-		JabberCopyText(g_CLI.hwndContactList, him->m_tszRealJid);

+		JabberCopyText(g_clistApi.hwndContactList, him->m_tszRealJid);

 		break;

 

 	case IDM_CPY_INROOMJID:

 		szBuffer.Format(L"%s/%s", item->jid, him->m_tszResourceName);

-		JabberCopyText(g_CLI.hwndContactList, szBuffer);

+		JabberCopyText(g_clistApi.hwndContactList, szBuffer);

 		break;

 

 	case IDM_RJID_VCARD:

@@ -1208,7 +1208,7 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 			if (wchar_t *tmp = wcschr(psr.id.w, '/'))

 				*tmp = 0;

 			psr.nick.w = psr.id.w;

-			Contact_AddBySearch(ppro->m_szModuleName, &psr, g_CLI.hwndContactList);

+			Contact_AddBySearch(ppro->m_szModuleName, &psr, g_clistApi.hwndContactList);

 		}

 		break;

 	}

@@ -1329,11 +1329,11 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g
 		break;

 

 	case IDM_CPY_RJID:

-		JabberCopyText(g_CLI.hwndContactList, item->jid);

+		JabberCopyText(g_clistApi.hwndContactList, item->jid);

 		break;

 

 	case IDM_CPY_TOPIC:

-		JabberCopyText(g_CLI.hwndContactList, item->getTemp()->m_tszStatusMessage);

+		JabberCopyText(g_clistApi.hwndContactList, item->getTemp()->m_tszStatusMessage);

 		break;

 	}

 }

diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 7a0e1a947b..73436781c3 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -78,7 +78,7 @@ CJabberInfoFrame::CJabberInfoFrame(CJabberProto *proto):
 	InitClass();

 

 	CLISTFrame frame = { sizeof(frame) };

-	HWND hwndClist = g_CLI.hwndContactList;

+	HWND hwndClist = g_clistApi.hwndContactList;

 	frame.hWnd = CreateWindowEx(0, L"JabberInfoFrameClass", nullptr, WS_CHILD|WS_VISIBLE, 0, 0, 100, 100, hwndClist, nullptr, g_plugin.getInst(), this);

 	frame.align = alBottom;

 	frame.height = 2 * SZ_FRAMEPADDING + GetSystemMetrics(SM_CYSMICON) + SZ_LINEPADDING; // compact height by default

@@ -182,7 +182,7 @@ LRESULT CJabberInfoFrame::WndProc(UINT msg, WPARAM wParam, LPARAM lParam)
 			POINT pt = { LOWORD(lParam), HIWORD(lParam) };

 			MapWindowPoints(m_hwnd, nullptr, &pt, 1);

 			HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDFRAMECONTEXT, m_frameId, 0);

-			int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, g_CLI.hwndContactList, nullptr);

+			int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, g_clistApi.hwndContactList, nullptr);

 			Clist_MenuProcessCommand(res, 0, m_frameId);

 			return 0;

 		}

diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index f7dd1d1764..a0877649a4 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -452,7 +452,7 @@ BOOL CJabberProto::AddClistHttpAuthEvent(CJabberHttpAuthParams *pParams)
 	cle.lParam = (LPARAM)pParams;

 	cle.pszService = szService;

 	cle.szTooltip.w = TranslateT("Http authentication request received");

-	g_CLI.pfnAddEvent(&cle);

+	g_clistApi.pfnAddEvent(&cle);

 	return TRUE;

 }

 

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 439d091e0d..7f5360de00 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -1081,7 +1081,7 @@ CJabberProto* JabberChooseInstance(bool bIsLink)
 

 		HMENU hMenu = CreatePopupMenu();

 		Menu_Build(hMenu, hChooserMenu);

-		int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, g_CLI.hwndContactList, nullptr);

+		int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, g_clistApi.hwndContactList, nullptr);

 		DestroyMenu(hMenu);

 

 		if (res) {

diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index b787622f2a..7441b8f669 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -785,7 +785,7 @@ bool CJabberProto::OnIncomingNote(const wchar_t *szFrom, HXML hXml)
 	cle.lParam = (LPARAM)pItem;

 	cle.pszService = szService;

 	cle.szTooltip.w = TranslateT("Incoming note");

-	g_CLI.pfnAddEvent(&cle);

+	g_clistApi.pfnAddEvent(&cle);

 	return true;

 }

 

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 11a6144b76..b58441b70f 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -1316,7 +1316,7 @@ void CJabberProto::InfoFrame_OnTransport(CJabberInfoFrame_Event *evt)
 		HMENU hContactMenu = Menu_BuildContactMenu(hContact);

 		POINT pt;

 		GetCursorPos(&pt);

-		int res = TrackPopupMenu(hContactMenu, TPM_RETURNCMD, pt.x, pt.y, 0, g_CLI.hwndContactList, nullptr);

+		int res = TrackPopupMenu(hContactMenu, TPM_RETURNCMD, pt.x, pt.y, 0, g_clistApi.hwndContactList, nullptr);

 		Clist_MenuProcessCommand(res, MPCF_CONTACTMENU, hContact);

 	}

 }

diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index 2fe625e4f8..98e976c51d 100644
--- a/protocols/JabberG/src/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
@@ -603,7 +603,7 @@ int CJabberProto::AdhocForwardHandler(HXML, CJabberIqInfo *pInfo, CJabberAdhocSe
 

 				db_event_markRead(hContact, hDbEvent);

 				if (bRemoveCListEvents)

-					g_CLI.pfnRemoveEvent(hContact, hDbEvent);

+					g_clistApi.pfnRemoveEvent(hContact, hDbEvent);

 			}

 		}

 

diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 6bf5697249..d3d6886d38 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -662,7 +662,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &
 				memcpy(pszServiceFunctionName, MRA_GOTO_INBOX, sizeof(MRA_GOTO_INBOX));

 				cle.pszService = szServiceFunction;

 			}

-			g_CLI.pfnAddEvent(&cle);

+			g_clistApi.pfnAddEvent(&cle);

 		}

 

 		Skin_PlaySound(szNewMailSound);

@@ -675,7 +675,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &
 	else {

 		if (!force_display && getByte("IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY)) {

 			if (bTrayIconNewMailNotify)

-				g_CLI.pfnRemoveEvent(0, (LPARAM)m_szModuleName);

+				g_clistApi.pfnRemoveEvent(0, (LPARAM)m_szModuleName);

 			PUDeletePopup(hWndEMailPopupStatus);

 			hWndEMailPopupStatus = nullptr;

 		}

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index fc003304bd..1ace72c08a 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -282,7 +282,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
 

 	MCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail);

 	if (hContact) {

-		g_CLI.pfnRemoveEvent(hContact, 1);

+		g_clistApi.pfnRemoveEvent(hContact, 1);

 		displayEmailCount(hContact);

 

 		if (ShowPopup && !getByte("DisableHotmailTray", 1)) {

@@ -296,7 +296,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
 			cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_SENDEMAIL);

 			cle.szTooltip.w = tBuffer2;

 			cle.pszService = buf;

-			g_CLI.pfnAddEvent(&cle);

+			g_clistApi.pfnAddEvent(&cle);

 		}

 	}

 

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index 00b0d3384c..bcafc431b8 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -47,7 +47,7 @@ INT_PTR CMsnProto::MsnGotoInbox(WPARAM, LPARAM)
 {

 	MCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail);

 	if (hContact)

-		g_CLI.pfnRemoveEvent(hContact, 1);

+		g_clistApi.pfnRemoveEvent(hContact, 1);

 

 	MsnInvokeMyURL(true, "http://mail.live.com?rru=inbox");

 	return 0;

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index b7a800b6ee..7422a9ee3d 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -742,7 +742,7 @@ void HandlePopupData(PopupData *tData)  {
 		if (tData->flags & MSN_HOTMAIL_POPUP) {

 			MCONTACT hContact = tData->proto->MSN_HContactFromEmail(tData->proto->MyOptions.szEmail, nullptr);

 			if (hContact)

-				g_CLI.pfnRemoveEvent(hContact, 1);

+				g_clistApi.pfnRemoveEvent(hContact, 1);

 			if (tData->flags & MSN_ALLOW_ENTER)

 				tData->proto->MsnInvokeMyURL(true, tData->url);

 		}

@@ -755,7 +755,7 @@ void RemovePopupData(PopupData *tData) {
 	if (tData != nullptr && (tData->flags & MSN_HOTMAIL_POPUP)) {

 		MCONTACT hContact = tData->proto->MSN_HContactFromEmail(tData->proto->MyOptions.szEmail, nullptr);

 		if (hContact)

-			g_CLI.pfnRemoveEvent(hContact, 1);

+			g_clistApi.pfnRemoveEvent(hContact, 1);

 	}

 }

 

diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index 919f92bafc..1bdb6cac2e 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
@@ -260,7 +260,7 @@ void CMsnProto::OnContactDeleted(MCONTACT hContact)
 	else {

 		char szEmail[MSN_MAX_EMAIL_LEN];

 		if (MSN_IsMeByContact(hContact, szEmail))

-			g_CLI.pfnRemoveEvent(hContact, 1);

+			g_clistApi.pfnRemoveEvent(hContact, 1);

 

 		if (szEmail[0]) {

 			debugLogA("Deleted Handler Email");

diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp
index 0b39aeea58..75fb98df62 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();

-				g_CLI.pfnAddEvent(&cle);

+				g_clistApi.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 = g_CLI.pfnGetEvent(hContact, 0)) {

+	while (CLISTEVENT *cle = g_clistApi.pfnGetEvent(hContact, 0)) {

 		if (cle->lParam == SKYPE_DB_EVENT_TYPE_INCOMING_CALL) {

-			g_CLI.pfnRemoveEvent(hContact, cle->hDbEvent);

+			g_clistApi.pfnRemoveEvent(hContact, cle->hDbEvent);

 			break;

 		}

 	}

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 1aa0f98c15..815a87b7d6 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -773,9 +773,9 @@ void CVkProto::MarkDialogAsRead(MCONTACT hContact)
 		DBEVENTINFO dbei = {};

 		if (!db_event_get(hDBEvent, &dbei) && !mir_strcmp(m_szModuleName, dbei.szModule)) {

 			db_event_markRead(hContact, hDBEvent);

-			g_CLI.pfnRemoveEvent(hMContact, hDBEvent);

+			g_clistApi.pfnRemoveEvent(hMContact, hDBEvent);

 			if (hContact != hMContact)

-				g_CLI.pfnRemoveEvent(hContact, hDBEvent);

+				g_clistApi.pfnRemoveEvent(hContact, hDBEvent);

 		}

 

 		hDBEvent = db_event_next(hContact, hDBEvent);

diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp
index 20e2bdfbe6..06656e43ad 100644
--- a/protocols/VKontakte/src/vk_feed.cpp
+++ b/protocols/VKontakte/src/vk_feed.cpp
@@ -87,7 +87,7 @@ void CVkProto::AddCListEvent(bool bNews)
 	wchar_t toolTip[255];

 	mir_snwprintf(toolTip, bNews ? TranslateT("New news") : TranslateT("New notifications"));

 	cle.szTooltip.w = toolTip;

-	g_CLI.pfnAddEvent(&cle);

+	g_clistApi.pfnAddEvent(&cle);

 }

 

 //////////////////////////////////////////////////////////////////////////////////////////////////////////