diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-11-02 17:59:18 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-11-02 17:59:18 +0000 |
| commit | 8619c5f888ad902c48b6fc8be904e764112ca361 (patch) | |
| tree | 048a972b3d8e6b6b6f9aed8a710eb0c57d75c5f6 | |
| parent | bbab8376d96163046575b77893ece60747d4b7d0 (diff) | |
sync
git-svn-id: http://svn.miranda-ng.org/main/trunk@2155 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/Skype/src/skype_contacts.cpp | 8 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_proto.cpp | 2 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_utils.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/protocols/Skype/src/skype_contacts.cpp b/protocols/Skype/src/skype_contacts.cpp index e79855b6f1..063091ac06 100644 --- a/protocols/Skype/src/skype_contacts.cpp +++ b/protocols/Skype/src/skype_contacts.cpp @@ -547,7 +547,7 @@ bool CSkypeProto::IsProtoContact(HANDLE hContact) HANDLE CSkypeProto::GetContactBySid(const wchar_t* sid)
{
- HANDLE hContact = (HANDLE)::CallService(MS_DB_CONTACT_FINDFIRST, 0, (LPARAM)this->m_szModuleName);
+ HANDLE hContact = db_find_first();
while (hContact)
{
if (this->IsProtoContact(hContact))
@@ -556,7 +556,7 @@ HANDLE CSkypeProto::GetContactBySid(const wchar_t* sid) return hContact;
}
- hContact = (HANDLE)::CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, (LPARAM)this->m_szModuleName);
+ hContact = db_find_next(hContact);
}
return 0;
@@ -764,13 +764,13 @@ void __cdecl CSkypeProto::LoadContactList(void*) void CSkypeProto::SetAllContactStatus(int status)
{
- HANDLE hContact = (HANDLE)::CallService(MS_DB_CONTACT_FINDFIRST, 0, (LPARAM)this->m_szModuleName);
+ HANDLE hContact = db_find_first();
while (hContact)
{
if (this->IsProtoContact(hContact))
//if ( !this->GetSettingWord(hContact, SKYPE_SETTINGS_STATUS, ID_STATUS_OFFLINE) == status)
this->SetSettingWord(hContact, SKYPE_SETTINGS_STATUS, status);
- hContact = (HANDLE)::CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, (LPARAM)this->m_szModuleName);
+ hContact = db_find_next(hContact);
}
}
diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index 9a5acff9dd..6c0a98fa63 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -164,7 +164,7 @@ HICON __cdecl CSkypeProto::GetIcon( int iconIndex ) {
if (LOWORD(iconIndex) == PLI_PROTOCOL)
{
- HICON ico = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"Skype_main");
+ HICON ico = Skin_GetIcon("Skype_main");
return CopyIcon(ico);
} else
return 0;
diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp index a998eda174..5e2573d6f5 100644 --- a/protocols/Skype/src/skype_utils.cpp +++ b/protocols/Skype/src/skype_utils.cpp @@ -438,7 +438,7 @@ void CSkypeProto::ShowNotification(const wchar_t *sid, const wchar_t *message, i ppd.lchContact = NULL;
lstrcpyn(ppd.lpwzContactName, sid, MAX_CONTACTNAME);
lstrcpyn(ppd.lpwzText, message, MAX_SECONDLINE);
- ppd.lchIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"Skype_main");
+ ppd.lchIcon = Skin_GetIcon("Skype_main");
ppd.colorBack = ppd.colorText = 0;
ppd.iSeconds = 0;
|