[Pkg-mozext-commits] [sage-extension] 38/49: assert default checkbox values in localstore on firstrun

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag sage_1_3_10
in repository sage-extension.

commit 9be56c67894394cd8da3b8bf2511b1d6e22a3853
Author: Peter Andrews <petea at jhu.edu>
Date:   Wed Oct 4 21:03:05 2006 +0000

    assert default checkbox values in localstore on firstrun
---
 src/sage/content/sage-Overlay.js | 31 +++++++++++++++++++------------
 src/sage/content/sage.xul        |  8 ++++----
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/sage/content/sage-Overlay.js b/src/sage/content/sage-Overlay.js
index a06f252..1c92b92 100644
--- a/src/sage/content/sage-Overlay.js
+++ b/src/sage/content/sage-Overlay.js
@@ -40,27 +40,34 @@ function addSageButton() {
 }
 
 function sageInit() {
+	var localstore = RDF.GetDataSource("rdf:local-store");
 	var prefService = Components.classes["@mozilla.org/preferences;1"].getService(Components.interfaces.nsIPrefService);
 	var prefBranch = prefService.getBranch("sage.");
 	if (!prefBranch.prefHasUserValue("last_version")) {  // new user
 		var new_folder = BMSVC.createFolderInContainer("Sage Feeds", RDF.GetResource("NC:BookmarksRoot"), null);
 		prefBranch.setCharPref("folder_id", new_folder.Value);
-		if (BMSVC.createBookmarkInContainer.length == 7) { // firefox 0.8 and lower
-			BMSVC.createBookmarkInContainer("BBC News | News Front Page | World Edition", "http://news.bbc.co.uk/rss/newsonline_world_edition/front_page/rss091.xml", null, "updated", null, new_folder, null);
-			BMSVC.createBookmarkInContainer("Yahoo! News - Sports", "http://rss.news.yahoo.com/rss/sports", null, "updated", null, new_folder, null);
-			BMSVC.createBookmarkInContainer("Sage Project News", "http://sage.mozdev.org/rss.xml", null, "updated", null, new_folder, null);
-		} else {
-			BMSVC.createBookmarkInContainer("BBC News | News Front Page | World Edition", "http://news.bbc.co.uk/rss/newsonline_world_edition/front_page/rss091.xml", null, "updated", null, null, new_folder, null);
-			BMSVC.createBookmarkInContainer("Yahoo! News - Sports", "http://rss.news.yahoo.com/rss/sports", null, "updated", null, null, new_folder, null);
-			BMSVC.createBookmarkInContainer("Sage Project News", "http://sage.mozdev.org/rss.xml", null, "updated", null, null, new_folder, null);
-		}
+		BMSVC.createBookmarkInContainer("BBC News | News Front Page | World Edition", "http://news.bbc.co.uk/rss/newsonline_world_edition/front_page/rss091.xml", null, "updated", null, null, new_folder, null);
+		BMSVC.createBookmarkInContainer("Yahoo! News - Sports", "http://rss.news.yahoo.com/rss/sports", null, "updated", null, null, new_folder, null);
+		BMSVC.createBookmarkInContainer("Sage Project News", "http://sage.mozdev.org/rss.xml", null, "updated", null, null, new_folder, null);
 		addSageButton();
-		prefBranch.setCharPref("last_version", "1.3.7");
+		localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul"), RDF.GetResource("http://home.netscape.com/NC-rdf#persist"), RDF.GetResource("chrome://sage/content/sage.xul#chkShowSearchBar"), true);
+		localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul#chkShowSearchBar"), RDF.GetResource("checked"), RDF.GetLiteral("false"), true);
+		localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul"), RDF.GetResource("http://home.netscape.com/NC-rdf#persist"), RDF.GetResource("chrome://sage/content/sage.xul#chkShowTooltip"), true);
+		localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul#chkShowTooltip"), RDF.GetResource("checked"), RDF.GetLiteral("true"), true);
+		localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul"), RDF.GetResource("http://home.netscape.com/NC-rdf#persist"), RDF.GetResource("chrome://sage/content/sage.xul#chkShowFeedItemList"), true);
+		localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul#chkShowFeedItemList"), RDF.GetResource("checked"), RDF.GetLiteral("true"), true);
+		localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul"), RDF.GetResource("http://home.netscape.com/NC-rdf#persist"), RDF.GetResource("chrome://sage/content/sage.xul#chkShowFeedItemListToolbar"), true);
+		localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul#chkShowFeedItemListToolbar"), RDF.GetResource("checked"), RDF.GetLiteral("true"), true);
+		prefBranch.setCharPref("last_version", "1.3.8");
 	} else { // check for upgrade
 		var lastVersion = prefBranch.getCharPref("last_version");
-		if (lastVersion != "1.3.7") { // upgrade
+		if (lastVersion.substring(0, 3) != "1.3") {
+			localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul"), RDF.GetResource("http://home.netscape.com/NC-rdf#persist"), RDF.GetResource("chrome://sage/content/sage.xul#chkShowFeedItemListToolbar"), true);
+			localstore.Assert(RDF.GetResource("chrome://sage/content/sage.xul#chkShowFeedItemListToolbar"), RDF.GetResource("checked"), RDF.GetLiteral("true"), true);
+		}
+		if (lastVersion != "1.3.7" && lastVersion != "1.3.8") {
 			addSageButton();
-			prefBranch.setCharPref("last_version", "1.3.7");
+			prefBranch.setCharPref("last_version", "1.3.8");
 		}
 	}
 }
diff --git a/src/sage/content/sage.xul b/src/sage/content/sage.xul
index 8a298cc..7247e45 100755
--- a/src/sage/content/sage.xul
+++ b/src/sage/content/sage.xul
@@ -84,10 +84,10 @@
 		<spacer flex="1"/>
 		<toolbarbutton id="toolsMenuButton" type="menu" label="&menu.tools;" class="sage_button toolbarbutton-1">
 			<menupopup>
-				<menuitem id="chkShowSearchBar" type="checkbox" checked="false" persist="checked" label="&menu.showSearchBar;" oncommand="toggleShowSearchBar()"/>
-				<menuitem id="chkShowTooltip" type="checkbox" checked="true" persist="checked" label="&menu.showDescTooltip;"/>
-				<menuitem id="chkShowFeedItemList" type="checkbox" checked="true" persist="checked" label="&menu.showFeedItemList;" oncommand="toggleShowFeedItemList()"/>
-				<menuitem id="chkShowFeedItemListToolbar" type="checkbox" checked="true" persist="checked" label="&menu.showFeedItemListToolbar;" oncommand="toggleShowFeedItemListToolbar()"/>
+				<menuitem id="chkShowSearchBar" type="checkbox" persist="checked" label="&menu.showSearchBar;" oncommand="toggleShowSearchBar()"/>
+				<menuitem id="chkShowTooltip" type="checkbox" persist="checked" label="&menu.showDescTooltip;"/>
+				<menuitem id="chkShowFeedItemList" type="checkbox" persist="checked" label="&menu.showFeedItemList;" oncommand="toggleShowFeedItemList()"/>
+				<menuitem id="chkShowFeedItemListToolbar" type="checkbox" persist="checked" label="&menu.showFeedItemListToolbar;" oncommand="toggleShowFeedItemListToolbar()"/>
 				<menuseparator/>
 				<menuitem label="&menu.manageRSSList;" oncommand="manageRSSList()"/>
 				<menuitem label="&menu.opmlImportExport;" oncommand="openOPMLWizard()"/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/sage-extension.git