diff options
| -rw-r--r-- | protocols/Skype/src/skype_contacts.cpp | 2 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_proto.cpp | 16 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_utils.cpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/protocols/Skype/src/skype_contacts.cpp b/protocols/Skype/src/skype_contacts.cpp index e323e654bc..79afd6b3e4 100644 --- a/protocols/Skype/src/skype_contacts.cpp +++ b/protocols/Skype/src/skype_contacts.cpp @@ -33,7 +33,7 @@ void CSkypeProto::UpdateContactStatus(HANDLE hContact, CContact::Ref contact) if (availability == CContact::SKYPEOUT)
{
- ::db_set_w(hContact, this->m_szModuleName, SKYPE_SETTINGS_STATUS, ID_STATUS_OUTTOLUNCH);
+ ::db_set_w(hContact, this->m_szModuleName, SKYPE_SETTINGS_STATUS, ID_STATUS_ONTHEPHONE);
}
else
{
diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index af42905023..455979e506 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -193,8 +193,8 @@ int __cdecl CSkypeProto::FileCancel( HANDLE hContact, HANDLE hTransfer ) return 1;
}
-int __cdecl CSkypeProto::FileDeny( HANDLE hContact, HANDLE hTransfer, const TCHAR* szReason )
-{
+int __cdecl CSkypeProto::FileDeny( HANDLE hContact, HANDLE hTransfer, const TCHAR* szReason )
+{
uint oid = (uint)hTransfer;
MessageRef message(oid);
@@ -209,12 +209,12 @@ int __cdecl CSkypeProto::FileDeny( HANDLE hContact, HANDLE hTransfer, const T }
}
- return 1;
+ return 1;
}
-int __cdecl CSkypeProto::FileResume( HANDLE hTransfer, int* action, const TCHAR** szFilename )
-{
- return 0;
+int __cdecl CSkypeProto::FileResume( HANDLE hTransfer, int* action, const TCHAR** szFilename )
+{
+ return 0;
}
DWORD_PTR __cdecl CSkypeProto:: GetCaps(int type, HANDLE hContact)
@@ -226,12 +226,12 @@ DWORD_PTR __cdecl CSkypeProto:: GetCaps(int type, HANDLE hContact) PF1_AUTHREQ | PF1_CHAT | PF1_SERVERCLIST | PF1_CONTACT/* | PF1_ADDSEARCHRES*/;
case PFLAGNUM_2:
case PFLAGNUM_3:
- return PF2_ONLINE | PF2_SHORTAWAY | PF2_HEAVYDND | PF2_INVISIBLE | PF2_OUTTOLUNCH;
+ return PF2_ONLINE | PF2_SHORTAWAY | PF2_HEAVYDND | PF2_INVISIBLE | PF2_ONTHEPHONE;
case PFLAGNUM_4:
return PF4_FORCEAUTH | PF4_FORCEADDED | PF4_SUPPORTTYPING | PF4_AVATARS |
/*PF4_OFFLINEFILES | */PF4_IMSENDUTF | PF4_IMSENDOFFLINE | PF4_NOAUTHDENYREASON;
case PFLAGNUM_5:
- return PF2_OUTTOLUNCH;
+ return PF2_ONTHEPHONE;
case PFLAG_UNIQUEIDTEXT:
return (DWORD_PTR)::Translate("Skype Name");
case PFLAG_MAXCONTACTSPERPACKET:
diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp index 0d171b9b17..491d32d68e 100644 --- a/protocols/Skype/src/skype_utils.cpp +++ b/protocols/Skype/src/skype_utils.cpp @@ -481,7 +481,7 @@ int CSkypeProto::SkypeToMirandaStatus(CContact::AVAILABILITY availability) break;
case CContact::SKYPEOUT:
- status = ID_STATUS_OUTTOLUNCH;
+ status = ID_STATUS_ONTHEPHONE;
break;
case CContact::CONNECTING:
|