global variable name standardization

12 files changed, 59 insertions, 59 deletions

diff --git a/src/core/stdclist/src/clistmenus.cpp b/src/core/stdclist/src/clistmenus.cpp
index 9ac72f36e2..e88326e0ea 100644
--- a/src/core/stdclist/src/clistmenus.cpp
+++ b/src/core/stdclist/src/clistmenus.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 static INT_PTR CloseAction(WPARAM, LPARAM)

 {

 	if (Miranda_OkToExit())

-		DestroyWindow(g_CLI.hwndContactList);

+		DestroyWindow(g_clistApi.hwndContactList);

 

 	return(0);

 }

diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index 65e6f790fb..10892215ac 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -178,7 +178,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 				Clist_TrayIconIconsChanged();

 				Clist_LoadContactTree();  /* this won't do job properly since it only really works when changes happen */

-				g_CLI.pfnInvalidateDisplayNameCacheEntry(INVALID_CONTACT_ID);        /* force reshuffle */

+				g_clistApi.pfnInvalidateDisplayNameCacheEntry(INVALID_CONTACT_ID);        /* force reshuffle */

 				return TRUE;

 			}

 			break;

diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index 6d1f00ddd3..2584384cad 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -168,11 +168,11 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				wchar_t title[256];

 				GetDlgItemText(hwndDlg, IDC_TITLETEXT, title, _countof(title));

 				db_set_ws(NULL, "CList", "TitleText", title);

-				SetWindowText(g_CLI.hwndContactList, title);

+				SetWindowText(g_clistApi.hwndContactList, title);

 			}

 

-			g_CLI.pfnLoadCluiGlobalOpts();

-			SetWindowPos(g_CLI.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST,

+			g_clistApi.pfnLoadCluiGlobalOpts();

+			SetWindowPos(g_clistApi.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST,

 				0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);

 

 			if (IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)) {

@@ -180,50 +180,50 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				// See http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/shell_int/shell_int_programming/taskbar.asp

 				WINDOWPLACEMENT p;

 				p.length = sizeof(p);

-				GetWindowPlacement(g_CLI.hwndContactList, &p);

-				ShowWindow(g_CLI.hwndContactList, SW_HIDE);

-				SetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE,

-					GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE) & ~WS_EX_APPWINDOW | WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE);

-				SetWindowPlacement(g_CLI.hwndContactList, &p);

+				GetWindowPlacement(g_clistApi.hwndContactList, &p);

+				ShowWindow(g_clistApi.hwndContactList, SW_HIDE);

+				SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE,

+					GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) & ~WS_EX_APPWINDOW | WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE);

+				SetWindowPlacement(g_clistApi.hwndContactList, &p);

 			}

 			else

-				SetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE) & ~WS_EX_TOOLWINDOW | WS_EX_APPWINDOW);

+				SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) & ~WS_EX_TOOLWINDOW | WS_EX_APPWINDOW);

 

 			if (IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)) {

 				HWND hProgMan = FindWindow(L"Progman", nullptr);

 				if (hProgMan)

-					SetParent(g_CLI.hwndContactList, hProgMan);

+					SetParent(g_clistApi.hwndContactList, hProgMan);

 			}

 			else

-				SetParent(g_CLI.hwndContactList, nullptr);

+				SetParent(g_clistApi.hwndContactList, nullptr);

 

 			if (IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION)) {

-				int style = GetWindowLongPtr(g_CLI.hwndContactList, GWL_STYLE) | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;

-				SetWindowLongPtr(g_CLI.hwndContactList, GWL_STYLE, style);

+				int style = GetWindowLongPtr(g_clistApi.hwndContactList, GWL_STYLE) | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;

+				SetWindowLongPtr(g_clistApi.hwndContactList, GWL_STYLE, style);

 			}

 			else {

-				SetWindowLongPtr(g_CLI.hwndContactList, GWL_STYLE,

-					GetWindowLongPtr(g_CLI.hwndContactList, GWL_STYLE) & ~(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX));

+				SetWindowLongPtr(g_clistApi.hwndContactList, GWL_STYLE,

+					GetWindowLongPtr(g_clistApi.hwndContactList, GWL_STYLE) & ~(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX));

 			}

 

 			if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU))

-				SetMenu(g_CLI.hwndContactList, nullptr);

