--- a/mozilla-kde.patch	Sun Mar 01 14:13:25 2015 +0100
+++ b/mozilla-kde.patch	Sun Mar 01 19:07:16 2015 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  aba9432d1fd32a118ba24e92c6b6e99ddb0b9bdc
+# Parent  2b183c17f6e4693372442af1a8ee0be364f8cba0
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -46,7 +46,7 @@
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1172,16 +1173,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1165,16 +1166,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -81,7 +81,7 @@
      return NS_OK;
  
    bool hasMore;
-@@ -1197,17 +1216,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1190,17 +1209,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -100,7 +100,7 @@
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1301,26 +1320,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1294,26 +1313,38 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -223,9 +223,9 @@
  
  #ifdef MOZ_WIDGET_ANDROID
  #include "AndroidBridge.h"
- using namespace mozilla::widget::android;
  #endif
-@@ -2717,16 +2721,25 @@ nsDownload::SetState(DownloadState aStat
+ 
+@@ -2716,16 +2720,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -251,12 +251,12 @@
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2757,16 +2770,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2756,16 +2769,17 @@ nsDownload::SetState(DownloadState aStat
                    NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
                    message, !removeWhenDone,
                    mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
                    mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
-                   EmptyString(), EmptyString(), nullptr);
+                   EmptyString(), EmptyString(), nullptr, mPrivate);
              }
          }
        }
@@ -3137,13 +3137,13 @@
 diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 --- a/widget/gtk/nsFilePicker.cpp
 +++ b/widget/gtk/nsFilePicker.cpp
-@@ -1,32 +1,34 @@
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- /* This Source Code Form is subject to the terms of the Mozilla Public
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
+@@ -4,32 +4,34 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
  #include "mozilla/Types.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
  
  #include <gtk/gtk.h>
 +#include <gdk/gdkx.h>
@@ -3172,7 +3172,7 @@
  nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
  
  void
-@@ -224,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -238,17 +240,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3193,7 +3193,7 @@
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -363,16 +367,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3226,7 +3226,7 @@
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -551,8 +571,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
@@ -3561,7 +3561,7 @@
      mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION",
                                                             "RELEASE",
                                                             osVersion);
-     isTablet = mozilla::widget::android::GeckoAppShell::IsTablet();
+     isTablet = mozilla::widget::GeckoAppShell::IsTablet();
    }
 +  desktop = NS_LITERAL_STRING("android");
  #endif