From c6e1bedfc18495b3e083069f8d03c2218f6f6b78 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 28 Jun 2014 20:44:06 +0000
Subject: fixes #630 p.2 (user must have a choice to display either Nick or
 DisplayName in SRMM menu)

git-svn-id: http://svn.miranda-ng.org/main/trunk@9605 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/metacontacts/meta_menu.cpp | 37 ++++++----------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

(limited to 'src/modules/metacontacts/meta_menu.cpp')

diff --git a/src/modules/metacontacts/meta_menu.cpp b/src/modules/metacontacts/meta_menu.cpp
index 0b8fd69813..4d2e5982d8 100644
--- a/src/modules/metacontacts/meta_menu.cpp
+++ b/src/modules/metacontacts/meta_menu.cpp
@@ -259,7 +259,8 @@ int Meta_ModifyMenu(WPARAM hMeta, LPARAM lParam)
 		mi.pszName = LPGEN("Remove from metacontact");
 		Menu_ModifyItem(hMenuDelete, &mi);
 
-		//show subcontact menu items
+		// show subcontact menu items
+		CMString tszNick;
 		for (int i = 0; i < MAX_CONTACTS; i++) {
 			if (i >= cc->nSubs) {
 				Menu_ShowItem(hMenuContact[i], false);
@@ -270,38 +271,12 @@ int Meta_ModifyMenu(WPARAM hMeta, LPARAM lParam)
 			char *szProto = GetContactProto(hContact);
 
 			if (options.menu_contact_label == DNT_UID) {
-				char buf[512], idStr[512];
-				strcpy(buf, "Login");
-				strcat(buf, _itoa(i, idStr, 10));
-
-				DBVARIANT dbv;
-				db_get(hMeta, META_PROTO, buf, &dbv);
-				switch (dbv.type) {
-				case DBVT_ASCIIZ:
-					mir_snprintf(buf, 512, "%s", dbv.pszVal);
-					break;
-				case DBVT_BYTE:
-					mir_snprintf(buf, 512, "%d", dbv.bVal);
-					break;
-				case DBVT_WORD:
-					mir_snprintf(buf, 512, "%d", dbv.wVal);
-					break;
-				case DBVT_DWORD:
-					mir_snprintf(buf, 512, "%d", dbv.dVal);
-					break;
-				default:
-					buf[0] = 0;
-				}
-				db_free(&dbv);
-				mi.pszName = buf;
-				mi.flags = 0;
-			}
-			else {
-				mi.ptszName = cli.pfnGetContactDisplayName(hContact, 0);
-				mi.flags = CMIF_TCHAR;
+				Meta_GetSubNick(hMeta, i, tszNick);
+				mi.ptszName = tszNick.GetBuffer();
 			}
+			else mi.ptszName = cli.pfnGetContactDisplayName(hContact, 0);
 
-			mi.flags |= CMIM_FLAGS | CMIM_NAME | CMIM_ICON;
+			mi.flags = CMIF_TCHAR | CMIM_FLAGS | CMIM_NAME | CMIM_ICON;
 
 			int iconIndex = CallService(MS_CLIST_GETCONTACTICON, hContact, 0);
 			mi.hIcon = ImageList_GetIcon((HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0), iconIndex, 0);
-- 
cgit v1.2.3