diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-25 12:54:45 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-25 12:54:45 +0000 |
| commit | bd8a04455d9c991c15df2287e091abe4ba054efb (patch) | |
| tree | 6af5485d60feef741669eb545a6378e7c209ab59 /src/modules/utils | |
| parent | 7fdce14cd488e25e8e32e34098fbe9f5cb3021b7 (diff) | |
typed stub for MS_PROTO_GETCONTACTBASEPROTO
git-svn-id: http://svn.miranda-ng.org/main/trunk@2480 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/utils')
| -rw-r--r-- | src/modules/utils/path.cpp | 4 | ||||
| -rw-r--r-- | src/modules/utils/timezones.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp index 24e30fcf4a..184dd876f7 100644 --- a/src/modules/utils/path.cpp +++ b/src/modules/utils/path.cpp @@ -66,7 +66,7 @@ static INT_PTR createDirTreeW(WPARAM, LPARAM lParam) TCHAR *GetContactID(HANDLE hContact)
{
TCHAR *theValue = {0};
- char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+ char *szProto = GetContactProto(hContact);
if (db_get_b(hContact, szProto, "ChatRoom", 0) == 1) {
DBVARIANT dbv;
if ( !DBGetContactSettingTString(hContact, szProto, "ChatRoomID", &dbv)) {
@@ -275,7 +275,7 @@ XCHAR *GetInternalVariable(XCHAR *key, size_t keyLength, HANDLE hContact) if ( !_xcscmp(theKey, XSTR(key, "nick")))
theValue = GetContactNickX(key, hContact);
else if ( !_xcscmp(theKey, XSTR(key, "proto")))
- theValue = mir_a2x(key, (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0));
+ theValue = mir_a2x(key, GetContactProto(hContact));
else if ( !_xcscmp(theKey, XSTR(key, "userid")))
theValue = GetContactIDX(key, hContact);
}
diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp index a230fa7083..dcdc68b32d 100644 --- a/src/modules/utils/timezones.cpp +++ b/src/modules/utils/timezones.cpp @@ -197,7 +197,7 @@ static HANDLE timeapiGetInfoByContact(HANDLE hContact, DWORD dwFlags) signed char timezone = (signed char)db_get_b(hContact, "UserInfo", "Timezone", -1);
if (timezone == -1)
{
- char* szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+ char* szProto = GetContactProto(hContact);
if ( !DBGetContactSettingTString(hContact, szProto, "TzName", &dbv))
{
HANDLE res = timeapiGetInfoByName(dbv.ptszVal, dwFlags);
|