From 8a47a191d7b46de2e8c7a8621a061fb1eb67b4f3 Mon Sep 17 00:00:00 2001
From: jsmorley <jsmorley@gmail.com>
Date: Mon, 21 Jun 2010 17:14:56 +0000
Subject: [PATCH] Changes to Rainstaller and RainThemes to support new version
 checking method. Minor fix to a couple of typos in the version checking code
 Changed "Update Available" to "New Version Available"

---
 Application/Application.rc | 4 ++--
 Library/Rainmeter.cpp      | 2 +-
 Library/Rainmeter.h        | 4 ++--
 Library/TrayWindow.cpp     | 2 +-
 Library/UpdateCheck.cpp    | 3 +--
 Library/resource.h         | 2 +-
 revision-number.h          | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Application/Application.rc b/Application/Application.rc
index 695dac69..dc9900c6 100644
--- a/Application/Application.rc
+++ b/Application/Application.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,443
- PRODUCTVERSION 1,3,0,443
+ FILEVERSION 1,3,0,444
+ PRODUCTVERSION 1,3,0,444
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp
index 2be91791..5cd605cf 100644
--- a/Library/Rainmeter.cpp
+++ b/Library/Rainmeter.cpp
@@ -2278,7 +2278,7 @@ void CRainmeter::ShowContextMenu(POINT pos, CMeterWindow* meterWindow)
 				if (m_NewVersion)
 				{
 					configPos += 1;
-					InsertMenu(subMenu, 2, MF_BYPOSITION | MF_ENABLED, ID_CONTEXT_NEW_VERSION, L"Update Available");
+					InsertMenu(subMenu, 2, MF_BYPOSITION | MF_ENABLED, ID_CONTEXT_NEW_VERSION, L"New Version Available");
 				}
 
 				// Create a menu for all active configs
diff --git a/Library/Rainmeter.h b/Library/Rainmeter.h
index c12332f4..9e198121 100644
--- a/Library/Rainmeter.h
+++ b/Library/Rainmeter.h
@@ -32,13 +32,13 @@
 #define MAKE_VER(major, minor1, minor2) major * 1000000 + minor1 * 1000 + minor2
 
 #define APPNAME L"Rainmeter"
-#define APPVERSION L"1.2"
+#define APPVERSION L"1.3"
 #ifdef _WIN64
 #define APPBITS L"(64-bit)"
 #else
 #define APPBITS L"(32-bit)"
 #endif
-#define RAINMETER_VERSION MAKE_VER(1, 2, 0) //newvercheck
+#define RAINMETER_VERSION MAKE_VER(1, 3, 0)
 
 enum PLATFORM
 {
diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp
index 31f3bd98..517f99f9 100644
--- a/Library/TrayWindow.cpp
+++ b/Library/TrayWindow.cpp
@@ -467,7 +467,7 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				command += L"\\Addons\\RainThemes\\RainThemes.exe\"";
 				LSExecute(tray->GetWindow(), command.c_str(), SW_SHOWNORMAL);
 			}
-			else if(wParam == ID_CONTEXT_NEW_VERSION)	//newvercheck
+			else if(wParam == ID_CONTEXT_NEW_VERSION)
 			{
 				LSExecute(NULL, L"http://rainmeter.net/RainCMS/", SW_SHOWNORMAL);
 			}
diff --git a/Library/UpdateCheck.cpp b/Library/UpdateCheck.cpp
index eac38a15..85f79f23 100644
--- a/Library/UpdateCheck.cpp
+++ b/Library/UpdateCheck.cpp
@@ -28,7 +28,7 @@ extern CRainmeter* Rainmeter;
 
 void CheckVersion(void* dummy)
 {
-	double version = 0.0;
+	int version = 0;
 
 	HINTERNET hRootHandle = InternetOpen(L"Rainmeter",
 									INTERNET_OPEN_TYPE_PRECONFIG,
@@ -65,7 +65,6 @@ void CheckVersion(void* dummy)
 
 					version += atoi(verMinor1.c_str()) * 1000;
 					version += atoi(verMinor2.c_str());
-
 				}
 				else
 				{
diff --git a/Library/resource.h b/Library/resource.h
index 6f4dbfbe..14beb021 100644
--- a/Library/resource.h
+++ b/Library/resource.h
@@ -58,7 +58,7 @@
 #define ID_CONTEXT_MANAGESKINS          4047
 #define ID_CONTEXT_SKINMENU_MONITOR_PRIMARY	4048
 #define ID_CONTEXT_SKINMENU_MONITOR_AUTOSELECT	4049
-#define ID_CONTEXT_NEW_VERSION				4050 //newvercheck
+#define ID_CONTEXT_NEW_VERSION				4050
 
 #define WM_QUERY_RAINMETER				WM_APP + 1000
 
diff --git a/revision-number.h b/revision-number.h
index f097b134..2bd36f63 100644
--- a/revision-number.h
+++ b/revision-number.h
@@ -1,2 +1,2 @@
 #pragma once
-const int revision_number = 443;
\ No newline at end of file
+const int revision_number = 444;
\ No newline at end of file