--- a/mozilla-kde.patch	Fri Aug 27 09:15:06 2010 +0200
+++ b/mozilla-kde.patch	Wed Sep 01 10:56:36 2010 +0200
@@ -96,7 +96,7 @@
 diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/src/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/src/nsDownloadManager.cpp
-@@ -76,16 +76,20 @@
+@@ -71,16 +71,20 @@
  
  #if defined(XP_WIN) && !defined(WINCE)
  #include <shlobj.h>
@@ -117,7 +117,7 @@
  #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png"
  #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete"
  #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval"
-@@ -2193,16 +2197,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2188,16 +2192,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -143,7 +143,7 @@
          PRInt64 goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2228,16 +2241,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2223,16 +2236,17 @@ nsDownload::SetState(DownloadState aStat
                // because if it is, they'll click open the download manager and
                // the items they downloaded will have been removed.
                alerts->ShowAlertNotification(
@@ -155,12 +155,12 @@
 +        } // end non-KDE block
        }
  
+ #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX)
        nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
-       if (fileURL) {
-         nsCOMPtr<nsIFile> file;
-         if (NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && file ) {
+       nsCOMPtr<nsIFile> file;
+       nsAutoString path;
  
- #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX)
+       if (fileURL &&
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
@@ -2532,14 +2532,14 @@
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -85,18 +85,19 @@ CMMSRCS	= nsOSHelperAppService.mm \
- 			$(NULL)
- else
- OSHELPER	= nsOSHelperAppService.cpp
+@@ -94,18 +94,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas
+             -I$(topsrcdir)/dom/ipc \
+             -I$(topsrcdir)/content/base/src \
+             -I$(topsrcdir)/content/events/src \
+             -I$(topsrcdir)/netwerk/base/src \
+             -I$(topsrcdir)/netwerk/protocol/http
  endif
  
- LOCAL_INCLUDES = -I$(srcdir)
- 
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 -OSHELPER	+= nsGNOMERegistry.cpp
 +OSHELPER	+= nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp
@@ -3104,7 +3104,7 @@
 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
 --- a/widget/src/gtk2/Makefile.in
 +++ b/widget/src/gtk2/Makefile.in
-@@ -156,8 +156,11 @@ endif
+@@ -155,11 +155,14 @@ endif
  
  DEFINES		+= -DCAIRO_GFX
  
@@ -3116,6 +3116,9 @@
 +
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 +
+ ifdef MOZ_X11
+ INCLUDES   	+= -I$(srcdir)/../shared/x11
+ endif
 diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
 --- a/widget/src/gtk2/nsFilePicker.cpp
 +++ b/widget/src/gtk2/nsFilePicker.cpp