|
 |
8bebcca |
Index: mozilla/browser/components/nsBrowserContentHandler.js
|
|
|
8bebcca |
===================================================================
|
|
|
8bebcca |
RCS file: /cvsroot/mozilla/browser/components/nsBrowserContentHandler.js,v
|
|
|
8bebcca |
retrieving revision 1.12.2.23
|
|
|
8bebcca |
diff -d -u -p -r1.12.2.23 nsBrowserContentHandler.js
|
|
|
8bebcca |
--- mozilla/browser/components/nsBrowserContentHandler.js 14 Sep 2007 19:59:42 -0000 1.12.2.23
|
|
|
8bebcca |
+++ mozilla/browser/components/nsBrowserContentHandler.js 13 Dec 2007 13:20:44 -0000
|
|
|
8bebcca |
@@ -542,18 +542,14 @@ var nsBrowserContentHandler = {
|
|
|
8bebcca |
},
|
|
|
8bebcca |
|
|
|
8bebcca |
get startPage() {
|
|
|
8bebcca |
+ var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
|
|
|
8bebcca |
+ .getService(Components.interfaces.nsIURLFormatter);
|
|
|
8bebcca |
+
|
|
|
8bebcca |
var prefb = Components.classes["@mozilla.org/preferences-service;1"]
|
|
|
8bebcca |
.getService(nsIPrefBranch);
|
|
|
8bebcca |
|
|
|
8bebcca |
- var uri = prefb.getComplexValue("browser.startup.homepage",
|
|
|
8bebcca |
- nsIPrefLocalizedString).data;
|
|
|
8bebcca |
+ var uri = formatter.formatURLPref("browser.startup.homepage");
|
|
|
8bebcca |
|
|
|
8bebcca |
- if (!uri) {
|
|
|
8bebcca |
- prefb.clearUserPref("browser.startup.homepage");
|
|
|
8bebcca |
- uri = prefb.getComplexValue("browser.startup.homepage",
|
|
|
8bebcca |
- nsIPrefLocalizedString).data;
|
|
|
8bebcca |
- }
|
|
|
8bebcca |
-
|
|
|
8bebcca |
var count;
|
|
|
8bebcca |
try {
|
|
|
8bebcca |
count = prefb.getIntPref("browser.startup.homepage.count");
|
|
|
8bebcca |
@@ -564,8 +560,7 @@ var nsBrowserContentHandler = {
|
|
|
8bebcca |
|
|
|
8bebcca |
for (var i = 1; i < count; ++i) {
|
|
|
8bebcca |
try {
|
|
|
8bebcca |
- var page = prefb.getComplexValue("browser.startup.homepage." + i,
|
|
|
8bebcca |
- nsIPrefLocalizedString).data;
|
|
|
8bebcca |
+ var page = formatter.formatURLPref("browser.startup.homepage." + i);
|
|
|
8bebcca |
uri += "\n" + page;
|
|
|
8bebcca |
}
|
|
|
8bebcca |
catch (e) {
|