Author: nextgens
Date: 2008-03-28 04:11:57 +0000 (Fri, 28 Mar 2008)
New Revision: 18801
Added:
trunk/apps/new_installer/res/firefox_profile/
trunk/apps/new_installer/res/firefox_profile/bookmarks.html
trunk/apps/new_installer/res/firefox_profile/chrome/
trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css
trunk/apps/new_installer/res/firefox_profile/extensions.rdf
trunk/apps/new_installer/res/firefox_profile/extensions/
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome/
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome/tmp.xpi
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/icon.png
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/preview.png
trunk/apps/new_installer/res/firefox_profile/localstore.rdf
trunk/apps/new_installer/res/firefox_profile/user.js
Removed:
trunk/apps/new_installer/res/firefox_profile/bookmarks.html
trunk/apps/new_installer/res/firefox_profile/chrome/
trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css
trunk/apps/new_installer/res/firefox_profile/extensions.rdf
trunk/apps/new_installer/res/firefox_profile/extensions/
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome/
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome/tmp.xpi
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/icon.png
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/preview.png
trunk/apps/new_installer/res/firefox_profile/localstore.rdf
trunk/apps/new_installer/res/firefox_profile/user.js
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/browse.sh
Log:
new_installer: revert to r18797
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-03-27 23:44:15 UTC (rev
18800)
+++ trunk/apps/new_installer/install.xml 2008-03-28 04:11:57 UTC (rev
18801)
@@ -116,6 +116,7 @@
<exclude name="*/**/.svn"/>
<exclude name="*/**/.svn/**"/>
<include name="bin/**/*"/>
+ <include name="firefox_profile/**/*"/>
<include name="wrapper.conf"/>
<include name="welcome.html"/>
<include name="welcome.*.html"/>
Copied: trunk/apps/new_installer/res/firefox_profile (from rev 18797,
trunk/apps/new_installer/res/firefox_profile)
Deleted: trunk/apps/new_installer/res/firefox_profile/bookmarks.html
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/bookmarks.html 2008-03-27
18:37:02 UTC (rev 18797)
+++ trunk/apps/new_installer/res/firefox_profile/bookmarks.html 2008-03-28
04:11:57 UTC (rev 18801)
@@ -1,14 +0,0 @@
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
-<!-- This is an automatically generated file.
- It will be read and overwritten.
- DO NOT EDIT! -->
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<TITLE>Bookmarks</TITLE>
-<H1 LAST_MODIFIED="1204895738">Bookmarks</H1>
-
-<DL><p>
- <DT><H3 LAST_MODIFIED="1204895738" PERSONAL_TOOLBAR_FOLDER="true"
ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
-<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
- <DL><p>
- </DL><p>
-</DL><p>
Copied: trunk/apps/new_installer/res/firefox_profile/bookmarks.html (from rev
18797, trunk/apps/new_installer/res/firefox_profile/bookmarks.html)
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/bookmarks.html
(rev 0)
+++ trunk/apps/new_installer/res/firefox_profile/bookmarks.html 2008-03-28
04:11:57 UTC (rev 18801)
@@ -0,0 +1,14 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<!-- This is an automatically generated file.
+ It will be read and overwritten.
+ DO NOT EDIT! -->
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1 LAST_MODIFIED="1204895738">Bookmarks</H1>
+
+<DL><p>
+ <DT><H3 LAST_MODIFIED="1204895738" PERSONAL_TOOLBAR_FOLDER="true"
ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
+<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+ <DL><p>
+ </DL><p>
+</DL><p>
Copied: trunk/apps/new_installer/res/firefox_profile/chrome (from rev 18797,
trunk/apps/new_installer/res/firefox_profile/chrome)
Deleted: trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css
2008-03-27 18:37:02 UTC (rev 18797)
+++ trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css
2008-03-28 04:11:57 UTC (rev 18801)
@@ -1,2 +0,0 @@
- at namespace
url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";);
-#helpMenu, #file-menu menuitem[label="Work Offline"], #edit-menu
menuitem[label="Preferences"], #navigator-toolbox menu[label="Tools"],
#view-menu menuitem[label="Status Bar"], #view-menu menu[label="Sidebar"],
#view-menu menu[label="Toolbars"], #bookmarks-menu { display: none !important; }
Copied: trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css
(from rev 18797,
trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css)
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css
(rev 0)
+++ trunk/apps/new_installer/res/firefox_profile/chrome/userChrome.css
2008-03-28 04:11:57 UTC (rev 18801)
@@ -0,0 +1,2 @@
+ at namespace
url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";);
+#helpMenu, #file-menu menuitem[label="Work Offline"], #edit-menu
menuitem[label="Preferences"], #navigator-toolbox menu[label="Tools"],
#view-menu menuitem[label="Status Bar"], #view-menu menu[label="Sidebar"],
#view-menu menu[label="Toolbars"], #bookmarks-menu { display: none !important; }
Copied: trunk/apps/new_installer/res/firefox_profile/extensions (from rev
18797, trunk/apps/new_installer/res/firefox_profile/extensions)
Copied:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}
(from rev 18797,
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a})
Copied:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome
(from rev 18797,
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome)
Deleted:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome/tmp.xpi
===================================================================
(Binary files differ)
Copied:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome/tmp.xpi
(from rev 18797,
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome/tmp.xpi)
===================================================================
(Binary files differ)
Deleted:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest
===================================================================
---
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest
2008-03-27 18:37:02 UTC (rev 18797)
+++
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest
2008-03-28 04:11:57 UTC (rev 18801)
@@ -1,5 +0,0 @@
-skin browser BlackJapanMAX jar:chrome/tmp.xpi!/browser/
-skin communicator BlackJapanMAX jar:chrome/tmp.xpi!/communicator/
-skin help BlackJapanMAX jar:chrome/tmp.xpi!/help/
-skin global BlackJapanMAX jar:chrome/tmp.xpi!/global/
-skin mozapps BlackJapanMAX jar:chrome/tmp.xpi!/mozapps/
Copied:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest
(from rev 18797,
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest)
===================================================================
---
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest
(rev 0)
+++
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/chrome.manifest
2008-03-28 04:11:57 UTC (rev 18801)
@@ -0,0 +1,5 @@
+skin browser BlackJapanMAX jar:chrome/tmp.xpi!/browser/
+skin communicator BlackJapanMAX jar:chrome/tmp.xpi!/communicator/
+skin help BlackJapanMAX jar:chrome/tmp.xpi!/help/
+skin global BlackJapanMAX jar:chrome/tmp.xpi!/global/
+skin mozapps BlackJapanMAX jar:chrome/tmp.xpi!/mozapps/
Deleted:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/icon.png
===================================================================
(Binary files differ)
Copied:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/icon.png
(from rev 18797,
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/icon.png)
===================================================================
(Binary files differ)
Deleted:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf
===================================================================
---
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf
2008-03-27 18:37:02 UTC (rev 18797)
+++
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf
2008-03-28 04:11:57 UTC (rev 18801)
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:em="http://www.mozilla.org/2004/em-rdf#";>
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>{8e12f188-352c-4476-8198-e9b8f4a4353a}</em:id>
- <em:version>5.69</em:version>
-
- <!-- Target Application this extension can install into,
- with minimum and maximum supported versions. -->
- <em:targetApplication>
- <Description>
- <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
- <em:minVersion>1.5</em:minVersion>
- <em:maxVersion>3.0a1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>BlackJapanMAX</em:name>
- <em:description>A simple, clean and streamlined theme.</em:description>
- <em:creator>Jay Row</em:creator>
- <em:contributor>Elric Erekose</em:contributor>
- <em:homepageURL>http://thecrayolakidd.deviantart.com/</em:homepageURL>
-
- <!-- Front End Integration Hooks (used by Theme Manager)-->
- <em:internalName>BlackJapanMAX</em:internalName>
-
- </Description>
-
-</RDF>
\ No newline at end of file
Copied:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf
(from rev 18797,
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf)
===================================================================
---
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf
(rev 0)
+++
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/install.rdf
2008-03-28 04:11:57 UTC (rev 18801)
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:em="http://www.mozilla.org/2004/em-rdf#";>
+
+ <Description about="urn:mozilla:install-manifest">
+ <em:id>{8e12f188-352c-4476-8198-e9b8f4a4353a}</em:id>
+ <em:version>5.69</em:version>
+
+ <!-- Target Application this extension can install into,
+ with minimum and maximum supported versions. -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+ <em:minVersion>1.5</em:minVersion>
+ <em:maxVersion>3.0a1</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+
+ <!-- Front End MetaData -->
+ <em:name>BlackJapanMAX</em:name>
+ <em:description>A simple, clean and streamlined theme.</em:description>
+ <em:creator>Jay Row</em:creator>
+ <em:contributor>Elric Erekose</em:contributor>
+ <em:homepageURL>http://thecrayolakidd.deviantart.com/</em:homepageURL>
+
+ <!-- Front End Integration Hooks (used by Theme Manager)-->
+ <em:internalName>BlackJapanMAX</em:internalName>
+
+ </Description>
+
+</RDF>
\ No newline at end of file
Deleted:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/preview.png
===================================================================
(Binary files differ)
Copied:
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/preview.png
(from rev 18797,
trunk/apps/new_installer/res/firefox_profile/extensions/{8e12f188-352c-4476-8198-e9b8f4a4353a}/preview.png)
===================================================================
(Binary files differ)
Deleted: trunk/apps/new_installer/res/firefox_profile/extensions.rdf
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/extensions.rdf 2008-03-27
18:37:02 UTC (rev 18797)
+++ trunk/apps/new_installer/res/firefox_profile/extensions.rdf 2008-03-28
04:11:57 UTC (rev 18801)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!-- see http://forum.skype.com/index.php?showtopic=81027 :(( -->
-<RDF:RDF xmlns:NS1="http://www.mozilla.org/2004/em-rdf#";
- xmlns:NC="http://home.netscape.com/NC-rdf#";
- xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
- <RDF:Description
RDF:about="urn:mozilla:item:{B13721C7-F507-4982-B2E5-502A71474FED}"
- NS1:installLocation="app-global"
- NS1:version="2.2.0.70"
- NS1:name="Skype extension for Firefox"
- NS1:description="Skype extension for Firefox"
- NS1:creator="Skype Limited"
- NS1:homepageURL="http://www.skype.com";
-
NS1:aboutURL="chrome://skype_ff_toolbar_win/content/about.xul"
-
NS1:iconURL="chrome://skype_ff_toolbar_win/content/skypeblue.png"
- NS1:userDisabled="needs-disable">
- <NS1:type NC:parseType="Integer">2</NS1:type>
- <NS1:targetApplication RDF:resource="rdf:#$BSYj91"/>
- </RDF:Description>
-</RDF:RDF>
Copied: trunk/apps/new_installer/res/firefox_profile/extensions.rdf (from rev
18797, trunk/apps/new_installer/res/firefox_profile/extensions.rdf)
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/extensions.rdf
(rev 0)
+++ trunk/apps/new_installer/res/firefox_profile/extensions.rdf 2008-03-28
04:11:57 UTC (rev 18801)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!-- see http://forum.skype.com/index.php?showtopic=81027 :(( -->
+<RDF:RDF xmlns:NS1="http://www.mozilla.org/2004/em-rdf#";
+ xmlns:NC="http://home.netscape.com/NC-rdf#";
+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+ <RDF:Description
RDF:about="urn:mozilla:item:{B13721C7-F507-4982-B2E5-502A71474FED}"
+ NS1:installLocation="app-global"
+ NS1:version="2.2.0.70"
+ NS1:name="Skype extension for Firefox"
+ NS1:description="Skype extension for Firefox"
+ NS1:creator="Skype Limited"
+ NS1:homepageURL="http://www.skype.com";
+
NS1:aboutURL="chrome://skype_ff_toolbar_win/content/about.xul"
+
NS1:iconURL="chrome://skype_ff_toolbar_win/content/skypeblue.png"
+ NS1:userDisabled="needs-disable">
+ <NS1:type NC:parseType="Integer">2</NS1:type>
+ <NS1:targetApplication RDF:resource="rdf:#$BSYj91"/>
+ </RDF:Description>
+</RDF:RDF>
Deleted: trunk/apps/new_installer/res/firefox_profile/localstore.rdf
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/localstore.rdf 2008-03-27
18:37:02 UTC (rev 18797)
+++ trunk/apps/new_installer/res/firefox_profile/localstore.rdf 2008-03-28
04:11:57 UTC (rev 18801)
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#";
- xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#main-window"
- width="994"
- height="728"
- screenX="28"
- screenY="13"
- sizemode="normal" />
- <RDF:Description
RDF:about="chrome://browser/content/browser.xul#navigator-toolbox"
- iconsize="large"
- mode="icons" />
- <RDF:Description RDF:about="chrome://global/content/customizeToolbar.xul">
- <NC:persist
RDF:resource="chrome://global/content/customizeToolbar.xul#CustomizeToolbarWindow"/>
- </RDF:Description>
- <RDF:Description
RDF:about="chrome://global/content/customizeToolbar.xul#CustomizeToolbarWindow"
- width="636"
- height="400" />
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#nav-bar"
- iconsize="large"
- mode="icons"
-
currentset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container"
/>
- <RDF:Description RDF:about="chrome://browser/content/browser.xul">
- <NC:persist
RDF:resource="chrome://browser/content/browser.xul#main-window"/>
- <NC:persist
RDF:resource="chrome://browser/content/browser.xul#sidebar-box"/>
- <NC:persist
RDF:resource="chrome://browser/content/browser.xul#sidebar-title"/>
- <NC:persist
RDF:resource="chrome://browser/content/browser.xul#navigator-toolbox"/>
- <NC:persist
RDF:resource="chrome://browser/content/browser.xul#toolbar-menubar"/>
- <NC:persist RDF:resource="chrome://browser/content/browser.xul#nav-bar"/>
- <NC:persist
RDF:resource="chrome://browser/content/browser.xul#PersonalToolbar"/>
- </RDF:Description>
- <RDF:Description
RDF:about="chrome://browser/content/browser.xul#toolbar-menubar"
- iconsize="large"
- mode="icons"
- currentset="menubar-items,spring,throbber-box" />
- <RDF:Description
RDF:about="chrome://browser/content/browser.xul#sidebar-title"
- value="" />
- <RDF:Description
RDF:about="chrome://browser/content/browser.xul#PersonalToolbar"
- iconsize="large"
- mode="icons"
- currentset="__empty"
- collapsed="true" />
-</RDF:RDF>
Copied: trunk/apps/new_installer/res/firefox_profile/localstore.rdf (from rev
18797, trunk/apps/new_installer/res/firefox_profile/localstore.rdf)
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/localstore.rdf
(rev 0)
+++ trunk/apps/new_installer/res/firefox_profile/localstore.rdf 2008-03-28
04:11:57 UTC (rev 18801)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#";
+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+ <RDF:Description RDF:about="chrome://browser/content/browser.xul#main-window"
+ width="994"
+ height="728"
+ screenX="28"
+ screenY="13"
+ sizemode="normal" />
+ <RDF:Description
RDF:about="chrome://browser/content/browser.xul#navigator-toolbox"
+ iconsize="large"
+ mode="icons" />
+ <RDF:Description RDF:about="chrome://global/content/customizeToolbar.xul">
+ <NC:persist
RDF:resource="chrome://global/content/customizeToolbar.xul#CustomizeToolbarWindow"/>
+ </RDF:Description>
+ <RDF:Description
RDF:about="chrome://global/content/customizeToolbar.xul#CustomizeToolbarWindow"
+ width="636"
+ height="400" />
+ <RDF:Description RDF:about="chrome://browser/content/browser.xul#nav-bar"
+ iconsize="large"
+ mode="icons"
+
currentset="back-button,forward-button,reload-button,stop-button,home-button,urlbar-container"
/>
+ <RDF:Description RDF:about="chrome://browser/content/browser.xul">
+ <NC:persist
RDF:resource="chrome://browser/content/browser.xul#main-window"/>
+ <NC:persist
RDF:resource="chrome://browser/content/browser.xul#sidebar-box"/>
+ <NC:persist
RDF:resource="chrome://browser/content/browser.xul#sidebar-title"/>
+ <NC:persist
RDF:resource="chrome://browser/content/browser.xul#navigator-toolbox"/>
+ <NC:persist
RDF:resource="chrome://browser/content/browser.xul#toolbar-menubar"/>
+ <NC:persist RDF:resource="chrome://browser/content/browser.xul#nav-bar"/>
+ <NC:persist
RDF:resource="chrome://browser/content/browser.xul#PersonalToolbar"/>
+ </RDF:Description>
+ <RDF:Description
RDF:about="chrome://browser/content/browser.xul#toolbar-menubar"
+ iconsize="large"
+ mode="icons"
+ currentset="menubar-items,spring,throbber-box" />
+ <RDF:Description
RDF:about="chrome://browser/content/browser.xul#sidebar-title"
+ value="" />
+ <RDF:Description
RDF:about="chrome://browser/content/browser.xul#PersonalToolbar"
+ iconsize="large"
+ mode="icons"
+ currentset="__empty"
+ collapsed="true" />
+</RDF:RDF>
Deleted: trunk/apps/new_installer/res/firefox_profile/user.js
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/user.js 2008-03-27
18:37:02 UTC (rev 18797)
+++ trunk/apps/new_installer/res/firefox_profile/user.js 2008-03-28
04:11:57 UTC (rev 18801)
@@ -1,39 +0,0 @@
-user_pref("browser.startup.homepage", "http://127.0.0.1:8888";);
-user_pref("app.update.enabled", false);
-user_pref("extensions.update.notifyUser", false);
-user_pref("javascript.enabled", false);
-user_pref("security.enable_java", false);
-// See 1124: Possible hint on how to not get USK's googled when miss-pasted
-user_pref("keyword.enabled", false);
-user_pref("browser.search.suggest.enabled", false);
-user_pref("browser.search.update", false);
-// Obvious performance tweaks
-user_pref("network.http.max-connections", 200);
-user_pref("network.http.max-connections-per-server", 200);
-user_pref("network.http.max-persistent-connections-per-server", 200);
-user_pref("network.http.max-persistent-connections-per-proxy", 200);
-// Pipelining
-user_pref("network.http.pipelining", false);
-user_pref("network.http.proxy.pipelining", false);
-// Cookies
-user_pref("network.cookie.blockFutureCookies", true);
-user_pref("network.cookie.cookieBehavior", 1);
-user_pref("network.cookie.lifetimePolicy", 2);
-user_pref("network.cookie.alwaysAcceptSessionCookies", false);
-user_pref("network.cookie.enableForCurrentSessionOnly", false);
-// Disable safebrowsing
-user_pref("browser.safebrowsing.enabled", false);
-// See 1941: Firefox GoBrowsing
-user_pref("browser.safebrowsing.remoteLookups", false);
-// We don't want to import anything
-user_pref("network.cookie.prefsMigrated", true);
-// We don't want the popup when we click submit
-user_pref("security.warn_entering_secure", false);
-user_pref("security.warn_submit_insecure", false);
-// Select the skin
-user_pref("general.skins.selectedSkin", "BlackJapanMAX");
-// Chose the default charset
-user_pref("intl.charsetmenu.browser.cache", "UTF-8");
-// Prevent plugin installation from that profile
-user_pref("xpinstall.enabled", false);
-user_pref("xpinstall.whitelist.add", "");
Copied: trunk/apps/new_installer/res/firefox_profile/user.js (from rev 18797,
trunk/apps/new_installer/res/firefox_profile/user.js)
===================================================================
--- trunk/apps/new_installer/res/firefox_profile/user.js
(rev 0)
+++ trunk/apps/new_installer/res/firefox_profile/user.js 2008-03-28
04:11:57 UTC (rev 18801)
@@ -0,0 +1,39 @@
+user_pref("browser.startup.homepage", "http://127.0.0.1:8888";);
+user_pref("app.update.enabled", false);
+user_pref("extensions.update.notifyUser", false);
+user_pref("javascript.enabled", false);
+user_pref("security.enable_java", false);
+// See 1124: Possible hint on how to not get USK's googled when miss-pasted
+user_pref("keyword.enabled", false);
+user_pref("browser.search.suggest.enabled", false);
+user_pref("browser.search.update", false);
+// Obvious performance tweaks
+user_pref("network.http.max-connections", 200);
+user_pref("network.http.max-connections-per-server", 200);
+user_pref("network.http.max-persistent-connections-per-server", 200);
+user_pref("network.http.max-persistent-connections-per-proxy", 200);
+// Pipelining
+user_pref("network.http.pipelining", false);
+user_pref("network.http.proxy.pipelining", false);
+// Cookies
+user_pref("network.cookie.blockFutureCookies", true);
+user_pref("network.cookie.cookieBehavior", 1);
+user_pref("network.cookie.lifetimePolicy", 2);
+user_pref("network.cookie.alwaysAcceptSessionCookies", false);
+user_pref("network.cookie.enableForCurrentSessionOnly", false);
+// Disable safebrowsing
+user_pref("browser.safebrowsing.enabled", false);
+// See 1941: Firefox GoBrowsing
+user_pref("browser.safebrowsing.remoteLookups", false);
+// We don't want to import anything
+user_pref("network.cookie.prefsMigrated", true);
+// We don't want the popup when we click submit
+user_pref("security.warn_entering_secure", false);
+user_pref("security.warn_submit_insecure", false);
+// Select the skin
+user_pref("general.skins.selectedSkin", "BlackJapanMAX");
+// Chose the default charset
+user_pref("intl.charsetmenu.browser.cache", "UTF-8");
+// Prevent plugin installation from that profile
+user_pref("xpinstall.enabled", false);
+user_pref("xpinstall.whitelist.add", "");
Modified: trunk/apps/new_installer/res/unix/bin/browse.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/browse.sh 2008-03-27 23:44:15 UTC
(rev 18800)
+++ trunk/apps/new_installer/res/unix/bin/browse.sh 2008-03-28 04:11:57 UTC
(rev 18801)
@@ -1,6 +1,7 @@
#!/bin/sh
cd "$INSTALL_PATH"
+POSSIBLE_NAMES="firefox mozilla mozilla-firefox iceweasel"
if test $# -lt 1
then
@@ -9,4 +10,28 @@
URL="$1"
fi
-java -Djava.net.preferIPv4Stack=true -cp bin/browser.jar
BareBonesBrowserLaunch "$URL" &
+browseURL()
+{
+ `cat firefox.location` -no-remote -P freenet "$1" &
+}
+
+if test -e firefox.location
+then
+ browseURL "$URL"
+else
+ echo Detecting the location of Firefox
+ for name in $POSSIBLE_NAMES
+ do
+ TRY="`which $name`"
+ if test -n "$TRY"
+ then
+ echo $TRY > firefox.location
+ echo Firefox found, creating a profile for freenet
+ $TRY -no-remote -CreateProfile "freenet
$PWD/firefox_profile" >/dev/null
+ browseURL "$URL"
+ exit
+ fi
+ done
+ echo The installer was unable to locate Mozilla Firefox on your computer
+ java -Djava.net.preferIPv4Stack=true -cp bin/browser.jar
BareBonesBrowserLaunch "$URL" &
+fi
