From 45a5b1f9b7709f8d93b57abea7ba46b44eac5707 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 10 Oct 2013 15:13:20 +0000 Subject: - MS_CLIST_GETSTATUSMODEDESCRIPTION replaced with the direct clist call - crazy & obsolete constant GSMDF_PREFIXONLINE removed git-svn-id: http://svn.miranda-ng.org/main/trunk@6428 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_cachefuncs.cpp | 11 ++++------- plugins/Clist_modern/src/modern_viewmodebar.cpp | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp index e9ae405c35..dd8ecdaa3d 100644 --- a/plugins/Clist_modern/src/modern_cachefuncs.cpp +++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp @@ -310,19 +310,16 @@ int GetStatusName(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus } // Get Status name - { - TCHAR *tmp = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)nStatus, GSMDF_TCHAR); - lstrcpyn(text, tmp, text_size); - //CopySkipUnprintableChars(text, dbv.pszVal, text_size-1); - if (text[0] != '\0') - return 1; + TCHAR *tmp = pcli->pfnGetStatusModeDescription(nStatus, 0); + if (tmp && *tmp) { + _tcsncpy_s(text, text_size, tmp, _TRUNCATE); + return 1; } // Get XStatusName if ( !noAwayMsg && !noXstatus && !xstatus_has_priority && pdnce->hContact && pdnce->m_cache_cszProto) { DBVARIANT dbv = {0}; if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { - //lstrcpyn(text, dbv.pszVal, text_size); CopySkipUnprintableChars(text, dbv.ptszVal, text_size-1); db_free(&dbv); diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 433c219aa9..f2f8a77b0c 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -268,7 +268,7 @@ static int FillDialog(HWND hwnd) { LVITEM item = {0}; item.mask = LVIF_TEXT; - item.pszText = (TCHAR *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)i, GSMDF_TCHAR); + item.pszText = pcli->pfnGetStatusModeDescription(i, 0); item.iItem = i - ID_STATUS_OFFLINE; newItem = SendMessage(hwndList, LVM_INSERTITEM, 0, (LPARAM)&item); } -- cgit v1.2.3