+				SetMenu(g_clistApi.hwndContactList, nullptr);

 			else

-				SetMenu(g_CLI.hwndContactList, g_CLI.hMenuMain);

+				SetMenu(g_clistApi.hwndContactList, g_clistApi.hMenuMain);

 

-			SetWindowPos(g_CLI.hwndContactList, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);

-			RedrawWindow(g_CLI.hwndContactList, nullptr, nullptr, RDW_FRAME | RDW_INVALIDATE);

+			SetWindowPos(g_clistApi.hwndContactList, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);

+			RedrawWindow(g_clistApi.hwndContactList, nullptr, nullptr, RDW_FRAME | RDW_INVALIDATE);

 

-			if (IsIconic(g_CLI.hwndContactList) && BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_TOOLWND))

-				ShowWindow(g_CLI.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY) ? SW_HIDE : SW_SHOW);

+			if (IsIconic(g_clistApi.hwndContactList) && BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_TOOLWND))

+				ShowWindow(g_clistApi.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY) ? SW_HIDE : SW_SHOW);

 			if (IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) {

-				SetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED);

-				SetLayeredWindowAttributes(g_CLI.hwndContactList, RGB(0, 0, 0), (BYTE)db_get_b(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA);

+				SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED);

+				SetLayeredWindowAttributes(g_clistApi.hwndContactList, RGB(0, 0, 0), (BYTE)db_get_b(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA);

 			}

 			else

-				SetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_CLI.hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED);

+				SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED);

 

-			SendMessage(g_CLI.hwndContactTree, WM_SIZE, 0, 0);        //forces it to send a cln_listsizechanged

+			SendMessage(g_clistApi.hwndContactTree, WM_SIZE, 0, 0);        //forces it to send a cln_listsizechanged

 

 			return TRUE;

 		}

@@ -283,22 +283,22 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			db_set_b(NULL, "CLUI", "SBarRightClk", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA));

 			db_set_b(NULL, "CLUI", "EqualSections", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS));

 			db_set_b(NULL, "CLUI", "SBarBevel", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL));

-			g_CLI.pfnLoadCluiGlobalOpts();

+			g_clistApi.pfnLoadCluiGlobalOpts();

 			if (db_get_b(NULL, "CLUI", "ShowGrip", 1) != (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) {

-				HWND parent = GetParent(g_CLI.hwndStatus);

+				HWND parent = GetParent(g_clistApi.hwndStatus);

 				int flags = WS_CHILD | CCS_BOTTOM;

 				db_set_b(NULL, "CLUI", "ShowGrip", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP));

-				ShowWindow(g_CLI.hwndStatus, SW_HIDE);

-				DestroyWindow(g_CLI.hwndStatus);

+				ShowWindow(g_clistApi.hwndStatus, SW_HIDE);

+				DestroyWindow(g_clistApi.hwndStatus);

 				flags |= db_get_b(NULL, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0;

 				flags |= db_get_b(NULL, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0;

-				g_CLI.hwndStatus = CreateWindow(STATUSCLASSNAME, nullptr, flags, 0, 0, 0, 0, parent, nullptr, g_plugin.getInst(), nullptr);

+				g_clistApi.hwndStatus = CreateWindow(STATUSCLASSNAME, nullptr, flags, 0, 0, 0, 0, parent, nullptr, g_plugin.getInst(), nullptr);

 			}

 			if (IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR))

-				ShowWindow(g_CLI.hwndStatus, SW_SHOW);

+				ShowWindow(g_clistApi.hwndStatus, SW_SHOW);

 			else

-				ShowWindow(g_CLI.hwndStatus, SW_HIDE);

-			SendMessage(g_CLI.hwndContactList, WM_SIZE, 0, 0);

+				ShowWindow(g_clistApi.hwndStatus, SW_HIDE);

+			SendMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0);

 			return TRUE;

 		}

 		break;

diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp
index fc49caac7a..6d86619ed9 100644
--- a/src/core/stdclist/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -99,7 +99,7 @@ static int OnOptsInit(WPARAM wParam, LPARAM lParam)
 

 static INT_PTR GetStatusMode(WPARAM, LPARAM)

 {

-	return g_CLI.currentDesiredStatusMode;

+	return g_clistApi.currentDesiredStatusMode;

 }

 

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

