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

Fabrizio Regalli fabreg at fabreg.it
Tue Aug 9 20:32:23 UTC 2011


The following commit has been merged in the master branch:
commit 4126889a7821349b5f945ad0763dc0e2f4cccdac
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Tue Aug 9 22:32:07 2011 +0200

    Fixed wrong 'quilt refresh'

diff --git a/debian/patches/bump-max-version.diff b/debian/patches/bump-max-version.diff
index cc246a2..eac85be 100644
--- a/debian/patches/bump-max-version.diff
+++ b/debian/patches/bump-max-version.diff
@@ -13,22 +13,3 @@ Forwarded: not-needed
 -                   em:maxVersion="4.0.*" />
 +                   em:maxVersion="8.0.*" />
  </RDF:RDF>
---- a/content/stumbleuponOverlay.xul
-+++ b/content/stumbleuponOverlay.xul
-@@ -674,7 +674,7 @@
- 		<menuitem label="Sign-out" tooltiptext="Sign out from this account" oncommand="StumbleGlobals.handle_logout(false);"/>
- 	
- 		<menuseparator/>
--		
-+	        <menuitem label="Toolbar Guide" tooltiptext="View the toolbar primer" oncommand="getBrowser().contentDocument.location=(StumbleGlobals.private_label=='DEB'?StumbleGlobals.localdoc + 'guide.html' : StumbleGlobals.serverhttp + 'guide.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>
-@@ -685,7 +685,6 @@
- 				<menuseparator/>
- 				<menuitem label="&menu.contact;" tooltiptext="Send questions or comments to StumbleUpon" oncommand="StumbleGlobals.feedback();"/>
- 				<menuitem label="Privacy Policy" tooltiptext="View StumbleUpon's privacy policy" oncommand="getBrowser().contentDocument.location=StumbleGlobals.serverhttp + 'privacy.html'"/>
--				<menuitem label="Uninstall Instructions" tooltiptext="Learn how to uninstall the toolbar" oncommand="getBrowser().contentDocument.location=StumbleGlobals.serverhttp + 'help/How_do_I_uninstall_the_toolbar/'"/>
- 				<menuitem label="Toolbar Version" tooltiptext="Your current toolbar version, along with new versions" oncommand="StumbleGlobals.about();"/>
- 			</menupopup>
- 		</menu>
diff --git a/debian/patches/local_help.patch b/debian/patches/local_help.patch
index 674bbb0..490d0a8 100644
--- a/debian/patches/local_help.patch
+++ b/debian/patches/local_help.patch
@@ -16,12 +16,20 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=223510
  StumbleGlobals.log_communication = false;
 --- a/content/stumbleuponOverlay.xul
 +++ b/content/stumbleuponOverlay.xul
-@@ -675,7 +675,7 @@
+@@ -674,7 +674,7 @@
+ 		<menuitem label="Sign-out" tooltiptext="Sign out from this account" oncommand="StumbleGlobals.handle_logout(false);"/>
  	
  		<menuseparator/>
- 		
--		<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')"/>
+-		
++	        <menuitem label="Toolbar Guide" tooltiptext="View the toolbar primer" oncommand="getBrowser().contentDocument.location=(StumbleGlobals.private_label=='DEB'?StumbleGlobals.localdoc + 'guide.html' : StumbleGlobals.serverhttp + 'guide.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=StumbleGlobals.serverhttp"/>
+@@ -685,7 +685,6 @@
+ 				<menuseparator/>
+ 				<menuitem label="&menu.contact;" tooltiptext="Send questions or comments to StumbleUpon" oncommand="StumbleGlobals.feedback();"/>
+ 				<menuitem label="Privacy Policy" tooltiptext="View StumbleUpon's privacy policy" oncommand="getBrowser().contentDocument.location=StumbleGlobals.serverhttp + 'privacy.html'"/>
+-				<menuitem label="Uninstall Instructions" tooltiptext="Learn how to uninstall the toolbar" oncommand="getBrowser().contentDocument.location=StumbleGlobals.serverhttp + 'help/How_do_I_uninstall_the_toolbar/'"/>
+ 				<menuitem label="Toolbar Version" tooltiptext="Your current toolbar version, along with new versions" oncommand="StumbleGlobals.about();"/>
+ 			</menupopup>
+ 		</menu>

-- 
Mozilla addon for sharing interesting websites



More information about the Pkg-mozext-commits mailing list