diff options
Diffstat (limited to 'firefox4-default.patch')
| -rw-r--r-- | firefox4-default.patch | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/firefox4-default.patch b/firefox4-default.patch index a6c61f1..d1e027f 100644 --- a/firefox4-default.patch +++ b/firefox4-default.patch @@ -1,7 +1,7 @@ -diff -up firefox-4.0/mozilla-central/browser/components/preferences/advanced.xul.default firefox-4.0/mozilla-central/browser/components/preferences/advanced.xul ---- firefox-4.0/mozilla-central/browser/components/preferences/advanced.xul.default 2010-08-06 03:08:58.000000000 +0200 -+++ firefox-4.0/mozilla-central/browser/components/preferences/advanced.xul 2010-08-30 16:35:21.000000000 +0200 -@@ -183,10 +183,11 @@ +diff -up mozilla-central/browser/components/preferences/advanced.xul.default mozilla-central/browser/components/preferences/advanced.xul +--- mozilla-central/browser/components/preferences/advanced.xul.default 2011-01-22 01:24:21.000000000 +0100 ++++ mozilla-central/browser/components/preferences/advanced.xul 2011-01-22 16:48:18.522166468 +0100 +@@ -194,10 +194,11 @@ </groupbox> #ifdef HAVE_SHELL_SERVICE @@ -14,7 +14,7 @@ diff -up firefox-4.0/mozilla-central/browser/components/preferences/advanced.xul <hbox id="checkDefaultBox" align="center" flex="1"> <checkbox id="alwaysCheckDefault" preference="browser.shell.checkDefaultBrowser" label="&alwaysCheckDefault.label;" accesskey="&alwaysCheckDefault.accesskey;" -@@ -196,6 +197,7 @@ +@@ -207,6 +208,7 @@ oncommand="gAdvancedPane.checkNow()" preference="pref.general.disable_button.default_browser"/> </hbox> @@ -22,7 +22,7 @@ diff -up firefox-4.0/mozilla-central/browser/components/preferences/advanced.xul #ifdef MOZ_CRASHREPORTER <checkbox id="submitCrashesBox" flex="1" oncommand="gAdvancedPane.updateSubmitCrashes();" -@@ -203,6 +205,7 @@ +@@ -214,6 +216,7 @@ #endif </groupbox> #endif @@ -30,9 +30,9 @@ diff -up firefox-4.0/mozilla-central/browser/components/preferences/advanced.xul </tabpanel> <!-- Network --> -diff -up firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp.default firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp ---- firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp.default 2010-08-06 03:08:59.000000000 +0200 -+++ firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp 2010-08-30 16:37:41.000000000 +0200 +diff -up mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp.default mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp +--- mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp.default 2011-01-22 01:24:22.000000000 +0100 ++++ mozilla-central/browser/components/shell/src/nsGNOMEShellService.cpp 2011-01-22 16:51:39.616884957 +0100 @@ -140,27 +140,21 @@ NS_IMPL_ISUPPORTS1(nsGNOMEShellService, PRBool nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const @@ -69,17 +69,17 @@ diff -up firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellSe @@ -215,8 +209,8 @@ nsGNOMEShellService::SetDefaultBrowser(P nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); - -- nsCAutoString appKeyValue(mAppPath); -- appKeyValue.Append(" \"%s\""); -+ nsCAutoString appKeyValue(MOZ_APP_NAME); -+ appKeyValue.Append(" %s"); - unsigned int i; - - for (i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) { -diff -up firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.h.default firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.h ---- firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.h.default 2010-08-06 03:08:59.000000000 +0200 -+++ firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.h 2010-08-30 16:35:22.000000000 +0200 + if (gconf) { +- nsCAutoString appKeyValue(mAppPath); +- appKeyValue.Append(" \"%s\""); ++ nsCAutoString appKeyValue(MOZ_APP_NAME); ++ appKeyValue.Append(" %s"); + for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) { + if (appProtocols[i].essential || aClaimAllTypes) { + gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name), +diff -up mozilla-central/browser/components/shell/src/nsGNOMEShellService.h.default mozilla-central/browser/components/shell/src/nsGNOMEShellService.h +--- mozilla-central/browser/components/shell/src/nsGNOMEShellService.h.default 2011-01-22 01:24:22.000000000 +0100 ++++ mozilla-central/browser/components/shell/src/nsGNOMEShellService.h 2011-01-22 16:48:18.523166485 +0100 @@ -43,7 +43,7 @@ class nsGNOMEShellService : public nsIShellService { |