From cd729212350658281b46b9c202587f18e205a87c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 28 Jun 2014 17:07:02 +0000
Subject: defaults changed for PU

git-svn-id: http://svn.miranda-ng.org/main/trunk@9601 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/PluginUpdater/src/Common.h      | 10 ++++++++--
 plugins/PluginUpdater/src/DlgUpdate.cpp |  9 +++++----
 plugins/PluginUpdater/src/Utils.cpp     |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h
index b829e92eae..1c9282481e 100644
--- a/plugins/PluginUpdater/src/Common.h
+++ b/plugins/PluginUpdater/src/Common.h
@@ -101,13 +101,19 @@ struct PlugOptions
 	int  Period;
 };
 
-#define DEFAULT_UPDATEICONS       0
 #define DEFAULT_UPDATEONSTARTUP   1
-#define DEFAULT_ONLYONCEADAY      1
 #define DEFAULT_UPDATEONPERIOD    0
 #define DEFAULT_PERIOD            1
 #define DEFAULT_PERIODMEASURE     1
 
+#if MIRANDA_VER < 0x0A00
+	#define DEFAULT_UPDATEICONS       1
+	#define DEFAULT_ONLYONCEADAY      0
+#else
+	#define DEFAULT_UPDATEICONS       0
+	#define DEFAULT_ONLYONCEADAY      1
+#endif
+
 #define DEFAULT_UPDATE_URL                "http://miranda-ng.org/distr/stable/x%platform%"
 #define DEFAULT_UPDATE_URL_TRUNK          "http://miranda-ng.org/distr/x%platform%"
 #define DEFAULT_UPDATE_URL_TRUNK_SYMBOLS  "http://miranda-ng.now.im/pdb_x%platform%/"
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index a64da26ab8..96c3190b56 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -686,7 +686,7 @@ static void CheckUpdates(void *)
 	if (tszTempPath[dwLen-1] == '\\')
 		tszTempPath[dwLen-1] = 0;
 
-	ptrT updateUrl( GetDefaultUrl()), baseUrl;
+	ptrT updateUrl(GetDefaultUrl()), baseUrl;
 	
 	SERVLIST hashes(50, CompareHashes);
 	bool success = ParseHashes(updateUrl, baseUrl, hashes);
@@ -703,9 +703,9 @@ static void CheckUpdates(void *)
 			opts.bSilent = true;
 		}
 		else CallFunctionAsync(LaunchDialog, UpdateFiles);
-	} else {
-		opts.bSilent = true;
 	}
+	else opts.bSilent = true;
+
 	InitTimer(success ? 0 : 2);	
 	
 	hashes.destroy();
@@ -720,7 +720,8 @@ void DoCheck(int iFlag)
 		ShowWindow(hwndDialog, SW_SHOW);
 		SetForegroundWindow(hwndDialog);
 		SetFocus(hwndDialog);
-	} else if (iFlag) {
+	}
+	else if (iFlag) {
 		db_set_dw(NULL, MODNAME, "LastUpdate", time(NULL));
 		hCheckThread = mir_forkthread(CheckUpdates, 0);		
 	}
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index 5c6452f4b0..75c17573a3 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -181,7 +181,7 @@ int Get_CRC(unsigned char* buffer, ULONG bufsize)
 TCHAR* GetDefaultUrl()
 {
 	#if MIRANDA_VER < 0x0A00
-		return mir_tstrdup(_T("http://miranda-ng.org/distr/deprecated/0.94.9"));
+		return mir_tstrdup(_T("http://miranda-ng.org/distr/deprcated/0.94.9/x%platform%"));
 	#else
 		TCHAR *result = db_get_tsa(NULL, MODNAME, "UpdateURL");
 		if (result == NULL) { // URL is not set
-- 
cgit v1.2.3