From e37c2bd12221f2acb255d6b04a537125ddb72e6c Mon Sep 17 00:00:00 2001
From: sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Thu, 5 Jul 2007 00:10:36 +0000
Subject: more unicode patches from borkra (thx!)

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@253 4f64403b-2f21-0410-a795-97e2b3489a10
---
 metacontacts/meta_menu.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'metacontacts/meta_menu.c')

diff --git a/metacontacts/meta_menu.c b/metacontacts/meta_menu.c
index b2dbb96..9367d3b 100644
--- a/metacontacts/meta_menu.c
+++ b/metacontacts/meta_menu.c
@@ -470,8 +470,17 @@ int Meta_ModifyMenu(WPARAM wParam, LPARAM lParam)
 					mi.pszName = buf;
 					mi.flags = 0;
 				} else {
-					mi.pszName = CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_UNICODE);
-					mi.flags = CMIF_UNICODE;
+					char *name = (char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0);
+					char *wname = (char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_UNICODE);
+
+					if(wname && strncmp(name, wname, strlen(name)) != 0) {
+						mi.pszName = wname;
+						mi.flags = CMIF_UNICODE;
+					}
+					else {
+						mi.pszName = name;
+						mi.flags = 0;
+					}
 				}
 
 				mi.flags |= CMIM_FLAGS | CMIM_NAME | CMIM_ICON;
-- 
cgit v1.2.3