From 67f1c36da9aca19e37803110aa243280e5cf053b Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Fri, 15 Jun 2012 16:02:14 +0000
Subject: another portion of "#ifsef Unicode" removal

git-svn-id: http://svn.miranda-ng.org/main/trunk@427 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_nicer/SRC/clcitems.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'plugins/Clist_nicer/SRC/clcitems.cpp')

diff --git a/plugins/Clist_nicer/SRC/clcitems.cpp b/plugins/Clist_nicer/SRC/clcitems.cpp
index 34b3a66405..009a57a36d 100644
--- a/plugins/Clist_nicer/SRC/clcitems.cpp
+++ b/plugins/Clist_nicer/SRC/clcitems.cpp
@@ -76,13 +76,10 @@ struct ClcGroup *AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, D
 {
 	struct ClcGroup *p = saveAddGroup( hwnd, dat, szName, flags, groupId, calcTotalMembers);
 
-	#if defined(_UNICODE)
+	
 		if ( p && p->parent )
 			RTL_DetectGroupName( p->parent->cl.items[ p->parent->cl.count-1] );
-	#else
-		if ( p && p->parent )
-			p->parent->cl.items[ p->parent->cl.count -1]->isRtl = 0;
-	#endif
+	
 	return p;
 }
 
@@ -166,9 +163,9 @@ int AddContactToGroup(struct ClcData *dat, struct ClcGroup *group, HANDLE hConta
         // notify other plugins to re-supply their extra images (icq for xstatus, mBirthday etc...)
         NotifyEventHooks(hExtraImageApplying, (WPARAM)hContact, 0);
 	}
-#if defined(_UNICODE)
+
 	RTL_DetectAndSet( p, p->hContact);
-#endif
+
 	p->avatarLeft = p->extraIconRightBegin = -1;
 	p->flags |= cfg::getByte(p->hContact, "CList", "Priority", 0) ? CONTACTF_PRIORITY : 0;
 
@@ -342,7 +339,7 @@ BYTE GetCachedStatusMsg(int iExtraCacheEntry, char *szProto)
 	if ( !result )
 		DBFreeVariant( &dbv );
 
-#if defined(_UNICODE)
+
 	if(cEntry->bStatusMsgValid != STATUSMSG_NOTFOUND) {
 		WORD infoTypeC2[12];
 		int iLen, i
@@ -358,7 +355,7 @@ BYTE GetCachedStatusMsg(int iExtraCacheEntry, char *szProto)
 			}
 		}
 	}
-#endif
+
 	if(cEntry->hTimeZone == NULL)
 		TZ_LoadTimeZone(hContact, cEntry, szProto);
 	return cEntry->bStatusMsgValid;;
@@ -397,7 +394,7 @@ void ReloadExtraInfo(HANDLE hContact)
  * autodetect RTL property of the nickname, evaluates the first 10 characters of the nickname only
  */
 
-#if defined(_UNICODE)
+
 void RTL_DetectAndSet(struct ClcContact *contact, HANDLE hContact)
 {
     WORD infoTypeC2[12];
@@ -447,7 +444,7 @@ void RTL_DetectGroupName(struct ClcContact *group)
         }
     }
 }
-#endif
+
 /*
  * check for exteneded user information - email, phone numbers, homepage
  * set extra icons accordingly
-- 
cgit v1.2.3