1 files changed, 15 insertions, 13 deletions
diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp
index 2b471bc150..62edf829b9 100644
--- a/plugins/AuthState/src/main.cpp
+++ b/plugins/AuthState/src/main.cpp
@@ -20,10 +20,9 @@
 #include "stdafx.h"
 
 static HGENMENU hUserMenu;
-HANDLE hExtraIcon;
-CMPlugin g_plugin;
+static HANDLE hExtraIcon;
 
-Opts Options;
+CMPlugin g_plugin;
 
 static IconItem iconList[] =
 {
@@ -56,7 +55,11 @@ PLUGININFOEX pluginInfoEx = {
 };
 
 CMPlugin::CMPlugin() :
-	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
+	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx),
+	bUseAuthIcon(MODULENAME, "EnableAuthIcon", 1),
+	bUseGrantIcon(MODULENAME, "EnableGrantIcon", 1),
+	bContactMenuItem(MODULENAME, "MenuItem", 0),
+	bIconsForRecentContacts(MODULENAME, "EnableOnlyForRecent", 0)
 {
 }
 
@@ -66,7 +69,7 @@ INT_PTR getIconToUse(MCONTACT hContact, LPARAM)
 {
 	const char *proto = Proto_GetBaseAccountName(hContact);
 	//	if (lParam == 1) return icon_none;
-	if (!g_plugin.getByte(hContact, "ShowIcons", !Options.bIconsForRecentContacts))
+	if (!g_plugin.getByte(hContact, "ShowIcons", !g_plugin.bIconsForRecentContacts))
 		return ICON_NONE;
 
 	if (db_get_b(0, "ICQ", "UseServerCList", 0))
@@ -76,15 +79,15 @@ INT_PTR getIconToUse(MCONTACT hContact, LPARAM)
 	// Facebook contact type
 	int type = db_get_b(hContact, proto, "ContactType", 0);
 
-	if (Options.bUseAuthIcon & Options.bUseGrantIcon)
+	if (g_plugin.bUseAuthIcon & g_plugin.bUseGrantIcon)
 		if ((db_get_b(hContact, proto, "Auth", 0) && db_get_b(hContact, proto, "Grant", 0)) || type == 2)
 			return ICON_BOTH;
 
-	if (Options.bUseAuthIcon)
+	if (g_plugin.bUseAuthIcon)
 		if (db_get_b(hContact, proto, "Auth", 0) || type == 3)
 			return ICON_AUTH;
 
-	if (Options.bUseGrantIcon)
+	if (g_plugin.bUseGrantIcon)
 		if (db_get_b(hContact, proto, "Grant", 0) || type == 4)
 			return ICON_GRANT;
 
@@ -130,7 +133,7 @@ INT_PTR onAuthMenuSelected(WPARAM hContact, LPARAM)
 
 int onPrebuildContactMenu(WPARAM hContact, LPARAM)
 {
-	if (!Options.bContactMenuItem) {
+	if (!g_plugin.bContactMenuItem) {
 		Menu_ShowItem(hUserMenu, false);
 		return 0;
 	}
@@ -164,6 +167,9 @@ int onModulesLoaded(WPARAM, LPARAM)
 
 int CMPlugin::Load()
 {
+	// IcoLib support
+	g_plugin.registerIcon(LPGEN("Auth state"), iconList);
+
 	HookEvent(ME_DB_CONTACT_ADDED, onDBContactAdded);
 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, onContactSettingChanged);
 	HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, onExtraImageApplying);
@@ -179,9 +185,5 @@ int CMPlugin::Load()
 	mi.name.w = LPGENW("Enable AuthState icons");
 	mi.pszService = "AuthState/MenuItem";
 	hUserMenu = Menu_AddContactMenuItem(&mi);
-
-	// IcoLib support
-	g_plugin.registerIcon(LPGEN("Auth state"), iconList);
-
 	return 0;
 }