@@ -111,11 +111,11 @@ extern "C" __declspec(dllexport) int CListInitialise()
 	g_bSortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);

 

 	Clist_GetInterface();

-	coreCli = g_CLI;

-	g_CLI.hInst = g_plugin.getInst();

-	g_CLI.pfnPaintClc = PaintClc;

-	g_CLI.pfnLoadClcOptions = LoadClcOptions;

-	g_CLI.pfnCompareContacts = CompareContacts;

+	coreCli = g_clistApi;

+	g_clistApi.hInst = g_plugin.getInst();

+	g_clistApi.pfnPaintClc = PaintClc;

+	g_clistApi.pfnLoadClcOptions = LoadClcOptions;

+	g_clistApi.pfnCompareContacts = CompareContacts;

 

 	CreateServiceFunction(MS_CLIST_GETSTATUSMODE, GetStatusMode);

 

diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index fa85763130..977536464d 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -114,7 +114,7 @@ void PushFileEvent(MCONTACT hContact, MEVENT hdbe, LPARAM lParam)
 		cle.flags |= CLEF_UNICODE;

 		cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_FILE);

 		cle.pszService = "SRFile/RecvFile";

-		g_CLI.pfnAddEvent(&cle);

+		g_clistApi.pfnAddEvent(&cle);

 	}

 }

 

@@ -306,9 +306,9 @@ static int SRFileProtoAck(WPARAM, LPARAM lParam)
 	ACKDATA *ack = (ACKDATA*)lParam;

 	if (ack->type == ACKTYPE_FILE) {

 		int iEvent = 0;

-		while (CLISTEVENT *cle = g_CLI.pfnGetEvent(ack->hContact, iEvent++))

+		while (CLISTEVENT *cle = g_clistApi.pfnGetEvent(ack->hContact, iEvent++))

 			if (cle->lParam == (LPARAM)ack->hProcess)

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

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

 	}

 	return 0;

 }

diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index 38d36978ad..30dfa94bb8 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -73,10 +73,10 @@ static void OnCreateModule(MODULEINFO *mi)
 {
 	OnDestroyModule(mi);
 
-	mi->OnlineIconIndex = g_CLI.pfnIconFromStatusMode(mi->pszModule, ID_STATUS_ONLINE, 0);
+	mi->OnlineIconIndex = g_clistApi.pfnIconFromStatusMode(mi->pszModule, ID_STATUS_ONLINE, 0);
 	mi->hOnlineIcon = ImageList_GetIcon(Clist_GetImageList(), mi->OnlineIconIndex, ILD_TRANSPARENT);
 
-	mi->OfflineIconIndex = g_CLI.pfnIconFromStatusMode(mi->pszModule, ID_STATUS_OFFLINE, 0);
+	mi->OfflineIconIndex = g_clistApi.pfnIconFromStatusMode(mi->pszModule, ID_STATUS_OFFLINE, 0);
 	mi->hOfflineIcon = ImageList_GetIcon(Clist_GetImageList(), mi->OfflineIconIndex, ILD_TRANSPARENT);
 }
 
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 828961afc8..8b2aa83de4 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -104,8 +104,8 @@ void CChatRoomDlg::OnActivate()
 		FlashWindow(m_pOwner->GetHwnd(), FALSE);
 	if (db_get_w(m_hContact, m_si->pszModule, "ApparentMode", 0) != 0)
 		db_set_w(m_hContact, m_si->pszModule, "ApparentMode", 0);
-	if (g_CLI.pfnGetEvent(m_hContact, 0))
-		g_CLI.pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);
+	if (g_clistApi.pfnGetEvent(m_hContact, 0))
+		g_clistApi.pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);
 }
 
 void CChatRoomDlg::onClick_Filter(CCtrlButton *pButton)
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index e8e95ecff8..8a9524e3b4 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -455,7 +455,7 @@ void CSrmmWindow::OnSplitterMoved(CSplitter *pSplitter)
 

 int CSrmmWindow::GetImageId() const

 {

-	return (WORD)g_CLI.pfnIconFromStatusMode(m_szProto, m_wStatus, m_hContact);

+	return (WORD)g_clistApi.pfnIconFromStatusMode(m_szProto, m_wStatus, m_hContact);

 }

 

 void CSrmmWindow::NotifyTyping(int mode)

diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 029d72a8e2..1a2d22043b 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -215,7 +215,7 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat)
 	

 	if (!(dbei.flags & DBEF_SENT) && (dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) {

 		db_event_markRead(dat->hContact, dat->hDbEvent);

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

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

 	}

 	else if (dbei.eventType == EVENTTYPE_JABBER_CHATSTATES || dbei.eventType == EVENTTYPE_JABBER_PRESENCE) {

 		db_event_markRead(dat->hContact, dat->hDbEvent);

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 9f4532041b..869d679855 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -90,7 +90,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	if (dbei.flags & (DBEF_SENT | DBEF_READ) || !(dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei)))

 		return 0;

 

-	g_CLI.pfnRemoveEvent(hContact, 1);

+	g_clistApi.pfnRemoveEvent(hContact, 1);

 	/* does a window for the contact exist? */

 	HWND hwnd = Srmm_FindWindow(hContact);

 	if (hwnd) {

@@ -127,7 +127,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 	cle.pszService = MS_MSG_READMESSAGE;

 	cle.szTooltip.w = toolTip;

-	g_CLI.pfnAddEvent(&cle);

+	g_clistApi.pfnAddEvent(&cle);

 	return 0;

 }

 

@@ -200,7 +200,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 		mir_snwprintf(szTip, TranslateT("%s is typing a message"), Clist_GetContactDisplayName(hContact));

 

 		if (g_dat.bShowTypingClist) {

-			g_CLI.pfnRemoveEvent(hContact, 1);

+			g_clistApi.pfnRemoveEvent(hContact, 1);

 

 			CLISTEVENT cle = {};

 			cle.hContact = hContact;

@@ -209,7 +209,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 			cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_TYPING);

 			cle.pszService = MS_MSG_READMESSAGE;

 			cle.szTooltip.w = szTip;

-			g_CLI.pfnAddEvent(&cle);

+			g_clistApi.pfnAddEvent(&cle);

 

 			IcoLib_ReleaseIcon(cle.hIcon);

 		}

@@ -304,7 +304,7 @@ static void RestoreUnreadMessageAlerts(void)
 		mir_snwprintf(toolTip, TranslateT("Message from %s"), Clist_GetContactDisplayName(e->hContact));

 		cle.hContact = e->hContact;

 		cle.hDbEvent = e->hEvent;

-		g_CLI.pfnAddEvent(&cle);

+		g_clistApi.pfnAddEvent(&cle);

 	}

 }

 

diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 1b4f8867be..eee76499a3 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -408,8 +408,8 @@ void CTabbedWindow::TabClicked()
 		if (s->wState & GC_EVENT_HIGHLIGHT) {
 			s->wState &= ~GC_EVENT_HIGHLIGHT;
 
-			if (g_CLI.pfnGetEvent(s->hContact, 0))
-				g_CLI.pfnRemoveEvent(s->hContact, GC_FAKE_EVENT);
+			if (g_clistApi.pfnGetEvent(s->hContact, 0))
+				g_clistApi.pfnRemoveEvent(s->hContact, GC_FAKE_EVENT);
 		}
 
 		FixTabIcons(pDlg);
diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp
index 8a0980bbae..14adec2c65 100644
--- a/src/core/stduseronline/src/useronline.cpp
+++ b/src/core/stduseronline/src/useronline.cpp
@@ -42,7 +42,7 @@ static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
 		 int lastEvent = (int)db_get_dw(hContact, MODULENAME, "LastEvent", 0);

 

        if (lastEvent) {

-			 g_CLI.pfnRemoveEvent(hContact, lastEvent);

+			 g_clistApi.pfnRemoveEvent(hContact, lastEvent);

 			  db_set_dw(hContact, MODULENAME, "LastEvent", 0);

        }

     }

@@ -62,7 +62,7 @@ static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
 				cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_USERONLINE, false);

 				cle.pszService = "UserOnline/Description";

 				cle.szTooltip.w = tooltip;

-				g_CLI.pfnAddEvent(&cle);

+				g_clistApi.pfnAddEvent(&cle);

 				IcoLib_ReleaseIcon(cle.hIcon, 0);

                 db_set_dw(cle.hContact, MODULENAME, "LastEvent", (DWORD)cle.hDbEvent);

 				Skin_PlaySound(MODULENAME);