diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-30 18:59:38 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-30 18:59:38 +0000 |
| commit | 10bc9e42dfba6ed8be41199243d688c2e367dc0d (patch) | |
| tree | 891aca91eeb2feddb6c76498c4eb880689360fe6 /plugins/Scriver/src | |
| parent | 5dac5be47f2d9af8cbceead6511ff4c0fc40bab5 (diff) | |
MS_CLIST_GETSTATUSMODEDESCRIPTION & MS_CLIST_GETCONTACTDISPLAYNAME replaced with pcli->* members
git-svn-id: http://svn.miranda-ng.org/main/trunk@14459 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/src')
| -rw-r--r-- | plugins/Scriver/src/commonheaders.h | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgs.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h index bd5432906c..390ef07fd0 100644 --- a/plugins/Scriver/src/commonheaders.h +++ b/plugins/Scriver/src/commonheaders.h @@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_database.h>
#include <m_langpack.h>
#include <m_button.h>
-#include <m_clistint.h>
+#include <m_clist.h>
#include <m_clui.h>
#include <m_protosvc.h>
#include <m_skin.h>
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 54ee67bdf7..c7f27360e0 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -120,7 +120,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam) }
}
if (hwnd == NULL || !IsWindowVisible(GetParent(hwnd))) {
- TCHAR *contactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);
+ TCHAR *contactName = (TCHAR*)pcli->pfnGetContactDisplayName(hContact, 0);
TCHAR toolTip[256];
CLISTEVENT cle = { sizeof(cle) };
@@ -208,7 +208,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam) else if (lParam && (g_dat.flags2 & SMF2_SHOWTYPINGTRAY)) {
TCHAR szTip[256];
- mir_sntprintf(szTip, _countof(szTip), TranslateT("%s is typing a message"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));
+ mir_sntprintf(szTip, _countof(szTip), TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName(hContact, 0));
if ( ServiceExists(MS_CLIST_SYSTRAY_NOTIFY) && !(g_dat.flags2 & SMF2_SHOWTYPINGCLIST)) {
MIRANDASYSTRAYNOTIFY tn;
tn.szProto = NULL;
@@ -282,7 +282,7 @@ static void RestoreUnreadMessageAlerts(void) else {
cle.hContact = hContact;
cle.hDbEvent = hDbEvent;
- mir_sntprintf(toolTip, _countof(toolTip), TranslateT("Message from %s"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));
+ mir_sntprintf(toolTip, _countof(toolTip), TranslateT("Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);
}
}
|