From 809c8801768edf4fdae783eebc59cf9ed6e2ce64 Mon Sep 17 00:00:00 2001
From: Jonathan McCrohan <jmccrohan@gmail.com>
Date: Mon, 16 Jul 2012 00:23:07 +0100
Subject: Fix incompatibility with FF13+

Fix based on patch supplied by Oleg_Sch.
http://oleg.7zsfx.info/mozilla/proxy_selector-0.80.7-fx.patch.txt
---
 README.md                               | 4 ++--
 src/chrome/content/datasource.js        | 8 ++++++++
 src/chrome/content/dialogs/editproxy.js | 1 +
 src/chrome/content/dialogs/manager.xul  | 4 ++--
 src/chrome/content/proxy.js             | 1 +
 src/install.rdf                         | 6 +++---
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 790a949..2dd712a 100644
--- a/README.md
+++ b/README.md
@@ -12,11 +12,11 @@ Change the .zip file to .xpi, and add manually to Firefox
 
 Requirements:
 ----------------------
-Firefox 2.* - 12+
+Firefox 2.* - 13+
 
 or
 
-Thunderbird 1.* - 12+
+Thunderbird 1.* - 13+
 
 Firefox/Thunderbird 10+ mark add-ons as compatible by default.
 
diff --git a/src/chrome/content/datasource.js b/src/chrome/content/datasource.js
index e31a1ec..76d73cf 100644
--- a/src/chrome/content/datasource.js
+++ b/src/chrome/content/datasource.js
@@ -39,6 +39,14 @@ function mproxy_ds_initDataSource(){
 	}catch(err){ throw "(mproxy_ds_initDataSource)\n" + err; }
 }
 
+//Save RDF
+function mproxy_ds_save(){
+	mproxy_ds_initDataSource();
+	try{
+		gSProxyDs.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource).Flush();
+	}catch(err){ throw "(mproxy_ds_save)\n" + err; }
+}
+
 //Add RDF Observer
 function mproxy_ds_addObserver(oObserver){
 	mproxy_ds_initDataSource();
diff --git a/src/chrome/content/dialogs/editproxy.js b/src/chrome/content/dialogs/editproxy.js
index 3e01c58..79d9f0d 100644
--- a/src/chrome/content/dialogs/editproxy.js
+++ b/src/chrome/content/dialogs/editproxy.js
@@ -153,6 +153,7 @@ function mproxy_saveProxy(){
     * Finish
     */      
       opener.mproxy_populateList();
+      mproxy_ds_save();
 
 	  if(gIsEdit){
         
diff --git a/src/chrome/content/dialogs/manager.xul b/src/chrome/content/dialogs/manager.xul
index 3cd0cdd..0d8754f 100644
--- a/src/chrome/content/dialogs/manager.xul
+++ b/src/chrome/content/dialogs/manager.xul
@@ -26,11 +26,11 @@
 	</script>
 			
 	<hbox align="top" flex="1" style="overflow: auto;">
-		<listbox id="manage-proxy-list" flex="2" rows="10"></listbox>
+		<listbox id="manage-proxy-list" flex="1" style="height:100%"></listbox>
 		<vbox>
 			<button id="new-button" label=" &common.add.label;" oncommand="mproxy_editProxyDialog(true)" image="chrome://mproxy/content/icons/new.png" />
 			<button id="edit-button" label=" &common.edit.label;" oncommand="mproxy_editProxyDialog(false)" image="chrome://mproxy/content/icons/pencil.png" />
 			<button id="remove-button" label=" &common.remove.label;" oncommand="mproxy_removeProxy(false)" image="chrome://mproxy/content/icons/cross.png" />
 		</vbox>
 	</hbox>
-</dialog>
\ No newline at end of file
+</dialog>
diff --git a/src/chrome/content/proxy.js b/src/chrome/content/proxy.js
index 85664dc..c0f7d01 100644
--- a/src/chrome/content/proxy.js
+++ b/src/chrome/content/proxy.js
@@ -746,6 +746,7 @@ function mproxy_removeProxy(){
 		
 		//Update List
 			mproxy_populateList();
+			mproxy_ds_save();
 			setTimeout("mproxy_setProxy();", 300);
 	}
 	catch(err){
diff --git a/src/install.rdf b/src/install.rdf
index a6dcc72..f6365d3 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -5,7 +5,7 @@
 
    <em:id>{BB080420-8088-F650-3D47-13799CCD6159}</em:id>
    <em:name>Multiproxy Switch</em:name>
-   <em:version>1.40</em:version>
+   <em:version>1.41</em:version>
    <em:description>MPS lets you switch local proxies in Firefox and Thunderbird, and do more.</em:description>
    <em:creator>jmccrohan</em:creator>
    <em:contributor>Jeremy Gillick (http://www.mozmonkey.com)</em:contributor>
@@ -19,7 +19,7 @@
      <Description>
        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
        <em:minVersion>1.5</em:minVersion>
-       <em:maxVersion>12.*</em:maxVersion>
+       <em:maxVersion>13.*</em:maxVersion>
      </Description>
    </em:targetApplication>
    <!-- Thunderbird -->
@@ -27,7 +27,7 @@
      <Description>
 	<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
 	<em:minVersion>1.0</em:minVersion>
-	<em:maxVersion>12.*</em:maxVersion>
+	<em:maxVersion>13.*</em:maxVersion>
      </Description>
    </em:targetApplication>
  </Description>
-- 
cgit v1.2.3