[Pkg-mozext-commits] [SCM] Mozilla addon for sharing interesting websites branch, upstream, updated. debian/3.3.8-3-20-gace74ad

Benjamin Drung bdrung at ubuntu.com
Tue Aug 9 09:58:43 UTC 2011


The following commit has been merged in the upstream branch:
commit 941cebb6e5131c5c9cc80811cd70b409d98f2c3e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jan 28 21:34:51 2010 +0100

    Refresh local_help.patch.

diff --git a/chrome/stumbleupon.jar!/content/stumbleuponOverlay.js b/chrome/stumbleupon.jar!/content/stumbleuponOverlay.js
index 42686ef..6fcae09 100644
--- a/chrome/stumbleupon.jar!/content/stumbleuponOverlay.js
+++ b/chrome/stumbleupon.jar!/content/stumbleuponOverlay.js
@@ -38,6 +38,7 @@ Copyright notes:
 ***/
 
 //************** GLOBALS ****************/
+var su_localdoc = "file:///usr/share/mozilla-stumbleupon/html/";
 var su_private_label = "DEB";
 var su_source_label = "AM";
 var su_log_communication = true;
diff --git a/chrome/stumbleupon.jar!/content/stumbleuponOverlay.xul b/chrome/stumbleupon.jar!/content/stumbleuponOverlay.xul
index 3b5c64e..ed63174 100644
--- a/chrome/stumbleupon.jar!/content/stumbleuponOverlay.xul
+++ b/chrome/stumbleupon.jar!/content/stumbleuponOverlay.xul
@@ -657,9 +657,9 @@
 		<menuitem label="Sign-out..." tooltiptext="Sign out from this account" oncommand="su_handle_logout(false);"/>
 	
 		<menuseparator/>
-		
-		<menuitem label="Toolbar Guide" tooltiptext="View the toolbar primer" oncommand="getBrowser().contentDocument.location=su_serverhttp + 'guide.html'"/>
-		<menuitem label="Help" tooltiptext="Frequently Asked Questions" oncommand="getBrowser().contentDocument.location=su_serverhttp + 'faq.html'"/>
+
+		<menuitem label="Toolbar Guide" tooltiptext="View the toolbar primer" oncommand="getBrowser().contentDocument.location=(su_private_label=='DEB'?su_localdoc + 'guide.html':su_serverhttp + 'guide.html')"/>
+		<menuitem label="Help" tooltiptext="Frequently Asked Questions" oncommand="getBrowser().contentDocument.location=(su_private_label=='DEB'? su_localdoc + 'faq.html' : su_serverhttp + 'faq.html')"/>
 		<menu label="About StumbleUpon" tooltiptext="Get help with StumbleUpon">
 			<menupopup>
 				<menuitem label="&menu.stumblehome;" tooltiptext="StumbleUpon.com Home Page" oncommand="getBrowser().contentDocument.location=su_serverhttp"/>
@@ -669,7 +669,6 @@
 				<menuseparator/>
 				<menuitem label="&menu.contact;" tooltiptext="Send questions or comments to StumbleUpon" oncommand="su_feedback();"/>
 				<menuitem label="Privacy Policy" tooltiptext="View StumbleUpon's privacy policy" oncommand="getBrowser().contentDocument.location=su_serverhttp + 'privacy.html'"/>
-				<menuitem label="Uninstall Instructions" tooltiptext="Learn how to uninstall the toolbar" oncommand="getBrowser().contentDocument.location=su_serverhttp + 'help/How_do_I_uninstall_the_toolbar/'"/>
 				<menuitem label="Toolbar Version" tooltiptext="Your current toolbar version, along with new versions" oncommand="su_about();"/>
 			</menupopup>
 		</menu>
