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

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit 6d29e189361f7cfd0b000f89ec008ad4656e9773
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Tue Aug 9 22:17:42 2011 +0200

    Added back 'Toolbar Guide'

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/patches/bump-max-version.diff b/debian/patches/bump-max-version.diff
index eac85be..cc246a2 100644
--- a/debian/patches/bump-max-version.diff
+++ b/debian/patches/bump-max-version.diff
@@ -13,3 +13,22 @@ 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>

-- 
Mozilla addon for sharing interesting websites