summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBerke Viktor <bviktor@hexchat.org>2013-04-01 21:15:46 -0700
committerBerke Viktor <bviktor@hexchat.org>2013-04-01 21:15:46 -0700
commit13d574b455c4cb0d08cc6b88775d26d7897318ab (patch)
treea734b60337f1933325aebddc79c44bf9bb17b6bd
parent2b13d0f527e1262702dc9ce5eb510904ee78a6e3 (diff)
Revert XP version check; as it turned out, it's completely irrelevant now
This reverts commit cd2f775fe47ee91262e17c7299e0e6b135caa86b.
-rw-r--r--plugins/upd/upd.c42
1 files changed, 8 insertions, 34 deletions
diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c
index e1b850de..ee830ce2 100644
--- a/plugins/upd/upd.c
+++ b/plugins/upd/upd.c
@@ -35,7 +35,6 @@ static char name[] = "Update Checker";
 static char desc[] = "Check for HexChat updates automatically";
 static char version[] = "4.0";
 static const char upd_help[] = "Update Checker Usage:\n  /UPDCHK, check for HexChat updates\n  /UPDCHK SET delay|freq, set startup delay or check frequency\n";
-static int legacy_os = 0;
 
 static char*
 check_version ()
@@ -121,30 +120,14 @@ check_version ()
 		return "Unknown";
 	}
 
-	if (legacy_os)
-	{
-		hResource = HttpOpenRequest (hConnect,
-									TEXT ("GET"),
-									TEXT ("/hexchat/hexchat/master/win32/version-xp.txt"),
-									TEXT ("HTTP/1.0"),
-									NULL,
-									NULL,
-									INTERNET_FLAG_SECURE | INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_AUTH,
-									0);
-	}
-	else
-	{
-		hResource = HttpOpenRequest (hConnect,
-									TEXT ("GET"),
-									TEXT ("/hexchat/hexchat/master/win32/version.txt"),
-									TEXT ("HTTP/1.0"),
-									NULL,
-									NULL,
-									INTERNET_FLAG_SECURE | INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_AUTH,
-									0);	
-	}
-
-
+	hResource = HttpOpenRequest (hConnect,
+								TEXT ("GET"),
+								TEXT ("/hexchat/hexchat/master/win32/version.txt"),
+								TEXT ("HTTP/1.0"),
+								NULL,
+								NULL,
+								INTERNET_FLAG_SECURE | INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_AUTH,
+								0);
 	if (!hResource)
 	{
 		InternetCloseHandle (hConnect);
@@ -303,21 +286,12 @@ int
 hexchat_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg)
 {
 	int delay;
-	OSVERSIONINFOEX osvi;
 	ph = plugin_handle;
 
 	*plugin_name = name;
 	*plugin_desc = desc;
 	*plugin_version = version;
 
-	osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
-	GetVersionEx ((OSVERSIONINFO*) &osvi);
-
-	if (osvi.dwMajorVersion == 5)
-	{
-		legacy_os = 1;
-	}
-
 	/* these are required for the very first run */
 	delay = hexchat_pluginpref_get_int (ph, "delay");
 	if (delay == -1)