From 73a9696462d72938921377e857441dbd6334e453 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Mon, 6 Oct 2014 14:29:06 +0000 Subject: client detwction fix git-svn-id: http://svn.miranda-ng.org/main/trunk@10705 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../iconpacks/res/Facebook/facebook.ico | Bin 0 -> 1150 bytes .../iconpacks/res/Facebook/facebook_web.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/Jabber/vk.ico | Bin 1150 -> 0 bytes .../iconpacks/res/Others/facebook.ico | Bin 1150 -> 0 bytes .../Overlays/overlay_platform_Windows_Phone.ico | Bin 0 -> 1150 bytes .../res/Overlays/overlay_platform_website.ico | Bin 0 -> 1150 bytes .../iconpacks/res/Overlays/overlay_proto_VK.ico | Bin 0 -> 1150 bytes .../FingerprintNG/iconpacks/res/VKontakte/vk.ico | Bin 0 -> 1150 bytes plugins/FingerprintNG/iconpacks/res/fp_icons.rc | 16 +++-- plugins/FingerprintNG/res/resource.rc | 8 ++- plugins/FingerprintNG/src/finger_groups.h | 10 +++ plugins/FingerprintNG/src/global.h | 16 +++-- plugins/FingerprintNG/src/masks.cpp | 33 ++++++---- plugins/FingerprintNG/src/options.cpp | 2 + plugins/FingerprintNG/src/resource.h | 71 +++++++++++---------- 15 files changed, 92 insertions(+), 64 deletions(-) create mode 100644 plugins/FingerprintNG/iconpacks/res/Facebook/facebook.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/Facebook/facebook_web.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/Jabber/vk.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/Others/facebook.ico create mode 100644 plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_Windows_Phone.ico create mode 100644 plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_website.ico create mode 100644 plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_VK.ico create mode 100644 plugins/FingerprintNG/iconpacks/res/VKontakte/vk.ico diff --git a/plugins/FingerprintNG/iconpacks/res/Facebook/facebook.ico b/plugins/FingerprintNG/iconpacks/res/Facebook/facebook.ico new file mode 100644 index 0000000000..4c765589ad Binary files /dev/null and b/plugins/FingerprintNG/iconpacks/res/Facebook/facebook.ico differ diff --git a/plugins/FingerprintNG/iconpacks/res/Facebook/facebook_web.ico b/plugins/FingerprintNG/iconpacks/res/Facebook/facebook_web.ico deleted file mode 100644 index 1412fda558..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/Facebook/facebook_web.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/Jabber/vk.ico b/plugins/FingerprintNG/iconpacks/res/Jabber/vk.ico deleted file mode 100644 index 140bddebfc..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/Jabber/vk.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/Others/facebook.ico b/plugins/FingerprintNG/iconpacks/res/Others/facebook.ico deleted file mode 100644 index 4c765589ad..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/Others/facebook.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_Windows_Phone.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_Windows_Phone.ico new file mode 100644 index 0000000000..e3e30d9b06 Binary files /dev/null and b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_Windows_Phone.ico differ diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_website.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_website.ico new file mode 100644 index 0000000000..4719a4e1ea Binary files /dev/null and b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_website.ico differ diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_VK.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_VK.ico new file mode 100644 index 0000000000..249e5d6875 Binary files /dev/null and b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_VK.ico differ diff --git a/plugins/FingerprintNG/iconpacks/res/VKontakte/vk.ico b/plugins/FingerprintNG/iconpacks/res/VKontakte/vk.ico new file mode 100644 index 0000000000..140bddebfc Binary files /dev/null and b/plugins/FingerprintNG/iconpacks/res/VKontakte/vk.ico differ diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index 7a713c3e00..1ba6ab54a5 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -356,7 +356,6 @@ IDI_UKEEPER ICON "Jabber\\uKeeper.ico" IDI_VACUUM ICON "Jabber\\Vacuum.ico" IDI_VANDV ICON "Jabber\\V&V Messenger.ico" IDI_VAYUSPHERE ICON "Jabber\\Vayusphere.ico" -IDI_VK ICON "Jabber\\VK.ico" IDI_VYSPER ICON "Jabber\\Vysper.ico" IDI_WANNACHAT ICON "Jabber\\WannaChat.ico" IDI_WEBEX ICON "Jabber\\WebEx.ico" @@ -537,7 +536,12 @@ IDI_WEATHER_CN ICON "Weather\\weather_cn.ico" IDI_WEATHERXML ICON "Weather\\weatherxml.ico" IDI_WETTER ICON "Weather\\wetter.ico" IDI_YWEATHER ICON "Weather\\yweather.ico" -IDI_FACEBOOK ICON "others\\Facebook.ico" +IDI_FACEBOOK ICON "Facebook\\Facebook.ico" +IDI_FACEBOOK_APP ICON "Facebook\\facebook_app.ico" +IDI_FACEBOOK_MESSENGER ICON "Facebook\\facebook_messenger.ico" +IDI_FACEBOOK_MOBILE ICON "Facebook\\facebook_mobile.ico" +IDI_FACEBOOK_OTHER ICON "Facebook\\facebook_other.ico" +IDI_VK ICON "VKontakte\\VK.ico" IDI_SKYPE ICON "others\\Skype.ico" IDI_TWITTER ICON "others\\Twitter.ico" IDI_XFIRE ICON "others\\xFire.ico" @@ -555,6 +559,7 @@ IDI_MSN_OVERLAY ICON "overlays\\overlay_proto_MSN.ico IDI_QQ_OVERLAY ICON "overlays\\overlay_proto_QQ.ico" IDI_TLEN_OVERLAY ICON "overlays\\overlay_proto_Tlen.ico" IDI_YAHOO_OVERLAY ICON "overlays\\overlay_proto_Yahoo.ico" +IDI_VK_OVERLAY ICON "overlays\\overlay_proto_VK.ico" IDI_DEBUG_OVERLAY ICON "overlays\\overlay_resource_debug.ico" IDI_HOME_OVERLAY ICON "overlays\\overlay_resource_home.ico" IDI_MOBILE_OVERLAY ICON "overlays\\overlay_resource_mobile.ico" @@ -570,17 +575,14 @@ IDI_PLATFORM_LINUX ICON "overlays\\overlay_platform_linu IDI_PLATFORM_SYMBIAN ICON "overlays\\overlay_platform_Symbian.ico" IDI_PLATFORM_WIN ICON "overlays\\overlay_platform_Windows.ico" IDI_PLATFORM_IOS ICON "overlays\\overlay_platform_iOS.ico" +IDI_PLATFORM_WEBSITE ICON "overlays\\overlay_platform_website.ico" +IDI_PLATFORM_WINPHONE ICON "overlays\\overlay_platform_Windows_Phone.ico" IDI_PLATFORM_X32 ICON "overlays\\overlay_platform_x32.ico" IDI_PLATFORM_X64 ICON "overlays\\overlay_platform_x64.ico" IDI_SECUREIM_OVERLAY ICON "overlays\\overlay_security_SecureIM.ico" IDI_NEWGPG_OVERLAY ICON "overlays\\overlay_security_NewGPG.ico" IDI_MIROTR_OVERLAY ICON "overlays\\overlay_security_MirOTR.ico" IDI_UNICODE_CLIENT ICON "overlays\\overlay_Unicode.ico" -IDI_FACEBOOK_APP ICON "Facebook\\facebook_app.ico" -IDI_FACEBOOK_MESSENGER ICON "Facebook\\facebook_messenger.ico" -IDI_FACEBOOK_MOBILE ICON "Facebook\\facebook_mobile.ico" -IDI_FACEBOOK_OTHER ICON "Facebook\\facebook_other.ico" -IDI_FACEBOOK_WEB ICON "Facebook\\facebook_web.ico" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc index 6aff36f6ab..f8f6e2047b 100644 --- a/plugins/FingerprintNG/res/resource.rc +++ b/plugins/FingerprintNG/res/resource.rc @@ -90,9 +90,11 @@ BEGIN CONTROL "Tlen clients",IDC_GROUP_TLEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10 CONTROL "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10 CONTROL "Yahoo clients",IDC_GROUP_YAHOO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,200,120,10 - CONTROL "Multi-protocol clients",IDC_GROUP_MULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,90,120,10 - CONTROL "Other (rare) protocols",IDC_GROUP_OTHER_PROTOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,100,120,10 - CONTROL "Other icons",IDC_GROUP_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,110,120,10 + CONTROL "Facebook clients",IDC_GROUP_FACEBOOK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,90,120,10 + CONTROL "VKontakte clients",IDC_GROUP_VK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,100,120,10 + CONTROL "Multi-protocol clients",IDC_GROUP_MULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,110,120,10 + CONTROL "Other (rare) protocols",IDC_GROUP_OTHER_PROTOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,120,120,10 + CONTROL "Other icons",IDC_GROUP_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,130,120,10 CONTROL "Show client icon in message window status bar",IDC_STATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,220,226,10 END diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index 69f3aa8919..0a36035e54 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -78,6 +78,16 @@ case YAHOO_CASE: return LPGENT("Client icons")_T("/")LPGENT("Yahoo clients"); break; +case FACEBOOK_CASE: + if (db_get_b(NULL, MODULENAME, "GroupFacebook", 1)) + return LPGENT("Client icons")_T("/")LPGENT("Facebook clients"); + break; + +case VK_CASE: + if (db_get_b(NULL, MODULENAME, "GroupVK", 1)) + return LPGENT("Client icons")_T("/")LPGENT("VKontakte clients"); + break; + case OTHER_PROTOS_CASE: if ( db_get_b(NULL, MODULENAME, "GroupOtherProtos", 1)) return LPGENT("Client icons")_T("/")LPGENT("Other protocols"); diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h index 19a7b22903..94563b22de 100644 --- a/plugins/FingerprintNG/src/global.h +++ b/plugins/FingerprintNG/src/global.h @@ -104,15 +104,17 @@ typedef struct _foundInfo #define TLEN_CASE 3015 // Tlen clients (+ versions) #define WEATHER_CASE 3016 // Weather clients #define YAHOO_CASE 3017 // Yahoo clients (+ versions) +#define FACEBOOK_CASE 3018 // Facebook clients +#define VK_CASE 3019 // VK clients -#define OTHER_PROTOS_CASE 3018 // other protocols -#define OTHERS_CASE 3019 // other icons +#define OTHER_PROTOS_CASE 3020 // other protocols +#define OTHERS_CASE 3021 // other icons -#define OVERLAYS_RESOURCE_CASE 3020 // resource overlays -#define OVERLAYS_PLATFORM_CASE 3021 // platforms overlays -#define OVERLAYS_PROTO_CASE 3022 // protocols overlays -#define OVERLAYS_UNICODE_CASE 3023 // unicode overlay -#define OVERLAYS_SECURITY_CASE 3024 // security overlays +#define OVERLAYS_RESOURCE_CASE 3022 // resource overlays +#define OVERLAYS_PLATFORM_CASE 3023 // platforms overlays +#define OVERLAYS_PROTO_CASE 3024 // protocols overlays +#define OVERLAYS_UNICODE_CASE 3025 // unicode overlay +#define OVERLAYS_SECURITY_CASE 3026 // security overlays /* #define OVERLAYS_RESOURCE_ALT_CASE 24 // alternative (old style) overlays diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 13d1025435..dade750d0c 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -588,18 +588,25 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_Tlen", _T("*Tlen*"), LPGENT("Tlen.pl client"), IDI_TLEN, TLEN_CASE }, //######################################################################################################################################################################### -//################################# OTHER CLIENTS ##################################################################################################################### +//################################# Facebook ########################################################################################################################## //######################################################################################################################################################################### - {"client_Android", _T("*Android*"), _T("Android"), IDI_ANDROID, MULTI_CASE, TRUE }, + {"client_Facebook_mobile", _T("*Facebook*mobile*"), _T("Facebook (mobile)"), IDI_FACEBOOK_MOBILE, FACEBOOK_CASE }, + {"client_Facebook_other", _T("*Facebook*other*"), _T("Facebook (other)"), IDI_FACEBOOK_OTHER, FACEBOOK_CASE }, + {"client_Facebook_app", _T("*Facebook*App*"), _T("Facebook App"), IDI_FACEBOOK_APP, FACEBOOK_CASE }, + {"client_Facebook_mess", _T("*Facebook*Messenger*"), _T("Facebook Messenger"), IDI_FACEBOOK_MESSENGER, FACEBOOK_CASE }, + {"client_Facebook", _T("*Facebook*"), _T("Facebook"), IDI_FACEBOOK, FACEBOOK_CASE }, - {"client_Facebook_web", _T("*Facebook*website*"), _T("Facebook (website)"), IDI_FACEBOOK_WEB, OTHER_PROTOS_CASE, TRUE }, - {"client_Facebook_mobile", _T("*Facebook*mobile*"), _T("Facebook (mobile)"), IDI_FACEBOOK_MOBILE, OTHER_PROTOS_CASE, TRUE }, - {"client_Facebook_other", _T("*Facebook*other*"), _T("Facebook (other)"), IDI_FACEBOOK_OTHER, OTHER_PROTOS_CASE, TRUE }, - {"client_Facebook_app", _T("*Facebook*App*"), _T("Facebook App"), IDI_FACEBOOK_APP, OTHER_PROTOS_CASE, TRUE }, - {"client_Facebook_mess", _T("*Facebook*Messenger*"), _T("Facebook Messenger"), IDI_FACEBOOK_MESSENGER, OTHER_PROTOS_CASE, TRUE }, - {"client_Facebook", _T("*Facebook*"), _T("Facebook"), IDI_FACEBOOK, OTHER_PROTOS_CASE, TRUE }, +//######################################################################################################################################################################### +//################################# VKontakte ######################################################################################################################### +//######################################################################################################################################################################### + { "client_VK", _T("|*VKontakte*|*vk.com*"), _T("VKontakte"), IDI_VK, VK_CASE }, - {"client_Pidgin", _T("|*Pidgin*|*libpurple*|Purple*"), _T("Pidgin (libpurple)"), IDI_PIDGIN, MULTI_CASE }, +//######################################################################################################################################################################### +//################################# OTHER CLIENTS ##################################################################################################################### +//######################################################################################################################################################################### + { "client_Android", _T("*Android*"), _T("Android"), IDI_ANDROID, MULTI_CASE, TRUE }, + + { "client_Pidgin", _T("|*Pidgin*|*libpurple*|Purple*"), _T("Pidgin (libpurple)"), IDI_PIDGIN, MULTI_CASE }, {"client_Python", _T("|*Python*|Py*|*ταλιςμαη*"), LPGENT("Python-based clients"), IDI_PYTHON, MULTI_CASE }, @@ -615,8 +622,6 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_Skype", _T("*Skype**"), _T("Skype"), IDI_SKYPE, OTHER_PROTOS_CASE, TRUE }, - {"client_VK", _T("|*VKontakte*|*vk.com*"), _T("VKontakte"), IDI_VK, OTHER_PROTOS_CASE, TRUE }, - {"client_Xfire", _T("*Xfire*"), _T("Xfire"), IDI_XFIRE, OTHER_PROTOS_CASE, TRUE }, //######################################################################################################################################################################### @@ -698,6 +703,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = {"client_MRA_overlay", _T("|^MRA*|^Mail.ru*") _T("|*MRA*|*Mail.ru*IM*|Mrim*") _T("|*DRQZ00fz5WPn1gH+*|*nxthUwJANorB6+*"), LPGENT("Mail.Ru Agent overlay"), IDI_MAILRU_OVERLAY, OVERLAYS_PROTO_CASE }, + { "client_VK_overlay", _T("|Miranda*VKontakte*"), LPGENT("VK overlay"), IDI_VK_OVERLAY, OVERLAYS_PROTO_CASE }, //######################################################################################################################################################################### //################################# CLIENT VERSION OVERLAYS ########################################################################################################### @@ -748,8 +754,9 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = {"client_on_Java", _T("|*Java*|jagent*|ICQ2Go!*"), LPGENT("Java overlay"), IDI_PLATFORM_JAVA, OVERLAYS_PLATFORM_CASE }, {"client_on_Symbian", _T("|*Symbian*|sagent*"), LPGENT("Symbian overlay"), IDI_PLATFORM_SYMBIAN, OVERLAYS_PLATFORM_CASE }, {"client_on_Amiga", _T("*Amiga*"), LPGENT("Amiga overlay"), IDI_PLATFORM_AMIGA, OVERLAYS_PLATFORM_CASE }, - {"client_on_Android", _T("*Android*"), LPGENT("Android overlay"), IDI_PLATFORM_ANDROID, OVERLAYS_PLATFORM_CASE }, - + {"client_on_Android", _T("|*Android*|*(android)*"), LPGENT("Android overlay"), IDI_PLATFORM_ANDROID, OVERLAYS_PLATFORM_CASE }, + {"client_on_Website", _T("*(website)*"), LPGENT("Website overlay"), IDI_PLATFORM_WEBSITE, OVERLAYS_PLATFORM_CASE }, + {"client_on_WinPhone", _T("*(wphone)*"), LPGENT("Windows Phone overlay"), IDI_PLATFORM_WINPHONE, OVERLAYS_PLATFORM_CASE }, }; int DEFAULT_KN_FP_OVERLAYS_COUNT = SIZEOF(def_kn_fp_overlays_mask); diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 137fc12836..f2e7b90840 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -45,6 +45,8 @@ static settings[] = {IDC_GROUP_TLEN, TRUE, "GroupTlen"}, {IDC_GROUP_WEATHER, TRUE, "GroupWeather"}, {IDC_GROUP_YAHOO, TRUE, "GroupYahoo"}, + {IDC_GROUP_FACEBOOK, TRUE, "GroupFacebook"}, + {IDC_GROUP_VK, TRUE, "GroupVK"}, {IDC_GROUP_OTHER_PROTOS, TRUE, "GroupOtherProtos"}, {IDC_GROUP_OTHERS, TRUE, "GroupOthers"}, diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 9689f2faba..02f17f80aa 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -52,9 +52,11 @@ #define IDI_PLATFORM_MAC 67 #define IDI_PLATFORM_SYMBIAN 68 #define IDI_PLATFORM_WIN 69 -#define IDI_UNICODE_CLIENT 71 -#define IDI_PLATFORM_X32 72 -#define IDI_PLATFORM_X64 73 +#define IDI_PLATFORM_WEBSITE 70 +#define IDI_PLATFORM_WINPHONE 71 +#define IDI_UNICODE_CLIENT 72 +#define IDI_PLATFORM_X32 73 +#define IDI_PLATFORM_X64 74 #define IDI_AIM_OVERLAY 75 #define IDI_GMAIL_OVERLAY 76 #define IDI_ICQJ_OVERLAY 77 @@ -67,6 +69,7 @@ #define IDI_QQ_OVERLAY 84 #define IDI_TLEN_OVERLAY 85 #define IDI_YAHOO_OVERLAY 86 +#define IDI_VK_OVERLAY 87 #define IDI_SECUREIM_OVERLAY 91 #define IDI_NEWGPG_OVERLAY 92 #define IDI_MIROTR_OVERLAY 93 @@ -375,26 +378,25 @@ #define IDI_VAYUSPHERE 588 #define IDI_VBUZZER 589 #define IDI_VIRTUS 590 -#define IDI_VK 591 -#define IDI_VYSPER 592 -#define IDI_WANNACHAT 593 -#define IDI_WEBEX 594 -#define IDI_WHISPERIM 595 -#define IDI_WHOISBOT 596 -#define IDI_WIJA 597 -#define IDI_WILDFIRE 598 -#define IDI_WINJAB 599 -#define IDI_WTW 600 -#define IDI_XABBER 601 -#define IDI_GABBLE 602 -#define IDI_XEUS 603 -#define IDI_XEUS2 604 -#define IDI_XIFFIAN 605 -#define IDI_XMPP 606 -#define IDI_YAMBI 607 -#define IDI_YAONLINE 608 -#define IDI_YAXIM 609 -#define IDI_OPENFIRE 610 +#define IDI_VYSPER 591 +#define IDI_WANNACHAT 592 +#define IDI_WEBEX 593 +#define IDI_WHISPERIM 594 +#define IDI_WHOISBOT 595 +#define IDI_WIJA 596 +#define IDI_WILDFIRE 597 +#define IDI_WINJAB 598 +#define IDI_WTW 599 +#define IDI_XABBER 600 +#define IDI_GABBLE 601 +#define IDI_XEUS 602 +#define IDI_XEUS2 603 +#define IDI_XIFFIAN 604 +#define IDI_XMPP 605 +#define IDI_YAMBI 606 +#define IDI_YAONLINE 607 +#define IDI_YAXIM 608 +#define IDI_OPENFIRE 609 #define IDI_MAIL_RU_MOBILE 701 #define IDI_MAIL_RU_OFFICIAL 702 #define IDI_MAIL_RU_UNKNOWN 703 @@ -572,19 +574,18 @@ #define IDI_YEIGO 1089 #define IDI_YOONO 1090 #define IDI_GNUGADU 1091 +#define IDI_FACEBOOK 2001 #define IDI_FACEBOOK_APP 2002 #define IDI_FACEBOOK_MESSENGER 2003 #define IDI_FACEBOOK_MOBILE 2004 #define IDI_FACEBOOK_OTHER 2005 -#define IDI_FACEBOOK_WEB 2006 -#define IDC_CHECK1 7001 #define IDC_STATUSBAR 7001 -#define IDI_FACEBOOK 9001 #define IDI_SKYPE 9002 #define IDI_TWITTER 9003 #define IDI_XFIRE 9004 #define IDI_HANGOUTS 9005 -#define IDI_WHATSAPP 9006 +#define IDI_VK 9006 +#define IDI_WHATSAPP 9007 #define IDD_DIALOG 10000 #define IDC_GROUP_MIRANDA 10025 @@ -603,13 +604,15 @@ #define IDC_GROUP_TLEN 10039 #define IDC_GROUP_WEATHER 10040 #define IDC_GROUP_YAHOO 10041 -#define IDC_GROUP_OTHER_PROTOS 10042 -#define IDC_GROUP_OTHERS 10043 -#define IDC_GROUP_OVERLAYS_RESOURCE 10044 -#define IDC_GROUP_OVERLAYS_PLATFORM 10045 -#define IDC_GROUP_OVERLAYS_PROTO 10046 -#define IDC_GROUP_OVERLAYS_SECURITY 10047 -#define IDC_GROUP_OVERLAYS_UNICODE 10048 +#define IDC_GROUP_FACEBOOK 10042 +#define IDC_GROUP_VK 10043 +#define IDC_GROUP_OTHER_PROTOS 10044 +#define IDC_GROUP_OTHERS 10045 +#define IDC_GROUP_OVERLAYS_RESOURCE 10046 +#define IDC_GROUP_OVERLAYS_PLATFORM 10047 +#define IDC_GROUP_OVERLAYS_PROTO 10048 +#define IDC_GROUP_OVERLAYS_SECURITY 10049 +#define IDC_GROUP_OVERLAYS_UNICODE 10050 // Next default values for new objects // -- cgit v1.2.3