rpms/firefox/F-8 firefox-2.0-getstartpage.patch, NONE, 1.1 firefox.spec, 1.210, 1.211
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Thu Dec 13 14:39:08 UTC 2007
Author: caillon
Update of /cvs/extras/rpms/firefox/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23022
Modified Files:
firefox.spec
Added Files:
firefox-2.0-getstartpage.patch
Log Message:
* Thu Dec 13 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.10-3
- Fix the getStartPage method to not return blank.
Patch by pspencer at fields.utoronto.ca
firefox-2.0-getstartpage.patch:
--- NEW FILE firefox-2.0-getstartpage.patch ---
Index: mozilla/browser/components/nsBrowserContentHandler.js
===================================================================
RCS file: /cvsroot/mozilla/browser/components/nsBrowserContentHandler.js,v
retrieving revision 1.12.2.23
diff -d -u -p -r1.12.2.23 nsBrowserContentHandler.js
--- mozilla/browser/components/nsBrowserContentHandler.js 14 Sep 2007 19:59:42 -0000 1.12.2.23
+++ mozilla/browser/components/nsBrowserContentHandler.js 13 Dec 2007 13:20:44 -0000
@@ -542,18 +542,14 @@ var nsBrowserContentHandler = {
},
get startPage() {
+ var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
+ .getService(Components.interfaces.nsIURLFormatter);
+
var prefb = Components.classes["@mozilla.org/preferences-service;1"]
.getService(nsIPrefBranch);
- var uri = prefb.getComplexValue("browser.startup.homepage",
- nsIPrefLocalizedString).data;
+ var uri = formatter.formatURLPref("browser.startup.homepage");
- if (!uri) {
- prefb.clearUserPref("browser.startup.homepage");
- uri = prefb.getComplexValue("browser.startup.homepage",
- nsIPrefLocalizedString).data;
- }
-
var count;
try {
count = prefb.getIntPref("browser.startup.homepage.count");
@@ -564,8 +560,7 @@ var nsBrowserContentHandler = {
for (var i = 1; i < count; ++i) {
try {
- var page = prefb.getComplexValue("browser.startup.homepage." + i,
- nsIPrefLocalizedString).data;
+ var page = formatter.formatURLPref("browser.startup.homepage." + i);
uri += "\n" + page;
}
catch (e) {
Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-8/firefox.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- firefox.spec 28 Nov 2007 15:08:18 -0000 1.210
+++ firefox.spec 13 Dec 2007 14:38:32 -0000 1.211
@@ -12,7 +12,7 @@
Summary: Mozilla Firefox Web browser.
Name: firefox
Version: 2.0.0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -47,6 +47,7 @@
Patch40: firefox-1.5-bullet-bill.patch
Patch41: firefox-2.0.0.4-undo-uriloader.patch
Patch42: firefox-1.1-uriloader.patch
+Patch43: firefox-2.0-getstartpage.patch
# font system fixes
Patch81: firefox-1.5-nopangoxft.patch
@@ -153,6 +154,7 @@
%patch40 -p1 -b .bullet-bill
%patch41 -p1 -b .undo-uriloader
%patch42 -p0 -b .uriloader
+%patch43 -p1 -b .getstartpage
#%patch81 -p1 -b .nopangoxft
#%patch82 -p1 -b .pango-mathml
%patch83 -p1 -b .pango-cursor-position
@@ -441,6 +443,10 @@
#---------------------------------------------------------------------
%changelog
+* Thu Dec 13 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.10-3
+- Fix the getStartPage method to not return blank.
+ Patch by pspencer at fields.utoronto.ca
+
* Wed Nov 28 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.10-2
- Make Canvas.drawImage work again
More information about the fedora-extras-commits
mailing list