From e0a66f24a163019f82ce2b432ce14831b2d3ed7c Mon Sep 17 00:00:00 2001
From: amla70 <amla70@dad15e60-07c4-0504-eb71-dc8a1c21358d>
Date: Mon, 18 Jul 2011 14:22:43 +0000
Subject: [PATCH] FoxToPhone 1.2b2.Compatibility with Https Everywhere, updated
 translations. Reset max version to a valid one.

---
 .../chrome/content/ff-overlay.js              |  8 ++++++
 .../chrome/content/uploads.js                 | 26 ++++++++-----------
 .../chrome/content/uploads.xul                |  4 ++-
 .../chrome/locale/cs/overlay.dtd              |  5 ++++
 .../chrome/locale/nl/overlay.dtd              |  5 ++++
 .../chrome/locale/ru/overlay.dtd              |  5 ++++
 .../chrome/locale/sr/overlay.dtd              |  5 ++++
 .../chrome/skin/uploads.css                   |  8 +++++-
 third_party/firefox_sendtophone/install.rdf   |  4 +--
 .../modules/sendtophone.js                    |  2 +-
 10 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
index efb3d2c..31c198c 100644
--- a/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
+++ b/third_party/firefox_sendtophone/chrome/content/ff-overlay.js
@@ -25,6 +25,14 @@ sendtophone.init = function()
 
 	document.getElementById("contentAreaContextMenu").
 		addEventListener("popupshowing", function (e){ sendtophone.showFirefoxContextMenu(e); }, false);
+
+	// Hide URL bar and other chrome on the uploads window
+	var prevFunc = XULBrowserWindow.hideChromeForLocation;
+
+	XULBrowserWindow.hideChromeForLocation = function(aLocation) {
+	  return (aLocation=='chrome://sendtophone/content/uploads.xul') || prevFunc.apply(XULBrowserWindow, [aLocation]);
+	}
+
 }
 
 sendtophone.installToolbarButton = function()
diff --git a/third_party/firefox_sendtophone/chrome/content/uploads.js b/third_party/firefox_sendtophone/chrome/content/uploads.js
index f403925..7cf7b17 100644
--- a/third_party/firefox_sendtophone/chrome/content/uploads.js
+++ b/third_party/firefox_sendtophone/chrome/content/uploads.js
@@ -1,14 +1,10 @@
 "use strict";
 
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
+Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
+Components.utils.import("resource://gre/modules/PluralForm.jsm");
+Components.utils.import("resource://sendtophone/uploadsManager.js");
 
