From 4071072ba004ddf271c5931ba59511b825d07d69 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 25 Jan 2011 15:28:58 -0800 Subject: Firefox 4.0 Beta 10 And update firefox-default.patch to continue applying to the new tree --- firefox-default.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'firefox-default.patch') diff --git a/firefox-default.patch b/firefox-default.patch index a6c61f1..6a1d83b 100644 --- a/firefox-default.patch +++ b/firefox-default.patch @@ -69,14 +69,14 @@ diff -up firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellSe @@ -215,8 +209,8 @@ nsGNOMEShellService::SetDefaultBrowser(P nsCOMPtr 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) { + 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 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 -- cgit