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 /plugins/SmileyAdd | |
| 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 'plugins/SmileyAdd')
| -rw-r--r-- | plugins/SmileyAdd/src/dlgboxsubclass.cpp | 7 | ||||
| -rw-r--r-- | plugins/SmileyAdd/src/services.cpp | 4 | ||||
| -rw-r--r-- | plugins/SmileyAdd/src/smileys.cpp | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp index 03a0a6e5fd..1970577b48 100644 --- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp +++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp @@ -324,11 +324,8 @@ static void MsgWndDetect(HWND hwndDlg, HANDLE hContact, msgData* datm) dat.hContact = hContact;
// Get the protocol for this contact to display correct smileys.
- char *protonam = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO,
- (WPARAM)DecodeMetaContact(dat.hContact), 0);
-
- if (protonam)
- {
+ char *protonam = GetContactProto( DecodeMetaContact(dat.hContact));
+ if (protonam) {
strncpy(dat.ProtocolName, protonam, sizeof(dat.ProtocolName));
dat.ProtocolName[sizeof(dat.ProtocolName)-1] = 0;
}
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index 3dae4a086d..58bb73781e 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -53,7 +53,7 @@ SmileyPackType* GetSmileyPack(const char* proto, HANDLE hContact, SmileyPackCTyp if (categoryName.empty() && !opt.UseOneForAll)
{
- char *protonam = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+ char *protonam = GetContactProto(hContact);
if (protonam != NULL)
{
DBVARIANT dbv;
@@ -410,7 +410,7 @@ int RebuildContactMenu(WPARAM wParam, LPARAM) SmileyCategoryListType::SmileyCategoryVectorType& smc = *g_SmileyCategories.GetSmileyCategoryList();
- char* protnam = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0);
+ char* protnam = GetContactProto((HANDLE)wParam);
bool haveMenu = IsSmileyProto(protnam);
if (haveMenu && opt.UseOneForAll)
{
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index bc085120e5..ef88e952e0 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -192,7 +192,7 @@ void SmileyType::CallSmileyService(HANDLE hContact) if (name[0] == '/')
{
- proto = (const char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+ proto = (const char*)GetContactProto(hContact);
if (proto == NULL) return;
}
mir_snprintf(str, sizeof(str), "%s%s", proto, T2A_SM(name.c_str()));
@@ -905,7 +905,7 @@ void SmileyCategoryListType::DeleteAccountAsCategory(PROTOACCOUNT *acc) HANDLE hContact = db_find_first();
while (hContact != NULL)
{
- char* proto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+ char* proto = GetContactProto(hContact);
if (proto)
{
DBVARIANT dbv;
@@ -931,7 +931,7 @@ void SmileyCategoryListType::DeleteAccountAsCategory(PROTOACCOUNT *acc) void SmileyCategoryListType::AddContactTransportAsCategory(HANDLE hContact, const bkstring& defaultFile)
{
- char* proto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+ char* proto = GetContactProto(hContact);
if (proto == NULL) return;
DBVARIANT dbv;
|