diff options
45 files changed, 18 insertions, 68 deletions
diff --git a/plugins/Clist_modern/res/MicroChat.ico b/plugins/Clist_modern/res/MicroChat.ico Binary files differdeleted file mode 100644 index a0eea80aae..0000000000 --- a/plugins/Clist_modern/res/MicroChat.ico +++ /dev/null diff --git a/plugins/Clist_modern/res/MicroLunch.ico b/plugins/Clist_modern/res/MicroLunch.ico Binary files differdeleted file mode 100644 index 1b8fc46b81..0000000000 --- a/plugins/Clist_modern/res/MicroLunch.ico +++ /dev/null diff --git a/plugins/Clist_modern/res/MicroPhone.ico b/plugins/Clist_modern/res/MicroPhone.ico Binary files differdeleted file mode 100644 index 5114368f56..0000000000 --- a/plugins/Clist_modern/res/MicroPhone.ico +++ /dev/null diff --git a/plugins/Clist_modern/res/chat.ico b/plugins/Clist_modern/res/chat.ico Binary files differdeleted file mode 100644 index 8f065e41dc..0000000000 --- a/plugins/Clist_modern/res/chat.ico +++ /dev/null diff --git a/plugins/Clist_modern/res/lunch.ico b/plugins/Clist_modern/res/lunch.ico Binary files differdeleted file mode 100644 index 1a5abaaa0e..0000000000 --- a/plugins/Clist_modern/res/lunch.ico +++ /dev/null diff --git a/plugins/Clist_modern/res/phone.ico b/plugins/Clist_modern/res/phone.ico Binary files differdeleted file mode 100644 index 3aad71f13a..0000000000 --- a/plugins/Clist_modern/res/phone.ico +++ /dev/null diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index 8a32e977bc..ebfdc4212a 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -47,36 +47,24 @@ IDI_AVATAR_OVERLAY_OCCUPIED ICON "occupied.ico" IDI_AVATAR_OVERLAY_OFFLINE ICON "offline.ico"
-IDI_AVATAR_OVERLAY_PHONE ICON "phone.ico"
-
IDI_AVATAR_OVERLAY_AWAY ICON "Away.ico"
IDI_AVATAR_OVERLAY_DND ICON "DND.ico"
IDI_AVATAR_OVERLAY_INVISIBLE ICON "invisible.ico"
-IDI_AVATAR_OVERLAY_LUNCH ICON "lunch.ico"
-
-IDI_AVATAR_OVERLAY_CHAT ICON "chat.ico"
-
IDI_STATUS_OVERLAY_NA ICON "MicroNA.ico"
IDI_STATUS_OVERLAY_OCCUPIED ICON "Microoccupied.ico"
IDI_STATUS_OVERLAY_OFFLINE ICON "Microoffline.ico"
-IDI_STATUS_OVERLAY_PHONE ICON "Microphone.ico"
-
IDI_STATUS_OVERLAY_AWAY ICON "MicroAway.ico"
IDI_STATUS_OVERLAY_DND ICON "MicroDND.ico"
IDI_STATUS_OVERLAY_INVISIBLE ICON "Microinvisible.ico"
-IDI_STATUS_OVERLAY_LUNCH ICON "Microlunch.ico"
-
-IDI_STATUS_OVERLAY_CHAT ICON "Microchat.ico"
-
IDI_ICQC1 ICON "1.ico"
IDI_ICQC2 ICON "2.ico"
diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h index 4f522729b1..d73d285e65 100644 --- a/plugins/NewAwaySysMod/src/stdafx.h +++ b/plugins/NewAwaySysMod/src/stdafx.h @@ -91,10 +91,7 @@ #define SF_NA 0x8
#define SF_OCC 0x10
#define SF_DND 0x20
-#define SF_FFC 0x40
#define SF_INV 0x80
-#define SF_OTP 0x100
-#define SF_OTL 0x200
#define SF_OTHER 0x80000000
#define MOREOPTDLG_DEF_DONTPOPDLG (SF_ONL | SF_INV)
diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp index 593bc0f2c4..d3c87a0104 100644 --- a/plugins/SimpleAR/src/Main.cpp +++ b/plugins/SimpleAR/src/Main.cpp @@ -19,16 +19,14 @@ Copyright (C) 2000-2 Richard Hughes, Roland Rabien & Tristan Van de Vreede CMPlugin g_plugin;
HGENMENU hToggle, hEnableMenu;
-BOOL gbVarsServiceExist = FALSE;
-INT interval;
+int interval;
-wchar_t* ptszDefaultMsg[] = {
+wchar_t *ptszDefaultMsg[] =
+{
LPGENW("I am currently away. I will reply to you when I am back."),
LPGENW("I am currently very busy and can't spare any time to talk with you. Sorry..."),
LPGENW("I am not available right now."),
- LPGENW("I am now doing something, I will talk to you later."),
- LPGENW("I am on the phone right now. I will get back to you very soon."),
- LPGENW("I am having meal right now. I will get back to you very soon.")
+ LPGENW("I am now doing something, I will talk to you later.")
};
/////////////////////////////////////////////////////////////////////////////////////////
@@ -49,7 +47,8 @@ PLUGININFOEX pluginInfoEx = CMPlugin::CMPlugin() :
PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)
-{}
+{
+}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -93,8 +92,7 @@ INT CheckDefaults(WPARAM, LPARAM) interval = g_plugin.getWord(KEY_REPEATINTERVAL, 300);
wchar_t *ptszVal = g_plugin.getWStringA(KEY_HEADING);
- if (ptszVal == nullptr)
- // Heading not set
+ if (ptszVal == nullptr) // Heading not set
g_plugin.setWString(KEY_HEADING, TranslateT("Dear %user%, the owner left the following message:"));
else
mir_free(ptszVal);
@@ -111,20 +109,15 @@ INT CheckDefaults(WPARAM, LPARAM) if (c < ID_STATUS_OCCUPIED)
// This mode does not have a preset message
ptszDefault = ptszDefaultMsg[c - ID_STATUS_ONLINE - 1];
- else if (c > ID_STATUS_INVISIBLE)
- ptszDefault = ptszDefaultMsg[c - ID_STATUS_ONLINE - 3];
else
ptszDefault = nullptr;
if (ptszDefault)
g_plugin.setWString(szStatus, TranslateW(ptszDefault));
}
- else
- mir_free(ptszVal);
+ else mir_free(ptszVal);
}
}
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPreBuildContactMenu);
- if (ServiceExists(MS_VARS_FORMATSTRING))
- gbVarsServiceExist = TRUE;
BOOL fEnabled = g_plugin.getByte(KEY_ENABLED, 1);
if (fEnabled)
@@ -140,7 +133,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent) if (!fEnabled || !hContact || !hDBEvent)
return FALSE; /// unspecifyed error
- char* pszProto = GetContactProto(hContact);
+ char *pszProto = GetContactProto(hContact);
int status = Proto_GetStatus(pszProto);
if (status == ID_STATUS_ONLINE || status == ID_STATUS_INVISIBLE)
return FALSE;
@@ -201,7 +194,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent) mir_free(ptszHead);
}
- wchar_t *ptszTemp2 = (wchar_t*)mir_alloc(sizeof(wchar_t) * (msgLen + 5));
+ wchar_t *ptszTemp2 = (wchar_t *)mir_alloc(sizeof(wchar_t) * (msgLen + 5));
mir_snwprintf(ptszTemp2, msgLen + 5, L"%s\r\n\r\n%s", ptszTemp.c_str(), ptszVal);
if (ServiceExists(MS_VARS_FORMATSTRING)) {
ptszTemp = variables_parse(ptszTemp2, nullptr, hContact);
diff --git a/protocols/Discord/proto_discord/src/resource.h b/protocols/Discord/proto_discord/src/resource.h index c74e04f59e..df3be36b36 100644 --- a/protocols/Discord/proto_discord/src/resource.h +++ b/protocols/Discord/proto_discord/src/resource.h @@ -9,8 +9,6 @@ #define IDI_ICON5 131 #define IDI_ICON6 158 #define IDI_ICON7 159 -#define IDI_ICON8 129 -#define IDI_ICON9 1002 // Next default values for new objects // diff --git a/protocols/Dummy/proto_dummy/res/FFC.ico b/protocols/Dummy/proto_dummy/res/FFC.ico Binary files differdeleted file mode 100644 index f0d7976014..0000000000 --- a/protocols/Dummy/proto_dummy/res/FFC.ico +++ /dev/null diff --git a/protocols/Dummy/proto_dummy/res/Lunch.ico b/protocols/Dummy/proto_dummy/res/Lunch.ico Binary files differdeleted file mode 100644 index aa04cfce75..0000000000 --- a/protocols/Dummy/proto_dummy/res/Lunch.ico +++ /dev/null diff --git a/protocols/Dummy/proto_dummy/res/Phone.ico b/protocols/Dummy/proto_dummy/res/Phone.ico Binary files differdeleted file mode 100644 index 76b9ea7b91..0000000000 --- a/protocols/Dummy/proto_dummy/res/Phone.ico +++ /dev/null diff --git a/protocols/Dummy/proto_dummy/res/Proto_Dummy.rc b/protocols/Dummy/proto_dummy/res/Proto_Dummy.rc index 44c1a51f44..8aa8f437ee 100644 --- a/protocols/Dummy/proto_dummy/res/Proto_Dummy.rc +++ b/protocols/Dummy/proto_dummy/res/Proto_Dummy.rc @@ -58,9 +58,6 @@ IDI_ICON4 ICON "Invisible.ico" IDI_ICON5 ICON "NA.ico" IDI_ICON6 ICON "DND.ico" IDI_ICON7 ICON "Occupied.ico" -IDI_ICON8 ICON "Lunch.ico" -IDI_ICON9 ICON "Phone.ico" -IDI_ICON10 ICON "FFC.ico" #endif // Russian (Russia) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/protocols/Dummy/proto_dummy/src/resource.h b/protocols/Dummy/proto_dummy/src/resource.h index 309123b626..4db7c6c8e9 100644 --- a/protocols/Dummy/proto_dummy/src/resource.h +++ b/protocols/Dummy/proto_dummy/src/resource.h @@ -9,9 +9,6 @@ #define IDI_ICON5 131 #define IDI_ICON6 158 #define IDI_ICON7 159 -#define IDI_ICON8 1003 -#define IDI_ICON9 1002 -#define IDI_ICON10 129 // Next default values for new objects // diff --git a/protocols/FacebookRM/proto_facebook/res/Phone.ico b/protocols/FacebookRM/proto_facebook/res/Phone.ico Binary files differdeleted file mode 100644 index c1a28c0b65..0000000000 --- a/protocols/FacebookRM/proto_facebook/res/Phone.ico +++ /dev/null diff --git a/protocols/FacebookRM/proto_facebook/res/Proto_Facebook.rc b/protocols/FacebookRM/proto_facebook/res/Proto_Facebook.rc index 7e77198fd4..05200253dc 100644 --- a/protocols/FacebookRM/proto_facebook/res/Proto_Facebook.rc +++ b/protocols/FacebookRM/proto_facebook/res/Proto_Facebook.rc @@ -55,7 +55,7 @@ IDI_ICON1 ICON "Offline.ico" IDI_ICON2 ICON "Online.ico"
IDI_ICON3 ICON "Away.ico"
IDI_ICON4 ICON "Invisible.ico"
-IDI_ICON5 ICON "Phone.ico"
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/FacebookRM/proto_facebook/src/resource.h b/protocols/FacebookRM/proto_facebook/src/resource.h index 337b030f91..9cb62d9a84 100644 --- a/protocols/FacebookRM/proto_facebook/src/resource.h +++ b/protocols/FacebookRM/proto_facebook/src/resource.h @@ -6,7 +6,6 @@ #define IDI_ICON2 104
#define IDI_ICON3 128
#define IDI_ICON4 130
-#define IDI_ICON5 1002
// Next default values for new objects
//
diff --git a/protocols/Gadu-Gadu/proto_gg/res/FFC.ico b/protocols/Gadu-Gadu/proto_gg/res/FFC.ico Binary files differdeleted file mode 100644 index d145072f08..0000000000 --- a/protocols/Gadu-Gadu/proto_gg/res/FFC.ico +++ /dev/null diff --git a/protocols/Gadu-Gadu/proto_gg/res/Proto_GG.rc b/protocols/Gadu-Gadu/proto_gg/res/Proto_GG.rc index 46fb8b9980..f6a19debab 100644 --- a/protocols/Gadu-Gadu/proto_gg/res/Proto_GG.rc +++ b/protocols/Gadu-Gadu/proto_gg/res/Proto_GG.rc @@ -57,7 +57,7 @@ IDI_ICON3 ICON "Away.ico" IDI_ICON4 ICON "Invisible.ico"
IDI_ICON5 ICON "NA.ico"
IDI_ICON6 ICON "DND.ico"
-IDI_ICON7 ICON "FFC.ico"
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/Gadu-Gadu/proto_gg/src/resource.h b/protocols/Gadu-Gadu/proto_gg/src/resource.h index 16c501a888..f3e095d876 100644 --- a/protocols/Gadu-Gadu/proto_gg/src/resource.h +++ b/protocols/Gadu-Gadu/proto_gg/src/resource.h @@ -8,7 +8,6 @@ #define IDI_ICON4 130
#define IDI_ICON5 131
#define IDI_ICON6 158
-#define IDI_ICON7 129
// Next default values for new objects
//
diff --git a/protocols/ICQ-WIM/proto_icq/src/resource.h b/protocols/ICQ-WIM/proto_icq/src/resource.h index c74e04f59e..df3be36b36 100644 --- a/protocols/ICQ-WIM/proto_icq/src/resource.h +++ b/protocols/ICQ-WIM/proto_icq/src/resource.h @@ -9,8 +9,6 @@ #define IDI_ICON5 131 #define IDI_ICON6 158 #define IDI_ICON7 159 -#define IDI_ICON8 129 -#define IDI_ICON9 1002 // Next default values for new objects // diff --git a/protocols/ICQ-WIM/proto_mra/src/resource.h b/protocols/ICQ-WIM/proto_mra/src/resource.h index c3ff5ddd89..862336f18a 100644 --- a/protocols/ICQ-WIM/proto_mra/src/resource.h +++ b/protocols/ICQ-WIM/proto_mra/src/resource.h @@ -9,8 +9,6 @@ #define IDI_ICON5 131 #define IDI_ICON6 158 #define IDI_ICON7 159 -#define IDI_ICON8 129 -#define IDI_ICON9 1002 // Next default values for new objects // diff --git a/protocols/JabberG/proto_jabber/res/FFC.ico b/protocols/JabberG/proto_jabber/res/FFC.ico Binary files differdeleted file mode 100644 index dbc899c02a..0000000000 --- a/protocols/JabberG/proto_jabber/res/FFC.ico +++ /dev/null diff --git a/protocols/JabberG/proto_jabber/res/Proto_Jabber.rc b/protocols/JabberG/proto_jabber/res/Proto_Jabber.rc index 46fb8b9980..f6a19debab 100644 --- a/protocols/JabberG/proto_jabber/res/Proto_Jabber.rc +++ b/protocols/JabberG/proto_jabber/res/Proto_Jabber.rc @@ -57,7 +57,7 @@ IDI_ICON3 ICON "Away.ico" IDI_ICON4 ICON "Invisible.ico"
IDI_ICON5 ICON "NA.ico"
IDI_ICON6 ICON "DND.ico"
-IDI_ICON7 ICON "FFC.ico"
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/JabberG/proto_jabber/src/resource.h b/protocols/JabberG/proto_jabber/src/resource.h index e1031b138e..f59e3ec356 100644 --- a/protocols/JabberG/proto_jabber/src/resource.h +++ b/protocols/JabberG/proto_jabber/src/resource.h @@ -8,7 +8,6 @@ #define IDI_ICON4 130
#define IDI_ICON5 131
#define IDI_ICON6 158
-#define IDI_ICON7 129
// Next default values for new objects
//
diff --git a/protocols/MSN/proto_msn/res/Phone.ico b/protocols/MSN/proto_msn/res/Phone.ico Binary files differdeleted file mode 100644 index 144bc48e59..0000000000 --- a/protocols/MSN/proto_msn/res/Phone.ico +++ /dev/null diff --git a/protocols/MSN/proto_msn/res/Proto_MSN.rc b/protocols/MSN/proto_msn/res/Proto_MSN.rc index 6d2a82de81..c35fd121b9 100644 --- a/protocols/MSN/proto_msn/res/Proto_MSN.rc +++ b/protocols/MSN/proto_msn/res/Proto_MSN.rc @@ -56,7 +56,7 @@ IDI_ICON2 ICON "Online.ico" IDI_ICON3 ICON "Away.ico"
IDI_ICON4 ICON "Invisible.ico"
IDI_ICON6 ICON "Occupied.ico"
-IDI_ICON8 ICON "Phone.ico"
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/MSN/proto_msn/src/resource.h b/protocols/MSN/proto_msn/src/resource.h index 2842dcf4f3..72c197a868 100644 --- a/protocols/MSN/proto_msn/src/resource.h +++ b/protocols/MSN/proto_msn/src/resource.h @@ -7,7 +7,6 @@ #define IDI_ICON3 128
#define IDI_ICON4 130
#define IDI_ICON6 159
-#define IDI_ICON8 1002
// Next default values for new objects
//
diff --git a/protocols/SkypeWeb/proto_skype/res/Phone.ico b/protocols/SkypeWeb/proto_skype/res/Phone.ico Binary files differdeleted file mode 100644 index 8903209986..0000000000 --- a/protocols/SkypeWeb/proto_skype/res/Phone.ico +++ /dev/null diff --git a/protocols/SkypeWeb/proto_skype/res/Proto_Skype.rc b/protocols/SkypeWeb/proto_skype/res/Proto_Skype.rc index 3506f4708d..347ccb7a74 100644 --- a/protocols/SkypeWeb/proto_skype/res/Proto_Skype.rc +++ b/protocols/SkypeWeb/proto_skype/res/Proto_Skype.rc @@ -56,7 +56,7 @@ IDI_ICON2 ICON "Online.ico" IDI_ICON3 ICON "DND.ico"
IDI_ICON4 ICON "Invisible.ico"
IDI_ICON5 ICON "Away.ico"
-IDI_ICON6 ICON "Phone.ico"
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/SkypeWeb/proto_skype/src/resource.h b/protocols/SkypeWeb/proto_skype/src/resource.h index e206585288..728eb56f94 100644 --- a/protocols/SkypeWeb/proto_skype/src/resource.h +++ b/protocols/SkypeWeb/proto_skype/src/resource.h @@ -7,7 +7,6 @@ #define IDI_ICON3 158
#define IDI_ICON4 130
#define IDI_ICON5 128
-#define IDI_ICON6 1002
// Next default values for new objects
//
diff --git a/protocols/Steam/proto_steam/res/FFC.ico b/protocols/Steam/proto_steam/res/FFC.ico Binary files differdeleted file mode 100644 index 1e8b4f3bad..0000000000 --- a/protocols/Steam/proto_steam/res/FFC.ico +++ /dev/null diff --git a/protocols/Steam/proto_steam/res/Lunch.ico b/protocols/Steam/proto_steam/res/Lunch.ico Binary files differdeleted file mode 100644 index 3bf1b3fe40..0000000000 --- a/protocols/Steam/proto_steam/res/Lunch.ico +++ /dev/null diff --git a/protocols/Steam/proto_steam/res/Phone.ico b/protocols/Steam/proto_steam/res/Phone.ico Binary files differdeleted file mode 100644 index 6ef180a87a..0000000000 --- a/protocols/Steam/proto_steam/res/Phone.ico +++ /dev/null diff --git a/protocols/Steam/proto_steam/res/Proto_Steam.rc b/protocols/Steam/proto_steam/res/Proto_Steam.rc index 68b8b58b2e..7658ab5894 100644 --- a/protocols/Steam/proto_steam/res/Proto_Steam.rc +++ b/protocols/Steam/proto_steam/res/Proto_Steam.rc @@ -56,9 +56,7 @@ IDI_ICON2 ICON "Online.ico" IDI_ICON3 ICON "Away.ico"
IDI_ICON5 ICON "NA.ico"
IDI_ICON6 ICON "DND.ico"
-IDI_ICON8 ICON "Lunch.ico"
-IDI_ICON9 ICON "Phone.ico"
-IDI_ICON10 ICON "FFC.ico"
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/Steam/proto_steam/src/resource.h b/protocols/Steam/proto_steam/src/resource.h index 70b1314876..f0b1594ea6 100644 --- a/protocols/Steam/proto_steam/src/resource.h +++ b/protocols/Steam/proto_steam/src/resource.h @@ -7,9 +7,6 @@ #define IDI_ICON3 128
#define IDI_ICON5 131
#define IDI_ICON6 158
-#define IDI_ICON8 1003
-#define IDI_ICON9 1002
-#define IDI_ICON10 129
// Next default values for new objects
//
diff --git a/protocols/VKontakte/proto_vkontakte/res/Mobile.ico b/protocols/VKontakte/proto_vkontakte/res/Mobile.ico Binary files differdeleted file mode 100644 index 159cf2a61e..0000000000 --- a/protocols/VKontakte/proto_vkontakte/res/Mobile.ico +++ /dev/null diff --git a/protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc b/protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc index b9dd36144a..f3234c201f 100644 --- a/protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc +++ b/protocols/VKontakte/proto_vkontakte/res/Proto_VKontakte.rc @@ -54,7 +54,7 @@ END IDI_ICON1 ICON "Offline.ico"
IDI_ICON2 ICON "Online.ico"
IDI_ICON3 ICON "Invisible.ico"
-IDI_ICON4 ICON "Mobile.ico"
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/VKontakte/proto_vkontakte/src/resource.h b/protocols/VKontakte/proto_vkontakte/src/resource.h index ff3d29c6b7..5e2a03fbca 100644 --- a/protocols/VKontakte/proto_vkontakte/src/resource.h +++ b/protocols/VKontakte/proto_vkontakte/src/resource.h @@ -5,7 +5,6 @@ #define IDI_ICON1 105
#define IDI_ICON2 104
#define IDI_ICON3 130
-#define IDI_ICON4 1002
// Next default values for new objects
//
diff --git a/src/icons/proto_metacontacts/res/FFC.ico b/src/icons/proto_metacontacts/res/FFC.ico Binary files differdeleted file mode 100644 index 94b2d4f21f..0000000000 --- a/src/icons/proto_metacontacts/res/FFC.ico +++ /dev/null diff --git a/src/icons/proto_metacontacts/res/Lunch.ico b/src/icons/proto_metacontacts/res/Lunch.ico Binary files differdeleted file mode 100644 index 5eb3a07ee8..0000000000 --- a/src/icons/proto_metacontacts/res/Lunch.ico +++ /dev/null diff --git a/src/icons/proto_metacontacts/res/Phone.ico b/src/icons/proto_metacontacts/res/Phone.ico Binary files differdeleted file mode 100644 index 69e3685aca..0000000000 --- a/src/icons/proto_metacontacts/res/Phone.ico +++ /dev/null diff --git a/src/icons/proto_metacontacts/res/Proto_MetaContacts.rc b/src/icons/proto_metacontacts/res/Proto_MetaContacts.rc index c3de58f34c..e39cda7890 100644 --- a/src/icons/proto_metacontacts/res/Proto_MetaContacts.rc +++ b/src/icons/proto_metacontacts/res/Proto_MetaContacts.rc @@ -58,9 +58,7 @@ IDI_ICON4 ICON "Invisible.ico" IDI_ICON5 ICON "NA.ico"
IDI_ICON6 ICON "DND.ico"
IDI_ICON7 ICON "Occupied.ico"
-IDI_ICON8 ICON "FFC.ico"
-IDI_ICON9 ICON "Phone.ico"
-IDI_ICON10 ICON "Lunch.ico"
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/icons/proto_metacontacts/src/resource.h b/src/icons/proto_metacontacts/src/resource.h index c5cb7deb8e..5f167b1511 100644 --- a/src/icons/proto_metacontacts/src/resource.h +++ b/src/icons/proto_metacontacts/src/resource.h @@ -5,13 +5,10 @@ #define IDI_ICON2 104
#define IDI_ICON1 105
#define IDI_ICON3 128
-#define IDI_ICON8 129
#define IDI_ICON4 130
#define IDI_ICON5 131
#define IDI_ICON6 158
#define IDI_ICON7 159
-#define IDI_ICON9 1002
-#define IDI_ICON10 1003
// Next default values for new objects
//
|