From 497153f11a96cd336e8dadeeaa50c29e2c1bc2af Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 25 Sep 2012 14:32:41 +0000
Subject: - fix for the clist services creation order - Clist Nicer's options
 adapted for the extraicons plugin

git-svn-id: http://svn.miranda-ng.org/main/trunk@1651 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ExtraIcons/src/options.cpp | 63 +++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

(limited to 'plugins/ExtraIcons')

diff --git a/plugins/ExtraIcons/src/options.cpp b/plugins/ExtraIcons/src/options.cpp
index 8d8d30c1fd..f1f1371403 100644
--- a/plugins/ExtraIcons/src/options.cpp
+++ b/plugins/ExtraIcons/src/options.cpp
@@ -25,40 +25,8 @@
 
 HANDLE hOptHook = NULL;
 
-static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-
 // Functions //////////////////////////////////////////////////////////////////////////////////////
 
-
-int InitOptionsCallback(WPARAM wParam, LPARAM lParam)
-{
-	if (GetNumberOfSlots() < 1)
-		return 0;
-
-	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.cbSize = sizeof(odp);
-	odp.hInstance = hInst;
-	odp.pszGroup = LPGEN("Contact List");
-	odp.pszTitle = LPGEN("Extra icons");
-	odp.pszTab = LPGEN("General");
-	odp.pfnDlgProc = OptionsDlgProc;
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
-	odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
-	Options_AddPage(wParam, &odp);
-
-	return 0;
-}
-
-void InitOptions()
-{
-	hOptHook = HookEvent(ME_OPT_INITIALISE, InitOptionsCallback);
-}
-
-void DeInitOptions()
-{
-	UnhookEvent(hOptHook);
-}
-
 BOOL ScreenToClient(HWND hWnd, LPRECT lpRect)
 {
 	BOOL ret;
@@ -864,3 +832,34 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 	return 0;
 }
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+int InitOptionsCallback(WPARAM wParam, LPARAM lParam)
+{
+	if (GetNumberOfSlots() < 1)
+		return 0;
+
+	OPTIONSDIALOGPAGE odp = { 0 };
+	odp.cbSize = sizeof(odp);
+	odp.hInstance = hInst;
+	odp.pszGroup = LPGEN("Contact List");
+	odp.pszTitle = LPGEN("Extra icons");
+	odp.pszTab = LPGEN("General");
+	odp.pfnDlgProc = OptionsDlgProc;
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
+	odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+	Options_AddPage(wParam, &odp);
+
+	return 0;
+}
+
+void InitOptions()
+{
+	hOptHook = HookEvent(ME_OPT_INITIALISE, InitOptionsCallback);
+}
+
+void DeInitOptions()
+{
+	UnhookEvent(hOptHook);
+}
-- 
cgit v1.2.3