diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-06-21 18:27:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-06-21 18:27:51 +0000 |
| commit | b5c35fb3198a06b037e49ac98d456ed55664ac60 (patch) | |
| tree | f8b59563b2e5ca90d2d7165efea3eebe0a57fc4d /plugins | |
| parent | 4267ebcb5fd90819de23064019d1dd214e76b5ef (diff) | |
minor code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@5086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/MetaContacts/src/meta_services.cpp | 9 | ||||
| -rw-r--r-- | plugins/SeenPlugin/src/utils.cpp | 12 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgutils.cpp | 5 |
3 files changed, 9 insertions, 17 deletions
diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp index 6bd121f736..349227c4da 100755 --- a/plugins/MetaContacts/src/meta_services.cpp +++ b/plugins/MetaContacts/src/meta_services.cpp @@ -261,13 +261,8 @@ INT_PTR MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam) INT_PTR Meta_SendNudge(WPARAM wParam,LPARAM lParam)
{
- HANDLE hMeta = (HANDLE)wParam, hSubContact = Meta_GetMostOnline(hMeta);
-
- char servicefunction[ 100 ];
- char *protoName = GetContactProto(hSubContact);
- sprintf(servicefunction, "%s/SendNudge", protoName);
-
- return CallService(servicefunction, (WPARAM)hSubContact, lParam);
+ HANDLE hSubContact = Meta_GetMostOnline((HANDLE)wParam);
+ return ProtoCallService(GetContactProto(hSubContact), "/SendNudge", (WPARAM)hSubContact, lParam);
}
/////////////////////////////////////////////////////////////////
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp index 0b8d8f3f13..19d1daf1ac 100644 --- a/plugins/SeenPlugin/src/utils.cpp +++ b/plugins/SeenPlugin/src/utils.cpp @@ -506,18 +506,18 @@ void myPlaySound(HANDLE hcontact, WORD newStatus, WORD oldStatus) {
if (CallService(MS_IGNORE_ISIGNORED,(WPARAM)hcontact,IGNOREEVENT_USERONLINE)) return;
//oldStatus and hcontact are not used yet
- char * soundname=0;
- if ((newStatus==ID_STATUS_ONLINE) || (newStatus==ID_STATUS_FREECHAT)) soundname = "LastSeenTrackedStatusOnline";
- else if (newStatus==ID_STATUS_OFFLINE) soundname = "LastSeenTrackedStatusOffline";
- else if (oldStatus==ID_STATUS_OFFLINE) soundname = "LastSeenTrackedStatusFromOffline";
+ char *soundname = NULL;
+ if ((newStatus == ID_STATUS_ONLINE) || (newStatus == ID_STATUS_FREECHAT)) soundname = "LastSeenTrackedStatusOnline";
+ else if (newStatus == ID_STATUS_OFFLINE) soundname = "LastSeenTrackedStatusOffline";
+ else if (oldStatus == ID_STATUS_OFFLINE) soundname = "LastSeenTrackedStatusFromOffline";
else soundname = "LastSeenTrackedStatusChange";
- if (soundname!=0) SkinPlaySound(soundname);
+ if (soundname != NULL)
+ SkinPlaySound(soundname);
}
//will add hContact to queue and will return position;
static logthread_info* addContactToQueue(HANDLE hContact)
{
- int i = 0;
if (!hContact)
return NULL;
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 4ed5023499..0a3f28e6d6 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -2175,10 +2175,7 @@ void TSAPI EnableSendButton(const TWindowData *dat, int iMode) void TSAPI SendNudge(const TWindowData *dat)
{
- char szServiceName[128];
-
- mir_snprintf(szServiceName, 128, "%s/SendNudge", dat->cache->getActiveProto());
- if (ServiceExists(szServiceName) && ServiceExists(MS_NUDGE_SEND))
+ if ( ProtoServiceExists(dat->cache->getActiveProto(), "/SendNudge") && ServiceExists(MS_NUDGE_SEND))
CallService(MS_NUDGE_SEND, (WPARAM)dat->cache->getActiveContact(), 0);
else
SendMessage(dat->hwnd, DM_ACTIVATETOOLTIP, IDC_MESSAGE,
|