From a1d6cb7bdc354be0968c6ba5ac4615e14a90eead Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 18 May 2016 17:21:08 +0000
Subject: these tons of code aren't needed anymore...

git-svn-id: http://svn.miranda-ng.org/main/trunk@16850 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdmsg/src/msgdialog.cpp | 49 +++++----------------------------------
 src/core/stdmsg/src/msglog.cpp    | 32 +++++++------------------
 2 files changed, 14 insertions(+), 67 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index cd941d301c..22bf436713 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -920,27 +920,11 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 
 	case DM_USERNAMETOCLIP:
 		if (dat->hContact) {
-			TCHAR buf[128] = _T("");
-			CONTACTINFO ci = { sizeof(ci) };
-			ci.hContact = dat->hContact;
-			ci.szProto = dat->szProto;
-			ci.dwFlag = CNF_UNIQUEID | CNF_TCHAR;
-			if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)& ci)) {
-				switch (ci.type) {
-				case CNFT_ASCIIZ:
-					_tcsncpy_s(buf, ci.pszVal, _TRUNCATE);
-					mir_free(ci.pszVal);
-					break;
-
-				case CNFT_DWORD:
-					mir_sntprintf(buf, _T("%u"), ci.dVal);
-					break;
-				}
-			}
-			if (buf[0] && OpenClipboard(hwndDlg)) {
+			ptrT id(Contact_GetInfo(CNF_UNIQUEID, dat->hContact, dat->szProto));
+			if (id != NULL && OpenClipboard(hwndDlg)) {
 				EmptyClipboard();
-				HGLOBAL hData = GlobalAlloc(GMEM_MOVEABLE, mir_tstrlen(buf) * sizeof(TCHAR)+1);
-				mir_tstrcpy((TCHAR*)GlobalLock(hData), buf);
+				HGLOBAL hData = GlobalAlloc(GMEM_MOVEABLE, mir_tstrlen(id) * sizeof(TCHAR)+1);
+				mir_tstrcpy((TCHAR*)GlobalLock(hData), id);
 				GlobalUnlock(hData);
 				SetClipboardData(CF_UNICODETEXT, hData);
 				CloseClipboard();
@@ -1025,29 +1009,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 				dat->wStatus = db_get_w(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE);
 				TCHAR *contactName = pcli->pfnGetContactDisplayName(dat->hContact, 0);
 
-				TCHAR buf[128] = _T("");
-				if (mir_strcmp(dat->szProto, META_PROTO)) {
-					CONTACTINFO ci = { 0 };
-					ci.cbSize = sizeof(ci);
-					ci.hContact = dat->hContact;
-					ci.szProto = dat->szProto;
-					ci.dwFlag = CNF_DISPLAYUID | CNF_TCHAR;
-					if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)&ci)) {
-						switch (ci.type) {
-						case CNFT_ASCIIZ:
-							_tcsncpy_s(buf, ci.pszVal, _TRUNCATE);
-							mir_free(ci.pszVal);
-							break;
-						case CNFT_DWORD:
-							mir_sntprintf(buf, _T("%u"), ci.dVal);
-							break;
-						}
-					}
-				}
-				if (buf[0])
-					SetDlgItemText(hwndDlg, IDC_NAME, buf);
-				else
-					SetDlgItemText(hwndDlg, IDC_NAME, contactName);
+				ptrT id(Contact_GetInfo(CNF_DISPLAYUID, dat->hContact, dat->szProto));
+				SetDlgItemText(hwndDlg, IDC_NAME, (id) ? id : contactName);
 
 				TCHAR *szStatus = pcli->pfnGetStatusModeDescription(dat->szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE), 0);
 				if (statusIcon)
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 29ab6af1f9..38e583c2ca 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -271,27 +271,18 @@ static char* CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT
 
 	if (!(g_dat.flags & SMF_HIDENAMES) && dbei.eventType != EVENTTYPE_JABBER_CHATSTATES && dbei.eventType != EVENTTYPE_JABBER_PRESENCE) {
 		TCHAR *szName;
-		CONTACTINFO ci = { 0 };
 
 		if (dbei.flags & DBEF_SENT) {
-			ci.cbSize = sizeof(ci);
-			ci.szProto = dbei.szModule;
-			ci.dwFlag = CNF_DISPLAY | CNF_TCHAR;
-			if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)&ci)) {
-				// CNF_DISPLAY always returns a string type
-				szName = ci.pszVal;
-			}
+			if (TCHAR *p = Contact_GetInfo(CNF_DISPLAY, NULL, dbei.szModule))
+				szName = NEWTSTR_ALLOCA(p);
 			else
-				// Shouldn't happen?
-				szName = mir_tstrdup(TranslateT("Me"));
+				szName = TranslateT("Me");
 		}
 		else szName = pcli->pfnGetContactDisplayName(hContact, 0);
 
 		buffer.AppendFormat(" %s ", SetToStyle(dbei.flags & DBEF_SENT ? MSGFONTID_MYNAME : MSGFONTID_YOURNAME));
 		AppendToBufferWithRTF(buffer, szName);
 		showColon = 1;
-		if (ci.pszVal)
-			mir_free(ci.pszVal);
 	}
 
 	if (showColon)
@@ -302,18 +293,11 @@ static char* CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT
 	case EVENTTYPE_JABBER_CHATSTATES:
 	case EVENTTYPE_JABBER_PRESENCE:
 		if (dbei.flags & DBEF_SENT) {
-			CONTACTINFO ci = { sizeof(ci) };
-			ci.hContact = NULL;
-			ci.szProto = dbei.szModule;
-			ci.dwFlag = CNF_DISPLAY | CNF_TCHAR;
-
-			// CNF_DISPLAY always returns a string type
-			if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)& ci))
-				szName = NEWTSTR_ALLOCA(ci.pszVal);
-			else
-				szName = _T("");
-
-			mir_free(ci.pszVal);
+			if (TCHAR *p = Contact_GetInfo(CNF_DISPLAY, NULL, dbei.szModule)) {
+				szName = NEWTSTR_ALLOCA(p);
+				mir_free(p);
+			}
+			else szName = _T("");
 		}
 		else szName = pcli->pfnGetContactDisplayName(hContact, 0);
 
-- 
cgit v1.2.3