diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-07-28 11:05:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-07-28 11:05:10 +0000 |
| commit | 90c2f2a24e911c832e11fcc6443afd24efdd4cc9 (patch) | |
| tree | 719972a0755925073ab6aeb7aa24e92eed5b1427 /protocols/WhatsApp | |
| parent | f302909f341c5bf61bcb432d73443df6c3ba44c9 (diff) | |
- fix for name conflict in proto helpers;
- switch to constants defined in m_nudge.h
git-svn-id: http://svn.miranda-ng.org/main/trunk@5504 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/WhatsApp')
| -rw-r--r-- | protocols/WhatsApp/src/proto.cpp | 10 | ||||
| -rw-r--r-- | protocols/WhatsApp/src/theme.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp index 5c2ffad18f..1872fc21b8 100644 --- a/protocols/WhatsApp/src/proto.cpp +++ b/protocols/WhatsApp/src/proto.cpp @@ -10,12 +10,12 @@ WhatsAppProto::WhatsAppProto(const char* proto_name, const TCHAR* username) : update_loop_lock_ = CreateEvent(NULL, false, false, NULL);
FMessage::generating_lock = new Mutex();
- CreateService(PS_CREATEACCMGRUI, &WhatsAppProto::SvcCreateAccMgrUI);
- CreateService(PS_JOINCHAT, &WhatsAppProto::OnJoinChat);
- CreateService(PS_LEAVECHAT, &WhatsAppProto::OnLeaveChat);
+ CreateProtoService(PS_CREATEACCMGRUI, &WhatsAppProto::SvcCreateAccMgrUI);
+ CreateProtoService(PS_JOINCHAT, &WhatsAppProto::OnJoinChat);
+ CreateProtoService(PS_LEAVECHAT, &WhatsAppProto::OnLeaveChat);
- HookEvent(ME_GC_EVENT, &WhatsAppProto::OnChatOutgoing);
- HookEvent(ME_CLIST_PREBUILDSTATUSMENU, &WhatsAppProto::OnBuildStatusMenu);
+ HookProtoEvent(ME_GC_EVENT, &WhatsAppProto::OnChatOutgoing);
+ HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &WhatsAppProto::OnBuildStatusMenu);
this->InitContactMenus();
diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp index d292cf80a8..1738577262 100644 --- a/protocols/WhatsApp/src/theme.cpp +++ b/protocols/WhatsApp/src/theme.cpp @@ -252,7 +252,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam,LPARAM lParam) mi.flags = CMIF_CHILDPOPUP | ( this->isOnline() ? 0 : CMIF_GRAYED );
mi.position = 201001;
- CreateService("/CreateGroup", &WhatsAppProto::OnCreateGroup);
+ CreateProtoService("/CreateGroup", &WhatsAppProto::OnCreateGroup);
strcpy(tDest, "/CreateGroup");
mi.hParentMenu = hRoot;
mi.pszName = LPGEN("Create Group");
|