From cfaef4e914f8e493f7bb24968b8947bea9ff31e7 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Tue, 27 Nov 2012 20:43:09 +0000 Subject: minor fix git-svn-id: http://svn.miranda-ng.org/main/trunk@2529 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ClientChangeNotify/src/ClientChangeNotify.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'plugins/ClientChangeNotify') diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index b3b5b05dae..cee91395de 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -204,14 +204,13 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) if (!lstrcmpA(cws->szSetting, DB_MIRVER)) { HANDLE hContact = (HANDLE)wParam; SHOWPOPUP_DATA sd = {0}; - char *szProto = NULL; + char *szProto = GetContactProto(hContact); if (g_PreviewOptPage) sd.MirVer = _T("Miranda IM 0.6.0.1 (ICQ v0.3.7 alpha)"); else { if (!hContact) // exit if hContact == NULL and it's not a popup preview return 0; - szProto = GetContactProto(hContact); _ASSERT(szProto); if (ServiceExists(MS_MC_GETPROTOCOLNAME) && !strcmp(szProto, (char*)CallService(MS_MC_GETPROTOCOLNAME, 0, 0))) // workaround for metacontacts return 0; @@ -287,7 +286,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) _ASSERT(szProto); TCString szUID(_T("")); char *uid = (char*)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0); - if (uid && (int)uid != CALLSERVICE_NOTFOUND) + if (uid && (INT_PTR)uid != CALLSERVICE_NOTFOUND) szUID = DBGetContactSettingAsString(hContact, szProto, uid, _T("")); logservice_log(LOG_ID, hContact, TCString((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)) + _T(" (") + szUID + TranslateT(") changed client to ") + ClientName); -- cgit v1.2.3