global variable name standardization

2 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp
index 91085be269..eabf7ad40d 100755
--- a/plugins/Alarms/src/alarmlist.cpp
+++ b/plugins/Alarms/src/alarmlist.cpp
@@ -684,7 +684,7 @@ void DoAlarm(ALARM *alarm)
 			cle.hIcon = hIconSystray;

 			cle.szTooltip.w = alarm->szTitle;

 			cle.flags = CLEF_ONLYAFEW | CLEF_UNICODE;

-			g_CLI.pfnAddEvent(&cle);

+			g_clistApi.pfnAddEvent(&cle);

 		}

 	}

 }

diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp
index 686cbdd5c9..b2f4221e09 100755
--- a/plugins/Alarms/src/frame.cpp
+++ b/plugins/Alarms/src/frame.cpp
@@ -264,7 +264,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 					}

 					else if (!IsWindowVisible(hwnd) && count > 0) {

 						// we have reminders - show if not linked to clist or if clist is visible

-						if ((!options.hide_with_clist && FrameIsFloating()) || IsWindowVisible(g_CLI.hwndContactList)) {

+						if ((!options.hide_with_clist && FrameIsFloating()) || IsWindowVisible(g_clistApi.hwndContactList)) {

 							CallService(MS_CLIST_FRAMES_SHFRAME, (WPARAM)frame_id, 0);

 							CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)frame_id, FU_FMREDRAW | FU_FMPOS);

 						}

@@ -275,7 +275,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 						SetReminderFrameVisible(false);

 					else if (!IsWindowVisible(hwnd) && count > 0)

 						// we have reminders - show if not linked to clist or if clist is visible

-						if (!options.hide_with_clist || IsWindowVisible(g_CLI.hwndContactList))

+						if (!options.hide_with_clist || IsWindowVisible(g_clistApi.hwndContactList))

 							SetReminderFrameVisible(true);

 				}

 			}

@@ -320,14 +320,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 			SendMessage(hwnd, WMU_FILL_LIST, 0, 0);

 		else if (wParam == ID_FRAME_SHOWHIDE_TIMER && options.hide_with_clist) { // link show/hide with clist

 			// hide if we're visible and clist isn't (possible only when floating if frames are present)

-			if (!IsWindowVisible(g_CLI.hwndContactList) && IsWindowVisible(hwnd)) {

+			if (!IsWindowVisible(g_clistApi.hwndContactList) && IsWindowVisible(hwnd)) {

 				if (ServiceExists(MS_CLIST_FRAMES_SHFRAME))

 					CallService(MS_CLIST_FRAMES_SHFRAME, (WPARAM)frame_id, 0);

 				else

 					SetReminderFrameVisible(false);

 			}

 			// we're not visible but clist is - show depending on hide_with_clist and auto_showhide options

-			if (!IsWindowVisible(hwnd) && IsWindowVisible(g_CLI.hwndContactList)) {

+			if (!IsWindowVisible(hwnd) && IsWindowVisible(g_clistApi.hwndContactList)) {

 				// if not auto show/hide, show (reminders or not) if we're not visible and the clist is

 				// otherwise, show only if there are reminders

 				int count = SendMessage(hwnd_list, LB_GETCOUNT, 0, 0);

@@ -489,7 +489,7 @@ int CreateFrame()
 	if (ServiceExists(MS_CLIST_FRAMES_ADDFRAME)) {

 		hwnd_plugin = CreateWindow(L"AlarmsFrame", TranslateT("Alarms"),

 			WS_CHILD | WS_CLIPCHILDREN,

-			0, 0, 10, 10, g_CLI.hwndContactList, nullptr, g_plugin.getInst(), nullptr);

+			0, 0, 10, 10, g_clistApi.hwndContactList, nullptr, g_plugin.getInst(), nullptr);

 

 		CLISTFrame Frame = { sizeof(CLISTFrame) };

 		Frame.tname = TranslateT("Alarms");

@@ -509,7 +509,7 @@ int CreateFrame()
 

 		hwnd_frame = CreateWindowEx(WS_EX_TOOLWINDOW, L"AlarmsFrameContainer", TranslateT("Alarms"),

 			(WS_POPUPWINDOW | WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN) & ~WS_VISIBLE,

-			0, 0, 200, 100, g_CLI.hwndContactList, nullptr, g_plugin.getInst(), nullptr);

+			0, 0, 200, 100, g_clistApi.hwndContactList, nullptr, g_plugin.getInst(), nullptr);

 

 		hwnd_plugin = CreateWindow(L"AlarmsFrame", TranslateT("Alarms"),

 			WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE,

@@ -535,7 +535,7 @@ int CreateFrame()
 

 		if (!options.auto_showhide) {

 			if (options.hide_with_clist) {

-				if (IsWindowVisible(g_CLI.hwndContactList)) {

+				if (IsWindowVisible(g_clistApi.hwndContactList)) {

 					ShowWindow(hwnd_frame, SW_SHOW);

 					RefreshReminderFrame();

 				}