7 files changed, 13 insertions, 13 deletions
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);
 			}
 		}