From c625ddaf81f7481bffcd528ed3012fdc3a6bc8e1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 7 Nov 2012 14:53:21 +0000
Subject: EMPTY_EXTRA_ICON applied to all another plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@2232 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/NewXstatusNotify/src/common.h   |  1 +
 plugins/NewXstatusNotify/src/indsnd.cpp |  6 +++---
 plugins/NewXstatusNotify/src/indsnd.h   | 15 +++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins/NewXstatusNotify/src')

diff --git a/plugins/NewXstatusNotify/src/common.h b/plugins/NewXstatusNotify/src/common.h
index fcab9e4e93..e44291ed75 100644
--- a/plugins/NewXstatusNotify/src/common.h
+++ b/plugins/NewXstatusNotify/src/common.h
@@ -68,6 +68,7 @@
 #include "m_userinfo.h"
 #include "m_utils.h"
 #include "m_icq.h"
+#include "m_extraicons.h"
 
 #include "m_metacontacts.h"
 #include "m_toptoolbar.h"
diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp
index b3841fa4c0..573b631648 100644
--- a/plugins/NewXstatusNotify/src/indsnd.cpp
+++ b/plugins/NewXstatusNotify/src/indsnd.cpp
@@ -441,7 +441,7 @@ void SetGroupsIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *g
 			if (iconOn[i] && image == EXTRA_IMAGE_DOT) 
 				iconOn[i] = 0;
 
-			if (image != EXTRA_IMAGE_BLANK) 
+			if (image != EMPTY_EXTRA_ICON) 
 				childCount[i]++;
 		}
 
@@ -451,7 +451,7 @@ void SetGroupsIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *g
 	//set icons
 	for(int i = 0; i < SIZEOF(iconOn); i++) 
 	{
-		SetExtraImage(hwndList, hParentItem, i, childCount[i] ? (iconOn[i] ? i : EXTRA_IMAGE_DOT) : EXTRA_IMAGE_BLANK);
+		SetExtraImage(hwndList, hParentItem, i, childCount[i] ? (iconOn[i] ? i : EXTRA_IMAGE_DOT) : EMPTY_EXTRA_ICON);
 		if (groupChildCount) 
 			groupChildCount[i] += childCount[i];
 	}
@@ -484,7 +484,7 @@ void SetAllChildrenIcons(HWND hwndList, HANDLE hFirstItem, int column, int image
 	while(hItem) 
 	{
 		int oldIcon = GetExtraImage(hwndList, hItem, column);
-		if (oldIcon != EXTRA_IMAGE_BLANK && oldIcon != image) 
+		if (oldIcon != EMPTY_EXTRA_ICON && oldIcon != image) 
 			SetExtraImage(hwndList, hItem, column, image);
 
 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);
diff --git a/plugins/NewXstatusNotify/src/indsnd.h b/plugins/NewXstatusNotify/src/indsnd.h
index 461201839c..010d973ec7 100644
--- a/plugins/NewXstatusNotify/src/indsnd.h
+++ b/plugins/NewXstatusNotify/src/indsnd.h
@@ -22,14 +22,13 @@
 #ifndef INDSND_H
 #define INDSND_H
 
-#define EXTRA_IMAGE_SOUND		0
-#define EXTRA_IMAGE_POPUP		1
-#define EXTRA_IMAGE_XSTATUS		2
-#define EXTRA_IMAGE_LOGGING		3
-#define EXTRA_IMAGE_DISABLEALL	4
-#define EXTRA_IMAGE_ENABLEALL	5
-#define EXTRA_IMAGE_DOT			6
-#define EXTRA_IMAGE_BLANK		0xFF
+#define EXTRA_IMAGE_SOUND      0
+#define EXTRA_IMAGE_POPUP      1
+#define EXTRA_IMAGE_XSTATUS    2
+#define EXTRA_IMAGE_LOGGING    3
+#define EXTRA_IMAGE_DISABLEALL 4
+#define EXTRA_IMAGE_ENABLEALL  5
+#define EXTRA_IMAGE_DOT        6
 
 #define STATUS_COLUMN			110
 
-- 
cgit v1.2.3