Removed the upgrade functionality

.gitignore

@@ -1,5 +1,4 @@
 builds/*
 chrome/content/useragentswitcher/about/about.xul
 chrome/content/useragentswitcher/options/options.js
-chrome/content/useragentswitcher/upgrade.js
 install.rdf

Makefile

@@ -30,7 +30,7 @@ out_prefix = $(if $(findstring $(firstword $(sort 2 $(words $(locales)))),2),-lo
 out_xpi = builds/user-agent-switcher-$(VERSION)$(out_prefix).xpi
 signed_xpi = $(out_xpi:.xpi=-signed.xpi)
 
-common_files = $(addprefix chrome/content/useragentswitcher/,about/common_about.xul common_upgrade.js options/common_options.js) common_install.rdf
+common_files = $(addprefix chrome/content/useragentswitcher/,about/common_about.xul options/common_options.js) common_install.rdf
 generated_files = $(subst common_,,$(common_files))
 
 .PHONY: all build clean chrome distclean generate install sign-download

chrome/content/useragentswitcher/options/common_options.js

@@ -359,6 +359,9 @@ var UserAgentSwitcherOptions =
 
 		document.getElementById("useragentswitcher-options-user-agents").addEventListener("dblclick", UserAgentSwitcherOptions.treeDoubleClick, false);
 
+		if (!UserAgentSwitcherPreferences.isPreferenceSet("useragentswitcher.reset.onclose"))
+			UserAgentSwitcherPreferences.setBooleanPreference("useragentswitcher.reset.onclose", false);
+		document.getElementById("useragentswitcher-reset-on-close").checked = UserAgentSwitcherPreferences.getBooleanPreference("useragentswitcher.reset.onclose", true);
 	},
 
 	// Returns true if a separator is selected
@@ -564,7 +567,6 @@ var UserAgentSwitcherOptions =
 		if(Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(promptServiceInterface).confirmEx(null, UserAgentSwitcherStringBundle.getString("resetConfirmationMessage"), UserAgentSwitcherStringBundle.getString("resetConfirmation"), promptServiceInterface.BUTTON_TITLE_IS_STRING * promptServiceInterface.BUTTON_POS_0 + promptServiceInterface.BUTTON_TITLE_CANCEL * promptServiceInterface.BUTTON_POS_1, UserAgentSwitcherStringBundle.getString("reset"), null, null, null, {}) == 0)
 		{
 			UserAgentSwitcherPreferences.deletePreferenceBranch("useragentswitcher.");
-			UserAgentSwitcherUpgrade.setVersion();
 			UserAgentSwitcherDOM.removeAllChildElements(document.getElementById("useragentswitcher-options-user-agents"));	
 			UserAgentSwitcherImporter.reset();
 
@@ -678,6 +680,15 @@ var UserAgentSwitcherOptions =
 			document.getElementById("useragentswitcher-move-up-button").setAttribute("disabled", true);
 		}
 	},
+
+	// Toggles whether the user agent resets when the browser restarts 
+	toggleResetOnClose: function(wid)
+	{
+		if (wid.checked)
+			UserAgentSwitcherPreferences.deletePreference("useragentswitcher.reset.onclose");
+		else
+			UserAgentSwitcherPreferences.setBooleanPreference("useragentswitcher.reset.onclose", false);
+	},
 
 	// Handles double clicking on the tree
 	treeDoubleClick: function(event)

chrome/content/useragentswitcher/options/options.xul

@@ -21,7 +21,6 @@
   <script src="chrome://useragentswitcher/content/common/string.js" type="application/x-javascript"/>
   <script src="chrome://useragentswitcher/content/common/stringbundle.js" type="application/x-javascript"/>
   <script src="chrome://useragentswitcher/content/options/options.js" type="application/x-javascript"/>
-  <script src="chrome://useragentswitcher/content/upgrade.js" type="application/x-javascript"/>
   <script src="chrome://useragentswitcher/content/xml/export.js" type="application/x-javascript"/>
   <script src="chrome://useragentswitcher/content/xml/import.js" type="application/x-javascript"/>
 
@@ -38,6 +37,9 @@
 				<spacer flex="1"/>
 				<button label="&useragentswitcher.reset.options;" oncommand="UserAgentSwitcherOptions.resetOptions()"/>
 			</hbox>
+			<hbox flex="1">
+				<checkbox id="useragentswitcher-reset-on-close" label="&useragentswitcher.reset.on.close;" oncommand="UserAgentSwitcherOptions.toggleResetOnClose(this)"/>
+			</hbox>
 		</groupbox>
 
 		<groupbox flex="1">

chrome/content/useragentswitcher/useragentswitcher.js

@@ -114,7 +114,7 @@ var UserAgentSwitcher =
 		{
 			var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
 
-			UserAgentSwitcherUpgrade.upgrade();
+            UserAgentSwitcherImporter.installUserAgents();
 			UserAgentSwitcherImporter.import(UserAgentSwitcherImporter.importTypeMenu, UserAgentSwitcherImporter.getUserAgentFileLocation(), true);
 			UserAgentSwitcher.initializeDisplay();
 
@@ -202,7 +202,12 @@ var UserAgentSwitcher =
 	// Observes quits
 	observe: function(subject, topic, data)
 	{
-		UserAgentSwitcher.reset();
+		// If the reset on close preference is not set or is set to true
+		if(!UserAgentSwitcherPreferences.isPreferenceSet("useragentswitcher.reset.onclose") || UserAgentSwitcherPreferences.getBooleanPreference("useragentswitcher.reset.onclose", true))
+		{
+			UserAgentSwitcher.reset();
+		}
+
 		return false;
 	},
 
@@ -259,10 +264,6 @@ var UserAgentSwitcher =
 		var allWindowsLength = allWindows.length;
 		var defaultUserAgent = UserAgentSwitcherStringBundle.getString("defaultUserAgent");
 
-		// If the obsolete useragentswitcher.reset.onclose is set
-		if (UserAgentSwitcherPreferences.isPreferenceSet("useragentswitcher.reset.onclose"))
-			UserAgentSwitcherPreferences.deletePreference("useragentswitcher.reset.onclose");
-
 		// If an override app code name is set
 		if(UserAgentSwitcherPreferences.isPreferenceSet("general.useragent.appName"))
 		{
@@ -493,13 +494,17 @@ var UserAgentSwitcher =
 				observerService.removeObserver(UserAgentSwitcher, "quit-application-requested", false);
 			}
 
-			var allWindows  = UserAgentSwitcherDOM.getAllWindows();
-			var windowCount = allWindows.length;
-
-			// If this is the last window closing
-			if(windowCount == 0)
+			// If the reset on close preference is not set or is set to true
+			if(!UserAgentSwitcherPreferences.isPreferenceSet("useragentswitcher.reset.onclose") || UserAgentSwitcherPreferences.getBooleanPreference("useragentswitcher.reset.onclose", true))
 			{
-				UserAgentSwitcher.reset();
+				var allWindows  = UserAgentSwitcherDOM.getAllWindows();
+				var windowCount = allWindows.length;
+
+				// If this is the last window closing
+				if(windowCount == 0)
+				{
+					UserAgentSwitcher.reset();
+				}
 			}
 
 			document.getElementById("navigator-toolbox").removeEventListener("dragdrop", UserAgentSwitcher.buttonDrop, false);	

chrome/content/useragentswitcher/useragentswitcher.xul

@@ -13,7 +13,6 @@
   <script src="chrome://useragentswitcher/content/common/preferences.js" type="application/x-javascript"/>
   <script src="chrome://useragentswitcher/content/common/string.js" type="application/x-javascript"/>
   <script src="chrome://useragentswitcher/content/common/stringbundle.js" type="application/x-javascript"/>
-  <script src="chrome://useragentswitcher/content/upgrade.js" type="application/x-javascript"/>
   <script src="chrome://useragentswitcher/content/useragentswitcher.js" type="application/x-javascript"/>
   <script src="chrome://useragentswitcher/content/xml/import.js" type="application/x-javascript"/>
 

chrome/content/useragentswitcher/xml/import.js

@@ -427,6 +427,23 @@ var UserAgentSwitcherImporter =
 			}
 		}
 	},
+
+       // Installs the user agents
+       installUserAgents: function()
+       {
+               // If the user agent directory does not exist
+               if(!this.getUserAgentDirectoryLocation().exists())
+               {
+                       this.createUserAgentDirectory();
+               }
+
+               // If the user agent file does not exist
+               if(!this.getUserAgentFileLocation().exists())
+               {
+                       this.createUserAgentFile();
+                       this.reset();
+               }
+       },
 
 	// Populates a user agent
 	populateUserAgent: function(userAgent, userAgentElement)