[Pkg-mozext-commits] [SCM] Mozilla addon for sharing interesting websites branch, master, updated. upstream/3.91-9-g86b957a

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit 86b957ad69f996549db7bccfeba9b7d1b59776c0
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Tue Aug 9 16:59:47 2011 +0200

    Update local_help.patch

diff --git a/debian/changelog b/debian/changelog
index 09648a6..376f945 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ stumbleupon (3.91-1) unstable; urgency=low
   * Upgrade debhelper to (>= 8)
   * Bump Standards-Version to 3.9.2
   * Removed transitional dummy package
-  * Removed local_help.patch patch
+  * Update local_help.patch patch
   * Update private_label.patch patch
   * Added bump-max-version.diff patch
 
diff --git a/debian/patches/local_help.patch b/debian/patches/local_help.patch
index 1ab35fd..485fb7a 100644
--- a/debian/patches/local_help.patch
+++ b/debian/patches/local_help.patch
@@ -3,36 +3,24 @@ 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:
+--- a/content/stumbleuponOverlay.js
++++ b/content/stumbleuponOverlay.js
+@@ -38,6 +38,7 @@
  ***/
  
  //************** GLOBALS ****************/
-+var su_localdoc = "file:///usr/share/xul-ext-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);"/>
++StumbleGlobals.localdoc = "file:///usr/share/xul-ext-stumbleupon/html/";
+ StumbleGlobals.private_label = "DEB";
+ StumbleGlobals.source_label = "AM";
+ StumbleGlobals.log_communication = false;
+--- a/content/stumbleuponOverlay.xul
++++ b/content/stumbleuponOverlay.xul
+@@ -675,7 +675,7 @@
  	
  		<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')"/>
+ 		
+-		<menuitem label="Help Center" tooltiptext="Frequently Asked Questions" oncommand="getBrowser().contentDocument.location=StumbleGlobals.serverhttp + 'faq.html'"/>
++		<menuitem label="Help Center" tooltiptext="Frequently Asked Questions" oncommand="getBrowser().contentDocument.location=(StumbleGlobals.private_label=='DEB'?StumbleGlobals.localdoc + 'faq.html' : StumbleGlobals.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>
+ 				<menuitem label="&menu.stumblehome;" tooltiptext="StumbleUpon.com Home Page" oncommand="getBrowser().contentDocument.location=StumbleGlobals.serverhttp"/>
diff --git a/debian/patches/series b/debian/patches/series
index 88be9bf..d255c72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 private_label.patch
+local_help.patch
 bump-max-version.diff

-- 
Mozilla addon for sharing interesting websites