From bd8a04455d9c991c15df2287e091abe4ba054efb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 25 Nov 2012 12:54:45 +0000
Subject: typed stub for MS_PROTO_GETCONTACTBASEPROTO
git-svn-id: http://svn.miranda-ng.org/main/trunk@2480 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/CmdLine/src/mimcmd_handlers.cpp | 6 +++---
plugins/CmdLine/src/utils.cpp | 8 ++++----
plugins/CmdLine/src/utils.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'plugins/CmdLine')
diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index 061edf07b2..3e12950c61 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -1848,7 +1848,7 @@ void HandleContactsCommand(PCommand command, TArgument *argv, int argc, PReply r
while (hContact)
{
- GetContactProtocol(hContact, protocol, sizeof(protocol));
+ GetContactProto(hContact, protocol, sizeof(protocol));
char *contact = GetContactName(hContact, protocol);
char *id = GetContactID(hContact, protocol);
@@ -1894,7 +1894,7 @@ void HandleContactsCommand(PCommand command, TArgument *argv, int argc, PReply r
*reply->message = 0;
while (hContact)
{
- GetContactProtocol(hContact, protocol, sizeof(protocol));
+ GetContactProto(hContact, protocol, sizeof(protocol));
char *contact = GetContactName(hContact, protocol);
char *id = GetContactID(hContact, protocol);
@@ -2030,7 +2030,7 @@ void HandleHistoryCommand(PCommand command, TArgument *argv, int argc, PReply re
hEvent = (HANDLE) CallService(MS_DB_EVENT_FINDNEXT, (WPARAM) hEvent, 0);
}
- GetContactProtocol(hContact, protocol, sizeof(protocol));
+ GetContactProto(hContact, protocol, sizeof(protocol));
contact = GetContactName(hContact, protocol);
mir_snprintf(buffer, sizeof(buffer), Translate("%s:%s - %d unread events."), contact, protocol, count);
diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp
index 70e86085cc..f85fb74e43 100644
--- a/plugins/CmdLine/src/utils.cpp
+++ b/plugins/CmdLine/src/utils.cpp
@@ -224,7 +224,7 @@ TCHAR *GetContactName(HANDLE hContact, char *szProto)
ctInfo.szProto = szProto;
}
else{
- GetContactProtocol(hContact, proto, sizeof(proto));
+ GetContactProto(hContact, proto, sizeof(proto));
ctInfo.szProto = proto;
}
ctInfo.dwFlag = CNF_DISPLAY;
@@ -253,7 +253,7 @@ TCHAR *GetContactName(HANDLE hContact, char *szProto)
#pragma warning (default: 4312)
#pragma warning (disable: 4312)
-void GetContactProtocol(HANDLE hContact, char *szProto, size_t size)
+void GetContactProto(HANDLE hContact, char *szProto, size_t size)
{
GetStringFromDatabase(hContact, "Protocol", "p", NULL, szProto, size);
}
@@ -263,7 +263,7 @@ void GetContactProtocol(HANDLE hContact, char *szProto, size_t size)
TCHAR *GetContactID(HANDLE hContact)
{
char protocol[256];
- GetContactProtocol(hContact, protocol, sizeof(protocol));
+ GetContactProto(hContact, protocol, sizeof(protocol));
return GetContactID(hContact, protocol);
}
@@ -346,7 +346,7 @@ HANDLE GetContactFromID(TCHAR *szID, char *szProto)
int found = 0;
while (hContact)
{
- GetContactProtocol(hContact, cProtocol, sizeof(cProtocol));
+ GetContactProto(hContact, cProtocol, sizeof(cProtocol));
szHandle = GetContactID(hContact, cProtocol);
tmp = (char *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, 0);
diff --git a/plugins/CmdLine/src/utils.h b/plugins/CmdLine/src/utils.h
index 22b4721cfa..5729528f04 100644
--- a/plugins/CmdLine/src/utils.h
+++ b/plugins/CmdLine/src/utils.h
@@ -53,7 +53,7 @@ TCHAR *GetContactID(HANDLE hContact);
TCHAR *GetContactID(HANDLE hContact, char *szProto);
HANDLE GetContactFromID(TCHAR *szID, char *szProto);
HANDLE GetContactFromID(TCHAR *szID, wchar_t *szProto);
-void GetContactProtocol(HANDLE hContact, char *szProto, size_t size);
+void GetContactProto(HANDLE hContact, char *szProto, size_t size);
int MyPUShowMessage(char *lpzText, BYTE kind);
--
cgit v1.2.3