-Cu.import("resource://gre/modules/DownloadUtils.jsm");
-Cu.import("resource://gre/modules/PluralForm.jsm");
-Cu.import("resource://sendtophone/uploadsManager.js");
-
-let gUploadListener = {
+let FoxToPhoneUploadListener = {
 	UploadsView: null,
 
 	fileAdded: function(data)
@@ -36,8 +32,8 @@ let gUploadListener = {
 		//		Use a 0 ms timeout to avoid flicker while compress -> upload a folder
 		//		The trick won't work if in order to upload the file itself we have to perform an extra request before
 		// (like creating a gallery in min.us)
-		let checkTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-	 	checkTimer.initWithCallback( this.checkTimerEvent, 0, Ci.nsITimer.TYPE_ONE_SHOT );
+		let checkTimer = Components.classes["@mozilla.org/timer;1"].createInstance(Components.interfaces.nsITimer);
+	 	checkTimer.initWithCallback( this.checkTimerEvent, 0, Components.interfaces.nsITimer.TYPE_ONE_SHOT );
 	},
 
 	checkTimerEvent :
@@ -46,7 +42,7 @@ let gUploadListener = {
 		{
 			if (!sendtophoneUploadsManager.isWindowNeeded(true))
 			{
-				if (gUploadListener.UploadsView.children.length==0)
+				if (FoxToPhoneUploadListener.UploadsView.children.length==0)
 					window.close();
 			}
 		}
@@ -83,17 +79,17 @@ let FoxToPhoneUploadWindow = {
 	{
 		this.UploadManager = sendtophoneUploadsManager;
 
-		gUploadListener.UploadsView = document.getElementById("UploadsBox");
+		FoxToPhoneUploadListener.UploadsView = document.getElementById("UploadsBox");
 
-		this.UploadManager.addListener(gUploadListener);
+		this.UploadManager.addListener(FoxToPhoneUploadListener);
 
 		for (let id in this.UploadManager.uploads)
-			gUploadListener.addFile( this.UploadManager.uploads[id] );
+			FoxToPhoneUploadListener.addFile( this.UploadManager.uploads[id] );
 	},
 
 	Shutdown: function()
 	{
-		this.UploadManager.removeListener(gUploadListener);
+		this.UploadManager.removeListener(FoxToPhoneUploadListener);
 	},
 
 	performCancelCommand: function(aItem)
diff --git a/third_party/firefox_sendtophone/chrome/content/uploads.xul b/third_party/firefox_sendtophone/chrome/content/uploads.xul
index ac81e9a..fb3eb6c 100644
--- a/third_party/firefox_sendtophone/chrome/content/uploads.xul
+++ b/third_party/firefox_sendtophone/chrome/content/uploads.xul
@@ -8,7 +8,9 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	 id="sendtophoneUploadsWindow"
         onload="FoxToPhoneUploadWindow.Startup();" onunload="FoxToPhoneUploadWindow.Shutdown();"
-        onclose="return closeWindow(false);">
+        onclose="return closeWindow(false);"
+	title="Fox To Phone - &sendtophoneFileTransfers.label;"
+	>
 
 	<script type="application/javascript" src="chrome://sendtophone/content/uploads.js"/>
 
diff --git a/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd
index cb775c8..65691f4 100644
--- a/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/cs/overlay.dtd
@@ -22,3 +22,8 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Odeslat video do telefonu">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneFileTransfers.label "Přenos souborů">
+<!ENTITY sendtophoneFileServer.label "Server">
+<!ENTITY sendtophoneFileServer.None "Žádný">
+<!ENTITY sendtophoneFileServer.Custom "Vlastní">
+<!ENTITY sendtophoneFileServer.Disclaimer "Upozornění: My (vývojáři FoxToPhone) nejsme spojeni s žádným z provozovatelů hostingových služeb. Měli by jste si přečíst Právní Podmínky před použitím jejich služeb.">
diff --git a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
index 141a998..c218712 100644
--- a/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/nl/overlay.dtd
@@ -22,3 +22,8 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "K">
 <!ENTITY sendtophoneContextVideo.label "Video naar Android verzenden">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneFileTransfers.label "Bestandsoverdrachten">
+<!ENTITY sendtophoneFileServer.label "Server">
+<!ENTITY sendtophoneFileServer.None "Geen">
+<!ENTITY sendtophoneFileServer.Custom "Aangepast">
+<!ENTITY sendtophoneFileServer.Disclaimer "Disclaimer: Wij (de ontwikkelaars van FoxToPhone) zijn niet gelieerd aan de hier genoemde externe hostingdiensten. U dient de erbij behorende servicevoorwaarden te lezen voordat u er gebruik van maakt.">
diff --git a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
index d7ca86f..de8ec60 100644
--- a/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/ru/overlay.dtd
@@ -22,3 +22,8 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "C">
 <!ENTITY sendtophoneContextVideo.label "Отправить видео в телефон">
 <!ENTITY sendtophoneContextVideo.accesskey "V">
+<!ENTITY sendtophoneFileTransfers.label "Передача файла">
+<!ENTITY sendtophoneFileServer.label "Сервет">
+<!ENTITY sendtophoneFileServer.None "Ничего">
+<!ENTITY sendtophoneFileServer.Custom "Произвольный">
+<!ENTITY sendtophoneFileServer.Disclaimer "Мы, разработчики Fox To Phone, никак не связаны с владельцами сервисов перечисленными здесь. Прочитайте их условия использования перед использованием.">
diff --git a/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd b/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd
index 3270a3a..93cf02b 100644
--- a/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd
+++ b/third_party/firefox_sendtophone/chrome/locale/sr/overlay.dtd
@@ -22,3 +22,8 @@
 <!ENTITY sendtophoneContextSendClipboard.accesskey "Т">
 <!ENTITY sendtophoneContextVideo.label "Пошаљи видео на Андроид">
 <!ENTITY sendtophoneContextVideo.accesskey "Д">
+<!ENTITY sendtophoneFileTransfers.label "Пренос датотека">
+<!ENTITY sendtophoneFileServer.label "Сервер">
+<!ENTITY sendtophoneFileServer.None "Ниједан">
+<!ENTITY sendtophoneFileServer.Custom "Прилагођени">
+<!ENTITY sendtophoneFileServer.Disclaimer "Напомена: ми, аутори додатка FoxToPhone, нсимо повезани ни са једним хостингом наведеним овде. Требало би да прочитате њихове услове коришћења пре него што их почнете користити.">
diff --git a/third_party/firefox_sendtophone/chrome/skin/uploads.css b/third_party/firefox_sendtophone/chrome/skin/uploads.css
index a3c493e..b4ffe03 100644
--- a/third_party/firefox_sendtophone/chrome/skin/uploads.css
+++ b/third_party/firefox_sendtophone/chrome/skin/uploads.css
@@ -1,6 +1,6 @@
 
 #sendtophoneUploadsWindow {
-  background-color: ThreeDFace;
+  background-color: ThreeDFace; 
 }
 
 /* Upload View */
@@ -13,6 +13,12 @@
   }
 }
 
+ #UploadsBox {
+    -moz-appearance: none;
+  background-color: ThreeDFace; 
+  border:none;
+}
+
 /* Upload View Items */
 richlistitem[type="upload"] {
   padding: 4px 8px 4px 4px;
diff --git a/third_party/firefox_sendtophone/install.rdf b/third_party/firefox_sendtophone/install.rdf
index 3a09de2..a168176 100644
--- a/third_party/firefox_sendtophone/install.rdf
+++ b/third_party/firefox_sendtophone/install.rdf
@@ -4,7 +4,7 @@
 		<em:id>sendtophone@martinezdelizarrondo.com</em:id>
 		<em:type>2</em:type>
 		<em:name>Fox To Phone</em:name>
-		<em:version>1.2beta1</em:version>
+		<em:version>1.2beta2</em:version>
 		<em:creator>Alfonso &amp; Patrick</em:creator>
 		<em:description>Send links to your Android 2.2 phone using the new C2DM service. Based on the ChromeToPhone extension.</em:description>
 
@@ -28,7 +28,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
 				<em:minVersion>3.5</em:minVersion>
-				<em:maxVersion>8.*</em:maxVersion>
+				<em:maxVersion>7.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
diff --git a/third_party/firefox_sendtophone/modules/sendtophone.js b/third_party/firefox_sendtophone/modules/sendtophone.js
index 3c10fe6..4cb38de 100644
--- a/third_party/firefox_sendtophone/modules/sendtophone.js
+++ b/third_party/firefox_sendtophone/modules/sendtophone.js
@@ -25,7 +25,7 @@ var sendtophoneCore = {
 	req : null,
 	apiVersion : 6,
 	apkUrl : "http://code.google.com/p/chrometophone/wiki/AndroidApp",
-	returnOAuthUrl : "http://code.google.com/p/chrometophone/logo",
+	returnOAuthUrl : "https://code.google.com/p/chrometophone/logo",
 	retryCount : 0,
 
 	init: function()