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

git-svn-id: http://svn.miranda-ng.org/main/trunk@426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/clist/genmenu.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/modules/clist/genmenu.cpp')

diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp
index 9395bb1588..c6413ee556 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/modules/clist/genmenu.cpp
@@ -1062,14 +1062,9 @@ static int MO_RegisterIcon( PMO_IntMenuItem pmi, void* )
 	char *uname, *descr;
 	uname = pmi->UniqName;
 	if ( uname == NULL )
-		#ifdef UNICODE
-			uname = mir_u2a(pmi->CustomName);
-			descr = mir_u2a(pmi->mi.ptszName);
-		#else
-			uname = pmi->CustomName;
-			descr = pmi->mi.pszName;
-		#endif
-
+		uname = mir_u2a(pmi->CustomName);
+		descr = mir_u2a(pmi->mi.ptszName);
+		
 	if ( !uname && !descr )
 		return FALSE;
 
@@ -1110,11 +1105,11 @@ static int MO_RegisterIcon( PMO_IntMenuItem pmi, void* )
 			IconLib_ReleaseIcon( hIcon, 0 );
 	}	}
 
-	#ifdef UNICODE
+	
 		if ( !pmi->UniqName )
 			mir_free( uname );
 		mir_free( descr );
-	#endif
+
 
 	return FALSE;
 }
-- 
cgit v1.2.3