# HG changeset patch
# User ivanl
# Date 1244552344 -3600
# Node ID 9cbe91927e8929c96fac9663c9300c0e22bf920e
# Parent  99bc8e56b756409fb7785142291ed8fb259558c3
Fix for auto-update caching problem

diff -r 99bc8e56b756 -r 9cbe91927e89 Symbian.org/FeedUpdateBroker.js
--- a/Symbian.org/FeedUpdateBroker.js	Mon Jun 08 13:27:04 2009 +0100
+++ b/Symbian.org/FeedUpdateBroker.js	Tue Jun 09 13:59:04 2009 +0100
@@ -24,16 +24,8 @@
     var self = this;
     this.httpReq.onreadystatechange = function() { self.readyStateChanged(); };
 
-	var fullURL = this.feedAddress;
-    if (fullURL.indexOf("?") == -1) {
-        fullURL += "?";
-    } else {
-        fullURL += "&";
-    }
-    fullURL += "nocache=" + (new Date().getTime());
-
     // initiate the request
-    this.httpReq.open("GET", fullURL, true);
+    this.httpReq.open("GET", nocache(this.feedAddress), true);
     this.httpReq.send(null);
 }
 
diff -r 99bc8e56b756 -r 9cbe91927e89 Symbian.org/Main.js
--- a/Symbian.org/Main.js	Mon Jun 08 13:27:04 2009 +0100
+++ b/Symbian.org/Main.js	Tue Jun 09 13:59:04 2009 +0100
@@ -46,7 +46,7 @@
 var wikiBaseUrl = symbianOrgBaseUrl+"/wiki/index.php";
 
 // Update variables
-var myversion = "1.0rc5";
+var myversion = "1.0rc6";
 var versionWikiPageUrl = wikiBaseUrl + "/Symbian.org_WRT_Widget";
 var versionWikiPageString = "Current widget version is [";
 var downloadUrl = symbianOrgBaseUrl + "/wiki/images/c/c5/Symbian.org.wgz";
@@ -319,7 +319,7 @@
 	uiManager.showNotification(-1, "wait", "Checking for updates...", -1);
 	updatePageAjax = new Ajax();
 	updatePageAjax.onreadystatechange = checkForUpdatesStage2;
-	updatePageAjax.open('GET', versionWikiPageUrl, true);
+	updatePageAjax.open('GET', nocache(versionWikiPageUrl), true);
 	updatePageAjax.send(null);	
 }
 
@@ -345,7 +345,7 @@
 			if (answer) {
 				// ok, we have the update
 				uiManager.hideNotification();
-				openURL(downloadUrl);
+				openURL(nocache(downloadUrl));
 				setTimeout(function () {window.close();}, 1000);
 			} else {
 			uiManager.showNotification(3000, "info", "Update cancelled.");
@@ -409,3 +409,13 @@
 		widget.setPreferenceForKey(sizestring, "fontsize");
 	}
 }
+
+function nocache(url) {
+    if (url.indexOf("?") == -1) {
+        url += "?";
+    } else {
+        url += "&";
+    }
+    url += "nocache=" + (new Date().getTime());
+	return url;
+}
diff -r 99bc8e56b756 -r 9cbe91927e89 Symbian.org/WRTKit/Resources/UI.css
--- a/Symbian.org/WRTKit/Resources/UI.css	Mon Jun 08 13:27:04 2009 +0100
+++ b/Symbian.org/WRTKit/Resources/UI.css	Tue Jun 09 13:59:04 2009 +0100
@@ -61,7 +61,7 @@
 body {
     margin: 0px;
     background: url("DocumentBackground.png") repeat;  /* repeat-x fixed; */
-    font: normal 5mm Arial, sans-serif;
+    font: normal 14px Arial, sans-serif;
     color: rgb(0,0,0);
 }