From 28f66a98c396a1cda061d8060e95275e38590c00 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 6 Nov 2012 19:01:35 +0000
Subject: make extra icons options visible in Clist Classic

git-svn-id: http://svn.miranda-ng.org/main/trunk@2221 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/hdr/modern_commonheaders.h |  3 ---
 plugins/Clist_modern/src/modern_clistmod.cpp        |  2 +-
 plugins/Clist_modern/src/modern_cluiservices.cpp    | 11 -----------
 src/modules/clist/cluiservices.cpp                  |  2 ++
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index a7ae21e716..6340d0c5c9 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -454,7 +454,4 @@ public:
 	};
 };
 
-#define EXTRACOLUMNCOUNT 10
-
-
 #endif // commonheaders_h__
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp
index 31f1f02a80..533f46a51b 100644
--- a/plugins/Clist_modern/src/modern_clistmod.cpp
+++ b/plugins/Clist_modern/src/modern_clistmod.cpp
@@ -209,7 +209,7 @@ INT_PTR GetCapsService(WPARAM wParam,LPARAM lParam)
 		case CLUICAPS_FLAGS1:
 			return CLUIF_HIDEEMPTYGROUPS|CLUIF_DISABLEGROUPS|CLUIF_HASONTOPOPTION|CLUIF_HASAUTOHIDEOPTION;
 		case CLUICAPS_FLAGS2:
-			return MAKELONG(EXTRACOLUMNCOUNT,1);
+			return MAKELONG(EXTRA_ICON_COUNT,1);
 		}
 	}
 	return 0;
diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp
index 0b48b0ec47..d0eb6765c6 100644
--- a/plugins/Clist_modern/src/modern_cluiservices.cpp
+++ b/plugins/Clist_modern/src/modern_cluiservices.cpp
@@ -146,17 +146,6 @@ static INT_PTR ListEndRebuild(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-static int GetCaps(WPARAM wParam, LPARAM lParam)
-{
-	switch (wParam) {
-	case CLUICAPS_FLAGS1:
-		return CLUIF_HIDEEMPTYGROUPS | CLUIF_DISABLEGROUPS | CLUIF_HASONTOPOPTION | CLUIF_HASAUTOHIDEOPTION;
-	}
-	return 0;
-}
-
-
-
 int CLUIServices_LoadModule(void)
 {
 	CreateServiceFunction(MS_CLUI_METASUPPORT,MetaSupportCheck);
diff --git a/src/modules/clist/cluiservices.cpp b/src/modules/clist/cluiservices.cpp
index 6054f55bee..7f33bc0a3a 100644
--- a/src/modules/clist/cluiservices.cpp
+++ b/src/modules/clist/cluiservices.cpp
@@ -128,6 +128,8 @@ static INT_PTR GetCaps(WPARAM wParam, LPARAM)
 	switch (wParam) {
 	case CLUICAPS_FLAGS1:
 		return CLUIF_HIDEEMPTYGROUPS | CLUIF_DISABLEGROUPS | CLUIF_HASONTOPOPTION | CLUIF_HASAUTOHIDEOPTION;
+	case CLUICAPS_FLAGS2:
+		return MAKELONG(EXTRA_ICON_COUNT,1);
 	}
 	return 0;
 }
-- 
cgit v1.2.3