# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1345041576 -7200
# Node ID 928a71b2c74e84fdd5fc65fd6d73bd1ec0e7ac2a
# Parent  bdcf9b63ba33c4c123611666565679a638f7e9ee
15.0b4

diff -r bdcf9b63ba33 -r 928a71b2c74e MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Fri Aug 10 18:50:15 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed Aug 15 16:39:36 2012 +0200
@@ -1,10 +1,11 @@
 -------------------------------------------------------------------
-Sun Aug  5 10:43:55 UTC 2012 - wr@rosenauer.org
-
-- update to Firefox 15.0b3
+Fri Aug 10 17:13:28 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 15.0b4
 - fix HTML5 video crash with GStreamer enabled (bmo#761030)
 - GStreamer is only used for MP4 (no WebM, OGG)
 - updated filelist
+- moved browser specific preferences to correct location
 
 -------------------------------------------------------------------
 Sun Jul 29 08:34:39 UTC 2012 - aj@suse.de
diff -r bdcf9b63ba33 -r 928a71b2c74e MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Aug 10 18:50:15 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Aug 15 16:39:36 2012 +0200
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012073100
+%define         releasedate 2012080900
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
diff -r bdcf9b63ba33 -r 928a71b2c74e MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Fri Aug 10 18:50:15 2012 +0200
+++ b/MozillaFirefox/create-tar.sh	Wed Aug 15 16:39:36 2012 +0200
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_15_0b3_RELEASE"
+RELEASE_TAG="FIREFOX_15_0b4_RELEASE"
 VERSION="14.99"
 
 # mozilla
diff -r bdcf9b63ba33 -r 928a71b2c74e firefox-kde.patch
--- 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