diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-11-07 17:45:59 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-11-07 17:45:59 +0000 |
| commit | 0e1583d29ba276dbfc6a65afec90f4b8d066ebe1 (patch) | |
| tree | f7585e2b5762fbd17f1217a49163e650b7497412 | |
| parent | ef80928ba55ace95684a7cea95df7bd897792e8f (diff) | |
shameful death of Miranda NG related masks in FingerprintNG
git-svn-id: http://svn.miranda-ng.org/main/trunk@6816 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | build/make_ver.bat | 2 | ||||
| -rw-r--r-- | plugins/FingerprintNG/src/masks.cpp | 39 |
2 files changed, 17 insertions, 24 deletions
diff --git a/build/make_ver.bat b/build/make_ver.bat index f1cddd29a0..bd83ec9dd5 100644 --- a/build/make_ver.bat +++ b/build/make_ver.bat @@ -23,7 +23,7 @@ echo #define MIRANDA_VERSION_STRING "%1.%2.%3.%4" echo #define MIRANDA_VERSION_DISPLAY "%1.%2.%3 alpha build #%4" >> "%TempFileName%"
echo #define MIRANDA_VERSION_DWORD MIRANDA_MAKE_VERSION(%1, %2, %3, %4) >> "%TempFileName%"
echo #define MIRANDA_VERSION_CORE MIRANDA_MAKE_VERSION(%1, %2, %3, 0) >> "%TempFileName%"
-echo #define MIRANDA_VERSION_CORE_STRING "%1.%2.%3.0" >> "%TempFileName%"
+echo #define MIRANDA_VERSION_CORE_STRING "%1.%2.%3" >> "%TempFileName%"
echo. >> "%TempFileName%"
echo #endif // M_VERSION_H__ >> "%TempFileName%"
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index bf4271e81b..42387750b8 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "global.h"
+#include <m_version.h>
+
/************************************************************************/
/* This file contains data about appropriate MirVer values */
/************************************************************************/
@@ -44,43 +46,34 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * In order to get "Unknown" client, last mask should be "?*".
*/
+#define NIGHTLY_CORE_VERSION _T("|*Miranda*NG*") _T(MIRANDA_VERSION_CORE_STRING) _T("*")
+
KN_FP_MASK def_kn_fp_mask[] =
{// {"Client_IconName", _T("|^*Mask*|*names*"), _T("Icon caption"), IDI_RESOURCE_ID, CLIENT_CASE, OVERLAY? },
//#########################################################################################################################################################################
//################################# MIRANDA ###########################################################################################################################
//#########################################################################################################################################################################
- {"client_Miranda_NG_stbl", _T("|Miranda*NG*0.92.3.1504*")
- _T("|Miranda*NG*0.93.1.1649*")
- _T("|Miranda*NG*0.93.2.1746*")
- _T("|Miranda*NG*0.93.3.2110*")
- _T("|Miranda*NG*0.93.4.2450*")
- _T("|Miranda*NG*0.93.5.3007*")
- _T("|Miranda*NG*0.94.1.3800*")
- _T("|Miranda*NG*0.94.2.4228*")
- _T("|Miranda*NG*0.94.3.4844*")
- _T("|Miranda*NG*0.94.4.5216*")
- _T("|Miranda*NG*0.94.5.6300*")
- _T("|Miranda*NG*stable*"), LPGENT("MirandaNG stable"), IDI_MIRANDA_NG_STABLE, MIRANDA_CASE },
-
{"client_Miranda_NG", _T("|*nightly.miranda.im*")
- _T("|*Miranda*NG*"), _T("MirandaNG"), IDI_MIRANDA_NG, MIRANDA_CASE },
+ NIGHTLY_CORE_VERSION, _T("MirandaNG"), IDI_MIRANDA_NG, MIRANDA_CASE },
+
+ {"client_Miranda_NG_stbl", _T("|Miranda*NG*"), LPGENT("MirandaNG stable"), IDI_MIRANDA_NG_STABLE, MIRANDA_CASE },
- {"client_Miranda_010xx", _T("Miranda*IM*0.10.*"), _T("MirandaIM v0.10.x.x"), IDI_MIRANDA_010X, MIRANDA_CASE },
+ {"client_Miranda_010xx", _T("Miranda*IM*0.10.*"), _T("MirandaIM v0.10.x.x"), IDI_MIRANDA_010X, MIRANDA_CASE },
{"client_Miranda_09XX", _T("|*Miranda*IM*0.9*")
- _T("|*miranda-im.org/caps#*0.9*"), _T("MirandaIM v0.9.x.x"), IDI_MIRANDA_09XX, MIRANDA_CASE },
+ _T("|*miranda-im.org/caps#*0.9*"), _T("MirandaIM v0.9.x.x"), IDI_MIRANDA_09XX, MIRANDA_CASE },
{"client_Miranda_08XX", _T("|^Miranda*0.7*Jabb*")
_T("|*Miranda*0.8*")
- _T("|*miranda-im.org/caps#*0.8*"), _T("MirandaIM v0.8.x.x"), IDI_MIRANDA_08XX, MIRANDA_CASE },
+ _T("|*miranda-im.org/caps#*0.8*"), _T("MirandaIM v0.8.x.x"), IDI_MIRANDA_08XX, MIRANDA_CASE },
{"client_Miranda_07XX", _T("|*Miranda*0.7*")
- _T("|*miranda-im.org/caps#*0.7*"), _T("MirandaIM v0.7.x.x"), IDI_MIRANDA_07XX, MIRANDA_CASE },
- {"client_Miranda_06XX", _T("*Miranda*0.6*"), _T("MirandaIM v0.6.x.x"), IDI_MIRANDA_06XX, MIRANDA_CASE },
- {"client_Miranda_05XX", _T("*Miranda*0.5*"), _T("MirandaIM v0.5.x.x"), IDI_MIRANDA_05XX, MIRANDA_CASE },
- {"client_Miranda_04XX", _T("*Miranda*0.4*"), _T("MirandaIM v0.4.x.x"), IDI_MIRANDA_04XX, MIRANDA_CASE },
+ _T("|*miranda-im.org/caps#*0.7*"), _T("MirandaIM v0.7.x.x"), IDI_MIRANDA_07XX, MIRANDA_CASE },
+ {"client_Miranda_06XX", _T("*Miranda*0.6*"), _T("MirandaIM v0.6.x.x"), IDI_MIRANDA_06XX, MIRANDA_CASE },
+ {"client_Miranda_05XX", _T("*Miranda*0.5*"), _T("MirandaIM v0.5.x.x"), IDI_MIRANDA_05XX, MIRANDA_CASE },
+ {"client_Miranda_04XX", _T("*Miranda*0.4*"), _T("MirandaIM v0.4.x.x"), IDI_MIRANDA_04XX, MIRANDA_CASE },
- {"client_Miranda_old", _T("*Miranda*0.?*"), LPGENT("MirandaIM (old versions)"), IDI_MIRANDA_OLD, MIRANDA_CASE },
+ {"client_Miranda_old", _T("*Miranda*0.?*"), LPGENT("MirandaIM (old versions)"), IDI_MIRANDA_OLD, MIRANDA_CASE },
- {"client_Miranda_unknown", _T("*Miranda*"), LPGENT("Miranda (unknown)"), IDI_MIRANDA_UNKNOWN, MIRANDA_CASE },
+ {"client_Miranda_unknown", _T("*Miranda*"), LPGENT("Miranda (unknown)"), IDI_MIRANDA_UNKNOWN, MIRANDA_CASE },
//#########################################################################################################################################################################
//################################# MULTI-PROTOCOL ####################################################################################################################
|