[miranda] r14467 committed - Misc changes.

[mir...@googlecode.com]

Revision: 14467
Author: rain...@gmail.com
Date: Fri May 16 14:09:49 2014 UTC
Log: Misc changes.
http://code.google.com/p/miranda/source/detail?r=14467

Modified:
/trunk/miranda/include/m_version.h
/trunk/miranda/src/modules/updatenotify/updatenotify.cpp
/trunk/miranda-tools/installer/miranda-core.nsi
/trunk/miranda-tools/installer/miranda-version.nsi

=======================================
--- /trunk/miranda/include/m_version.h Sat Apr 5 20:28:24 2014 UTC
+++ /trunk/miranda/include/m_version.h Fri May 16 14:09:49 2014 UTC
@@ -27,9 +27,9 @@
#define MIRANDA_MAKE_VERSION(a,b,c,d) (((((DWORD)(a))&0xFF)<<24)|
((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))
#endif

-#define MIRANDA_VERSION_FILEVERSION 0,10,22,0
-#define MIRANDA_VERSION_STRING "0.10.22.0"
-#define MIRANDA_VERSION_CORE MIRANDA_MAKE_VERSION(0, 10, 22, 0)
-#define MIRANDA_VERSION_CORE_STRING "0.10.22"
+#define MIRANDA_VERSION_FILEVERSION 0,10,23,0
+#define MIRANDA_VERSION_STRING "0.10.23.0"
+#define MIRANDA_VERSION_CORE MIRANDA_MAKE_VERSION(0, 10, 23, 0)
+#define MIRANDA_VERSION_CORE_STRING "0.10.23"

#endif // M_VERSION_H__
=======================================
--- /trunk/miranda/src/modules/updatenotify/updatenotify.cpp Wed Jan 15
21:22:39 2014 UTC
+++ /trunk/miranda/src/modules/updatenotify/updatenotify.cpp Fri May 16
14:09:49 2014 UTC
@@ -37,9 +37,9 @@
#define UN_CUSTOMXMLURL "UpdateNotifyCustomXMLURL"
#define UN_URLXML "http://update.miranda-im.org/v1/update.xml"
#define UN_MINCHECKTIME 60*60*24 /* Check no more than once a day */
-#define UN_DEFAULTCHECKTIME 60*60*72 /* Default to check once every 3
days */
+#define UN_DEFAULTCHECKTIME 60*60*24 /* Default to check once every 3
days */
#define UN_FIRSTCHECK 60*60 /* First check 1 hour after startup */
-#define UN_REPEATNOTIFYDLY 60*60*72 /* 3 days before showing release
notification again */
+#define UN_REPEATNOTIFYDLY 60*60*24*5 /* 5 days before showing release
notification again */

typedef struct {
int isNew;
=======================================
--- /trunk/miranda-tools/installer/miranda-core.nsi Sat Apr 5 20:27:40
2014 UTC
+++ /trunk/miranda-tools/installer/miranda-core.nsi Fri May 16 14:09:49
2014 UTC
@@ -42,7 +42,6 @@

InstallDir "$PROGRAMFILES\${MIM_NAME}"
InstallDirRegKey
HKLM "Software\Microsoft\Windows\CurrentVersion\App
Paths\${MIM_BUILD_EXE}" "Path"
-SetCompressor /SOLID lzma
SetOverWrite on
BrandingText "miranda-im.org"

@@ -90,7 +89,7 @@

!insertmacro MUI_LANGUAGE "English"

-LangString CLOSE_WARN ${LANG_ENGLISH} "${MIM_NAME} is currently
running. Please close ${MIM_NAME} so the installation can complete."
+LangString CLOSE_WARN ${LANG_ENGLISH} "${MIM_NAME} is currently
running. Please close the application so the installation can complete."

!macro CloseMiranda
FindWindow $0 "Miranda"
@@ -305,8 +304,7 @@
RMDir /r "$SMPROGRAMS\${MIM_NAME}"
CreateDirectory "$SMPROGRAMS\${MIM_NAME}"

CreateShortCut "$SMPROGRAMS\${MIM_NAME}\${MIM_NAME}.lnk" "$INSTDIR\${MIM_BUILD_EXE}"
-
WriteINIStr "$SMPROGRAMS\${MIM_NAME}\Homepage.url" "InternetShortcut" "URL" "${MIM_URL}"
- WriteINIStr "$SMPROGRAMS\${MIM_NAME}\Get More
Addons.url" "InternetShortcut" "URL" "http://addons.miranda-im.org/"
+
WriteINIStr "$SMPROGRAMS\${MIM_NAME}\Donate.url" "InternetShortcut" "URL" "http://www.miranda-im.org/donate/"
SectionEnd

Section "Install Desktop Shortcut" pSCDesktop
@@ -337,8 +335,11 @@
; Current user shortcuts
SetShellVarContext "current"
Delete "$SMPROGRAMS\${MIM_NAME}\${MIM_NAME}.lnk"
+ Delete "$SMPROGRAMS\${MIM_NAME}\Donate.url"
+ ; legacy begin
Delete "$SMPROGRAMS\${MIM_NAME}\Homepage.url"
Delete "$SMPROGRAMS\${MIM_NAME}\Get More Addons.url"
+ ; legacy end
RMDir "$SMPROGRAMS\${MIM_NAME}"
Delete "$DESKTOP\${MIM_NAME}.lnk"
Delete "$QUICKLAUNCH\${MIM_NAME}.lnk"
=======================================
--- /trunk/miranda-tools/installer/miranda-version.nsi Sat Apr 5 20:28:24
2014 UTC
+++ /trunk/miranda-tools/installer/miranda-version.nsi Fri May 16 14:09:49
2014 UTC
@@ -1,4 +1,4 @@
; Miranda Version Info

-!define MIM_VERSION "0.10.22"
+!define MIM_VERSION "0.10.23"
!define MIM_BETA "0" ; 0 for final build