summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-10-16 17:36:39 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-10-16 17:36:39 +0000
commitfebfd5c9c32c8351762d513488d07d830c8d190f (patch)
treeb621832a82c3dd30527b31582bf4a35a77c65415 /protocols
parentbece32829be02962ff85d1065080fe5e350d7226 (diff)
Away icon removed from VK iconpack
git-svn-id: http://svn.miranda-ng.org/main/trunk@6507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/VKontakte/proto_vkontakte/res/Away.icobin5430 -> 0 bytes
-rw-r--r--protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc3
-rw-r--r--protocols/VKontakte/proto_vkontakte/src/resource.h3
-rw-r--r--protocols/VKontakte/src/vk_proto.cpp4
4 files changed, 4 insertions, 6 deletions
diff --git a/protocols/VKontakte/proto_vkontakte/res/Away.ico b/protocols/VKontakte/proto_vkontakte/res/Away.ico
deleted file mode 100644
index 96041b79aa..0000000000
--- a/protocols/VKontakte/proto_vkontakte/res/Away.ico
+++ /dev/null
Binary files differ
diff --git a/protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc b/protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc
index 7cd2882d24..4acf411df3 100644
--- a/protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc
+++ b/protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc
@@ -53,8 +53,7 @@ END
// remains consistent on all systems.
IDI_ICON1 ICON "Offline.ico"
IDI_ICON2 ICON "Online.ico"
-IDI_ICON3 ICON "Away.ico"
-IDI_ICON4 ICON "Invisible.ico"
+IDI_ICON3 ICON "Invisible.ico"
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/VKontakte/proto_vkontakte/src/resource.h b/protocols/VKontakte/proto_vkontakte/src/resource.h
index cf3d7b5899..5e2a03fbca 100644
--- a/protocols/VKontakte/proto_vkontakte/src/resource.h
+++ b/protocols/VKontakte/proto_vkontakte/src/resource.h
@@ -4,8 +4,7 @@
//
#define IDI_ICON1 105
#define IDI_ICON2 104
-#define IDI_ICON3 128
-#define IDI_ICON4 130
+#define IDI_ICON3 130
// Next default values for new objects
//
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 8ed039cb76..5ae8f92020 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -77,10 +77,10 @@ DWORD_PTR CVkProto::GetCaps(int type, HANDLE hContact)
return PF1_IM | PF1_CHAT | PF1_SERVERCLIST | PF1_AUTHREQ | PF1_BASICSEARCH | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | PF1_MODEMSG;
case PFLAGNUM_2:
- return PF2_ONLINE | PF2_INVISIBLE | PF2_ONTHEPHONE | PF2_IDLE | PF2_SHORTAWAY;
+ return PF2_ONLINE | PF2_INVISIBLE | PF2_ONTHEPHONE | PF2_IDLE; // | PF2_SHORTAWAY;
case PFLAGNUM_3:
- return PF2_ONLINE | PF2_SHORTAWAY;
+ return PF2_ONLINE; // | PF2_SHORTAWAY;
case PFLAGNUM_4:
return PF4_NOCUSTOMAUTH | PF4_FORCEADDED | PF4_IMSENDUTF | PF4_AVATARS | PF4_SUPPORTTYPING | PF4_NOAUTHDENYREASON | PF4_IMSENDOFFLINE;