firefox-kde.patch
branchfirefox15
changeset 526 928a71b2c74e
parent 491 43deb5e6462d
--- a/firefox-kde.patch	Fri Aug 10 18:50:15 2012 +0200
+++ b/firefox-kde.patch	Wed Aug 15 16:39:36 2012 +0200
@@ -1214,7 +1214,7 @@
 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 --- a/browser/components/preferences/advanced.js
 +++ b/browser/components/preferences/advanced.js
-@@ -22,16 +22,22 @@ var gAdvancedPane = {
+@@ -23,16 +23,22 @@ var gAdvancedPane = {
      if (extraArgs && extraArgs["advancedTab"]){
        advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
      } else {
@@ -1237,14 +1237,14 @@
  #endif
      this.updateOfflineApps();
  #ifdef MOZ_CRASHREPORTER
-@@ -705,12 +711,23 @@ var gAdvancedPane = {
-   /**
+@@ -715,12 +721,23 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
    {
-     var shellSvc = Components.classes["@mozilla.org/browser/shell-service;1"]
-                              .getService(Components.interfaces.nsIShellService);
+     let shellSvc = getShellService();
+     if (!shellSvc)
+       return;
      shellSvc.setDefaultBrowser(true, false);
 +    if (kde_session == 1) {
 +      var shellObj = Components.classes["@mozilla.org/file/local;1"]
@@ -1727,7 +1727,7 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -522,18 +522,20 @@
+@@ -520,18 +520,20 @@
  @BINPATH@/@PREF_DIR@/services-aitc.js
  #endif
  @BINPATH@/greprefs.js