diff -r 36ec036ad04d -r 9d39369e1b4c mozilla-kde.patch
--- a/mozilla-kde.patch	Fri Jan 11 15:58:38 2013 +0100
+++ b/mozilla-kde.patch	Wed Jan 16 23:09:49 2013 +0100
@@ -143,7 +143,7 @@
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
-@@ -41,9 +41,12 @@ EXTRA_COMPONENTS = \
+@@ -42,9 +42,12 @@ EXTRA_COMPONENTS = \
    nsDownloadManagerUI.manifest \
    $(NULL)
  endif
@@ -159,7 +159,7 @@
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -36,16 +36,20 @@
+@@ -41,16 +41,20 @@
  
  #ifdef XP_WIN
  #include <shlobj.h>
@@ -180,7 +180,7 @@
  #include "AndroidBridge.h"
  #endif
  
-@@ -2253,16 +2257,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2740,16 +2744,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -206,7 +206,7 @@
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2286,19 +2299,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2775,19 +2788,20 @@ nsDownload::SetState(DownloadState aStat
                // If downloads are automatically removed per the user's
                // retention policy, there's no reason to make the text clickable
                // because if it is, they'll click open the download manager and
@@ -231,7 +231,7 @@
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -46,29 +46,33 @@ toolkit.jar:
+@@ -49,29 +49,33 @@ toolkit.jar:
     content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
  *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
     content/global/bindings/browser.xml         (widgets/browser.xml)
@@ -3052,7 +3052,7 @@
 diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 --- a/widget/gtk2/nsFilePicker.cpp
 +++ b/widget/gtk2/nsFilePicker.cpp
-@@ -1,16 +1,17 @@
+@@ -1,31 +1,33 @@
  /* -*- 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
@@ -3070,14 +3070,12 @@
  #include "nsIStringBundle.h"
  
  #include "nsArrayEnumerator.h"
-@@ -19,16 +20,17 @@
+ #include "nsMemory.h"
+ #include "nsEnumeratorUtils.h"
  #include "nsNetUtil.h"
  #include "nsReadableUtils.h"
  #include "mozcontainer.h"
  
- #include "prmem.h"
- #include "prlink.h"
- 
  #include "nsFilePicker.h"
 +#include "nsKDEUtils.h"
  
@@ -3088,7 +3086,7 @@
  using namespace mozilla;
  
  #define MAX_PREVIEW_SIZE 180
-@@ -264,17 +266,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -236,17 +238,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3109,7 +3107,7 @@
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -388,16 +392,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -360,16 +364,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3137,12 +3135,12 @@
    nsXPIDLCString title;
    title.Adopt(ToNewUTF8String(mTitle));
  
-   GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
+   GtkWindow *parent_widget =
+     GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-                                ? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
-@@ -588,8 +608,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -561,8 +581,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;