diff --git a/debian/patches/local_help.patch b/debian/patches/local_help.patch
index 601dd37..25c5553 100644
--- a/debian/patches/local_help.patch
+++ b/debian/patches/local_help.patch
@@ -1,6 +1,21 @@
---- content/stumbleuponOverlay.xul.orig	2007-10-19 21:36:59.000000000 +0100
-+++ content/stumbleuponOverlay.xul	2007-10-24 22:14:21.000000000 +0100
-@@ -558,9 +558,9 @@
+Description: Use local help
+Author: Andrea Veri <and at debian.org>
+Forwarded: not-needed
+Last-Update: 2010-01-28
+
+--- stumbleupon-3.62.orig/chrome/stumbleupon.jar!/content/stumbleuponOverlay.js
++++ stumbleupon-3.62/chrome/stumbleupon.jar!/content/stumbleuponOverlay.js
+@@ -38,6 +38,7 @@ Copyright notes:
+ ***/
+ 
+ //************** GLOBALS ****************/
++var su_localdoc = "file:///usr/share/mozilla-stumbleupon/html/";
+ var su_private_label = "DEB";
+ var su_source_label = "AM";
+ var su_log_communication = true;
+--- stumbleupon-3.62.orig/chrome/stumbleupon.jar!/content/stumbleuponOverlay.xul
++++ stumbleupon-3.62/chrome/stumbleupon.jar!/content/stumbleuponOverlay.xul
+@@ -657,9 +657,9 @@
  		<menuitem label="Sign-out..." tooltiptext="Sign out from this account" oncommand="su_handle_logout(false);"/>
  	
  		<menuseparator/>
@@ -9,26 +24,15 @@
 -		<menuitem label="Help" tooltiptext="Frequently Asked Questions" oncommand="getBrowser().contentDocument.location=su_serverhttp + 'faq.html'"/>
 +
 +		<menuitem label="Toolbar Guide" tooltiptext="View the toolbar primer" oncommand="getBrowser().contentDocument.location=(su_private_label=='DEB'?su_localdoc + 'guide.html':su_serverhttp + 'guide.html')"/>
-+		<menuitem label="Help" tooltiptext="Frequently Asked Questions" oncommand="getBrowser().contentDocument.location=(su_private_label=='DEB'? su_localdoc + 'faq.html' : su_serverhttp + 'faq.html')"/>		
++		<menuitem label="Help" tooltiptext="Frequently Asked Questions" oncommand="getBrowser().contentDocument.location=(su_private_label=='DEB'? su_localdoc + 'faq.html' : su_serverhttp + 'faq.html')"/>
  		<menu label="About StumbleUpon" tooltiptext="Get help with StumbleUpon">
  			<menupopup>
  				<menuitem label="&menu.stumblehome;" tooltiptext="StumbleUpon.com Home Page" oncommand="getBrowser().contentDocument.location=su_serverhttp"/>
-@@ -571,7 +571,6 @@
+@@ -669,7 +669,6 @@
  				<menuseparator/>
  				<menuitem label="&menu.contact;" tooltiptext="Send questions or comments to StumbleUpon" oncommand="su_feedback();"/>
  				<menuitem label="Privacy Policy" tooltiptext="View StumbleUpon's privacy policy" oncommand="getBrowser().contentDocument.location=su_serverhttp + 'privacy.html'"/>
--				<menuitem label="Uninstall Instructions" tooltiptext="Learn how to uninstall the toolbar" oncommand="getBrowser().contentDocument.location=su_serverhttp + 'ask.php?question=uninstall'"/>
+-				<menuitem label="Uninstall Instructions" tooltiptext="Learn how to uninstall the toolbar" oncommand="getBrowser().contentDocument.location=su_serverhttp + 'help/How_do_I_uninstall_the_toolbar/'"/>
  				<menuitem label="Toolbar Version" tooltiptext="Your current toolbar version, along with new versions" oncommand="su_about();"/>
  			</menupopup>
  		</menu>
-
---- content/stumbleuponOverlay.js.orig	2007-07-05 23:52:01.000000000 +0100
-+++ content/stumbleuponOverlay.js	2007-07-05 23:57:39.000000000 +0100
-@@ -29,6 +29,7 @@
- ***/
- 
- //************** GLOBALS ****************/
-+var su_localdoc = "file:///usr/share/mozilla-stumbleupon/html/"
- var su_private_label = "DEB";
- var su_log_communication = false;
- var su_force_migrate_version = false;
diff --git a/debian/patches/series b/debian/patches/series
index 048732e..de25941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 private_label.patch
+local_help.patch

-- 
Mozilla addon for sharing interesting websites



More information about the Pkg-mozext-commits mailing list