From 6912555e0b6118d7beafe049b3d86a10e1f75096 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Fri, 10 May 2013 20:23:21 +0000 Subject: - updated icons - updated caps - probably fixed contact duplication git-svn-id: http://svn.miranda-ng.org/main/trunk@4627 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/proto_skype/res/Lunch.ico | Bin 0 -> 5430 bytes protocols/Skype/proto_skype/res/Proto_Skype.aps | Bin 0 -> 62236 bytes protocols/Skype/proto_skype/res/Proto_Skype.rc | Bin 3758 -> 3880 bytes protocols/Skype/proto_skype/src/resource.h | Bin 1276 -> 1368 bytes protocols/Skype/res/call.ico | Bin 15086 -> 5430 bytes protocols/Skype/res/conf_invite.ico | Bin 15086 -> 5430 bytes protocols/Skype/res/conf_spawn.ico | Bin 15086 -> 5430 bytes protocols/Skype/src/skype.cpp | 2 +- protocols/Skype/src/skype.h | 5 ++++- protocols/Skype/src/skype_chat.cpp | 27 ++++++------------------ protocols/Skype/src/skype_proto.cpp | 9 +++++--- protocols/Skype/src/skype_proto.h | 3 --- 12 files changed, 17 insertions(+), 29 deletions(-) create mode 100644 protocols/Skype/proto_skype/res/Lunch.ico create mode 100644 protocols/Skype/proto_skype/res/Proto_Skype.aps diff --git a/protocols/Skype/proto_skype/res/Lunch.ico b/protocols/Skype/proto_skype/res/Lunch.ico new file mode 100644 index 0000000000..8a202ed455 Binary files /dev/null and b/protocols/Skype/proto_skype/res/Lunch.ico differ diff --git a/protocols/Skype/proto_skype/res/Proto_Skype.aps b/protocols/Skype/proto_skype/res/Proto_Skype.aps new file mode 100644 index 0000000000..eabbccb653 Binary files /dev/null and b/protocols/Skype/proto_skype/res/Proto_Skype.aps differ diff --git a/protocols/Skype/proto_skype/res/Proto_Skype.rc b/protocols/Skype/proto_skype/res/Proto_Skype.rc index 2099d16353..5d46e8ab9c 100644 Binary files a/protocols/Skype/proto_skype/res/Proto_Skype.rc and b/protocols/Skype/proto_skype/res/Proto_Skype.rc differ diff --git a/protocols/Skype/proto_skype/src/resource.h b/protocols/Skype/proto_skype/src/resource.h index 71eba44b11..e2f3c626b9 100644 Binary files a/protocols/Skype/proto_skype/src/resource.h and b/protocols/Skype/proto_skype/src/resource.h differ diff --git a/protocols/Skype/res/call.ico b/protocols/Skype/res/call.ico index 59dc94bdce..8a202ed455 100644 Binary files a/protocols/Skype/res/call.ico and b/protocols/Skype/res/call.ico differ diff --git a/protocols/Skype/res/conf_invite.ico b/protocols/Skype/res/conf_invite.ico index fcca651113..51c5dce0b6 100644 Binary files a/protocols/Skype/res/conf_invite.ico and b/protocols/Skype/res/conf_invite.ico differ diff --git a/protocols/Skype/res/conf_spawn.ico b/protocols/Skype/res/conf_spawn.ico index 1fa6b3b39c..69e0773f11 100644 Binary files a/protocols/Skype/res/conf_spawn.ico and b/protocols/Skype/res/conf_spawn.ico differ diff --git a/protocols/Skype/src/skype.cpp b/protocols/Skype/src/skype.cpp index 73ed0d0a85..f52a45ef97 100644 --- a/protocols/Skype/src/skype.cpp +++ b/protocols/Skype/src/skype.cpp @@ -265,7 +265,7 @@ extern "C" int __declspec(dllexport) Load(void) return 1; } - g_skype = new CSkype(4); + g_skype = new CSkype(1); TransportInterface::Status status = g_skype->init(keyPair, "127.0.0.1", port); if (status != TransportInterface::OK) { diff --git a/protocols/Skype/src/skype.h b/protocols/Skype/src/skype.h index 5f57535810..b6b7746f34 100644 --- a/protocols/Skype/src/skype.h +++ b/protocols/Skype/src/skype.h @@ -71,4 +71,7 @@ class CSkype; extern CSkype *g_skype; -extern HINSTANCE g_hInstance; \ No newline at end of file +extern HINSTANCE g_hInstance; + +extern int g_cbCountries; +extern struct CountryListEntry* g_countries; \ No newline at end of file diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 48269d71c8..c17ac72106 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -625,28 +625,13 @@ int __cdecl CSkypeProto::OnGCMenuHook(WPARAM, LPARAM lParam) } else if (gcmi->Type == MENU_ON_NICKLIST) { - if (!::wcsicmp(this->login, gcmi->pszUID)) - { - static const struct gc_item Items[] = - { - { TranslateT("User &details"), 10, MENU_ITEM, FALSE }, - { TranslateT("User &history"), 20, MENU_ITEM, FALSE }, - { _T(""), 100, MENU_SEPARATOR, FALSE }, - { TranslateT("&Leave chat session"), 110, MENU_ITEM, FALSE } - }; - gcmi->nItems = SIZEOF(Items); - gcmi->Item = (gc_item*)Items; - } - else + static const struct gc_item Items[] = { - static const struct gc_item Items[] = - { - { TranslateT("User &details"), 10, MENU_ITEM, FALSE }, - { TranslateT("User &history"), 20, MENU_ITEM, FALSE }, - }; - gcmi->nItems = SIZEOF(Items); - gcmi->Item = (gc_item*)Items; - } + { TranslateT("User &details"), 10, MENU_ITEM, FALSE }, + { TranslateT("User &history"), 20, MENU_ITEM, FALSE }, + }; + gcmi->nItems = SIZEOF(Items); + gcmi->Item = (gc_item*)Items; } return 0; diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index eec50e2e38..f0f074d596 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -215,13 +215,16 @@ DWORD_PTR __cdecl CSkypeProto:: GetCaps(int type, HANDLE hContact) switch(type) { case PFLAGNUM_1: - return PF1_IM | PF1_FILE | PF1_BASICSEARCH | PF1_ADDSEARCHRES | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME; + return PF1_IM | PF1_FILE | PF1_BASICSEARCH | PF1_ADDSEARCHRES | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | + PF1_AUTHREQ | PF1_CHAT | PF1_SERVERCLIST/* | PF1_ADDSEARCHRES | F1_CONTACT*/; case PFLAGNUM_2: case PFLAGNUM_3: - return PF2_ONLINE | PF2_SHORTAWAY | PF2_HEAVYDND | PF2_INVISIBLE; + return PF2_ONLINE | PF2_SHORTAWAY | PF2_HEAVYDND | PF2_INVISIBLE | PF2_OUTTOLUNCH; case PFLAGNUM_4: return PF4_FORCEAUTH | PF4_FORCEADDED | PF4_SUPPORTTYPING | PF4_AVATARS | - PF4_OFFLINEFILES | PF4_IMSENDUTF | PF4_IMSENDOFFLINE; + /*PF4_OFFLINEFILES | */PF4_IMSENDUTF | PF4_IMSENDOFFLINE | PF4_NOAUTHDENYREASON; + case PFLAGNUM_5: + return PF2_OUTTOLUNCH; case PFLAG_UNIQUEIDTEXT: return (DWORD_PTR)::Translate("Skype Name"); case PFLAG_UNIQUEIDSETTING: diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h index 0ae55044c2..2268ecb4a8 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/protocols/Skype/src/skype_proto.h @@ -73,9 +73,6 @@ struct PasswordChangeBoxParam } }; -extern int g_cbCountries; -extern struct CountryListEntry* g_countries; - struct CSkypeProto : public PROTO_INTERFACE { public: -- cgit v1.2.3