Update to 4.0 Beta 4

1 files changed, 14 insertions, 14 deletions

diff --git a/firefox-default.patch b/firefox-default.patch
index 7619fce..a6c61f1 100644
--- a/firefox-default.patch
+++ b/firefox-default.patch
@@ -1,7 +1,7 @@
-diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul.default firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul
---- firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul.default	2010-06-11 22:40:51.000000000 +0200
-+++ firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul	2010-06-24 11:42:36.000000000 +0200
-@@ -185,10 +185,11 @@
+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 @@
            </groupbox>
  
  #ifdef HAVE_SHELL_SERVICE
@@ -14,7 +14,7 @@ diff -up firefox-3.6.4/mozilla-1.9.2/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;"
-@@ -198,6 +199,7 @@
+@@ -196,6 +197,7 @@
                        oncommand="gAdvancedPane.checkNow()"
                        preference="pref.general.disable_button.default_browser"/>
              </hbox>
@@ -22,7 +22,7 @@ diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul
  #ifdef MOZ_CRASHREPORTER
              <checkbox id="submitCrashesBox" flex="1"
                        oncommand="gAdvancedPane.updateSubmitCrashes();"
-@@ -205,6 +207,7 @@
+@@ -203,6 +205,7 @@
  #endif
            </groupbox>
  #endif
@@ -30,9 +30,9 @@ diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/preferences/advanced.xul
          </tabpanel>
  
          <!-- Network -->
-diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp.default firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp
---- firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp.default	2010-06-11 22:40:51.000000000 +0200
-+++ firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.cpp	2010-06-24 11:42:36.000000000 +0200
+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
 @@ -140,27 +140,21 @@ NS_IMPL_ISUPPORTS1(nsGNOMEShellService, 
  PRBool
  nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
@@ -66,10 +66,10 @@ diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellSe
  }
  
  NS_IMETHODIMP
-@@ -216,8 +210,8 @@ nsGNOMEShellService::SetDefaultBrowser(P
+@@ -215,8 +209,8 @@ nsGNOMEShellService::SetDefaultBrowser(P
+ 
    nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
  
-   nsCAutoString schemeList;
 -  nsCAutoString appKeyValue(mAppPath);
 -  appKeyValue.Append(" \"%s\"");
 +  nsCAutoString appKeyValue(MOZ_APP_NAME);
@@ -77,9 +77,9 @@ diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellSe
    unsigned int i;
  
    for (i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
-diff -up firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h.default firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h
---- firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h.default	2010-06-11 22:40:51.000000000 +0200
-+++ firefox-3.6.4/mozilla-1.9.2/browser/components/shell/src/nsGNOMEShellService.h	2010-06-24 11:42:36.000000000 +0200
+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
 @@ -43,7 +43,7 @@
  class nsGNOMEShellService : public nsIShellService
  {