actualized firefox-kde and mozilla-kde patches

firefox-kde.patch

@@ -1,7 +1,5 @@
-diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
-new file mode 100644
---- /dev/null
-+++ b/browser/base/content/browser-kde.xul
+--- mozilla-release/browser/base/content/browser-kde.xul.kde	2012-10-30 17:02:36.901821811 +0400
++++ mozilla-release/browser/base/content/browser-kde.xul	2012-10-30 17:02:36.901821811 +0400
 @@ -0,0 +1,1126 @@
 +#filter substitution
 +<?xml version="1.0"?>
@@ -1129,15 +1127,9 @@ new file mode 100644
 +</deck>
 +
 +</window>
-diff --git a/browser/base/jar.mn b/browser/base/jar.mn
---- a/browser/base/jar.mn
-+++ b/browser/base/jar.mn
-@@ -35,16 +35,18 @@ browser.jar:
-         content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
-         content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
-         content/browser/abouthome/noise.png           (content/abouthome/noise.png)
-         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
-         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
+--- mozilla-release/browser/base/jar.mn.kde	2012-10-24 18:32:24.000000000 +0400
++++ mozilla-release/browser/base/jar.mn	2012-10-30 17:02:36.902821791 +0400
+@@ -40,6 +40,8 @@ browser.jar:
  *       content/browser/browser.css                   (content/browser.css)
  *       content/browser/browser.js                    (content/browser.js)
  *       content/browser/browser.xul                   (content/browser.xul)
@@ -1146,20 +1138,9 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/content.js                    (content/content.js)
  *       content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
- *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
-         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
- *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
- *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
- *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
-diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
---- a/browser/components/build/nsModule.cpp
-+++ b/browser/components/build/nsModule.cpp
-@@ -8,17 +8,17 @@
- #include "nsBrowserCompsCID.h"
- #include "DirectoryProvider.h"
- 
- #if defined(XP_WIN)
- #include "nsWindowsShellService.h"
+--- mozilla-release/browser/components/build/nsModule.cpp.kde	2012-10-24 18:32:25.000000000 +0400
++++ mozilla-release/browser/components/build/nsModule.cpp	2012-10-30 17:15:41.789779923 +0400
+@@ -13,7 +13,7 @@
  #elif defined(XP_MACOSX)
  #include "nsMacShellService.h"
  #elif defined(MOZ_WIDGET_GTK2)
@@ -1167,18 +1148,8 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 +#include "nsUnixShellService.h"
  #endif
  
- #if defined(XP_WIN) && !defined(__MINGW32__)
- #include "nsIEHistoryEnumerator.h"
- #endif
- 
- #include "rdf.h"
- #include "nsFeedSniffer.h"
-@@ -32,18 +32,16 @@ using namespace mozilla::browser;
- 
- /////////////////////////////////////////////////////////////////////////////
- 
- NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
  #if defined(XP_WIN)
+@@ -37,8 +37,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(Directory
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
  #elif defined(XP_MACOSX)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
@@ -1186,18 +1157,8 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
  #endif
  
- #if defined(XP_WIN) && !defined(__MINGW32__)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
- #endif
- 
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
- 
-@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
- #endif
- NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
- 
- static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
-     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
+ #if defined(XP_WIN)
+@@ -69,7 +67,7 @@ static const mozilla::Module::CIDEntry k
  #if defined(XP_WIN)
      { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
  #elif defined(MOZ_WIDGET_GTK2)
@@ -1206,20 +1167,9 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
  #endif
      { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
      { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
- #if defined(XP_WIN) && !defined(__MINGW32__)
-     { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
- #elif defined(XP_MACOSX)
-     { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
- #endif
-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
-@@ -23,16 +23,22 @@ var gAdvancedPane = {
-     if (extraArgs && extraArgs["advancedTab"]){
-       advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
-     } else {
-       var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
-       if (preference.value !== null)
+--- mozilla-release/browser/components/preferences/advanced.js.kde	2012-10-24 18:32:25.000000000 +0400
++++ mozilla-release/browser/components/preferences/advanced.js	2012-10-30 17:12:20.364842492 +0400
+@@ -28,6 +28,12 @@ var gAdvancedPane = {
          advancedPrefs.selectedIndex = preference.value;
      }
  
@@ -1231,18 +1181,8 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
 +
  #ifdef HAVE_SHELL_SERVICE
      this.updateSetDefaultBrowser();
- #endif
- #ifdef MOZ_UPDATER
-     this.updateReadPrefs();
- #endif
-     this.updateOfflineApps();
- #ifdef MOZ_CRASHREPORTER
-@@ -715,12 +721,23 @@ var gAdvancedPane = {
-    * Set browser as the operating system default browser.
-    */
-   setDefaultBrowser: function()
-   {
-     let shellSvc = getShellService();
+ #ifdef XP_WIN
+@@ -742,6 +748,17 @@ var gAdvancedPane = {
      if (!shellSvc)
        return;
      shellSvc.setDefaultBrowser(true, false);
@@ -1257,19 +1197,12 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
 +          "BrowserApplication", "MozillaFirefox"];
 +      process.run(false, args, args.length);
 +    }
-     document.getElementById("setDefaultPane").selectedIndex = 1;
-   }
- #endif
- };
-diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
---- a/browser/components/shell/src/Makefile.in
-+++ b/browser/components/shell/src/Makefile.in
-@@ -17,17 +17,18 @@ USE_STATIC_LIBS = 1
- 
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS = nsWindowsShellService.cpp
- else
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+     let selectedIndex =
+       shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
+     document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
+--- mozilla-release/browser/components/shell/src/Makefile.in.kde	2012-10-24 18:32:26.000000000 +0400
++++ mozilla-release/browser/components/shell/src/Makefile.in	2012-10-30 17:02:36.902821791 +0400
+@@ -22,7 +22,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
  CPPSRCS = nsMacShellService.cpp
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
@@ -1279,15 +1212,8 @@ diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell
  endif
  endif
  endif
- 
- ifdef CPPSRCS
- LIBRARY_NAME = shellservice_s
- endif
- 
-diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/src/nsKDEShellService.cpp
+--- mozilla-release/browser/components/shell/src/nsKDEShellService.cpp.kde	2012-10-30 17:02:36.902821791 +0400
++++ mozilla-release/browser/components/shell/src/nsKDEShellService.cpp	2012-10-30 17:02:36.902821791 +0400
 @@ -0,0 +1,264 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -1553,10 +1479,8 @@ new file mode 100644
 +    NS_ADDREF(*_retval = defaultReader);
 +    return NS_OK;
 +    }
-diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/src/nsKDEShellService.h
+--- mozilla-release/browser/components/shell/src/nsKDEShellService.h.kde	2012-10-30 17:02:36.902821791 +0400
++++ mozilla-release/browser/components/shell/src/nsKDEShellService.h	2012-10-30 17:02:36.902821791 +0400
 @@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -1617,10 +1541,8 @@ new file mode 100644
 +};
 +
 +#endif // nskdeshellservice_h____
-diff --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/src/nsUnixShellService.cpp
+--- mozilla-release/browser/components/shell/src/nsUnixShellService.cpp.kde	2012-10-30 17:02:36.903821795 +0400
++++ mozilla-release/browser/components/shell/src/nsUnixShellService.cpp	2012-10-30 17:02:36.903821795 +0400
 @@ -0,0 +1,52 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -1674,10 +1596,8 @@ new file mode 100644
 +        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
 +    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
 +}
-diff --git a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/src/nsUnixShellService.h
+--- mozilla-release/browser/components/shell/src/nsUnixShellService.h.kde	2012-10-30 17:02:36.903821795 +0400
++++ mozilla-release/browser/components/shell/src/nsUnixShellService.h	2012-10-30 17:02:36.903821795 +0400
 @@ -0,0 +1,45 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -1724,15 +1644,9 @@ new file mode 100644
 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 +
 +#endif // nsunixshellservice_h____
-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
-@@ -520,18 +520,20 @@
- @BINPATH@/@PREF_DIR@/services-aitc.js
- #endif
- @BINPATH@/greprefs.js
- @BINPATH@/defaults/autoconfig/platform.js
- @BINPATH@/defaults/autoconfig/prefcalls.js
+--- mozilla-release/browser/installer/package-manifest.in.kde	2012-10-24 18:32:26.000000000 +0400
++++ mozilla-release/browser/installer/package-manifest.in	2012-10-30 17:02:36.903821795 +0400
+@@ -563,8 +563,10 @@
  #ifndef LIBXUL_SDK
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
  @BINPATH@/defaults/pref/channel-prefs.js
@@ -1743,8 +1657,3 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
  #endif
  @BINPATH@/defaults/profile/prefs.js
  
- ; [Layout Engine Resources]
- ; Style Sheets, Graphics and other Resources used by the layout engine. 
- @BINPATH@/res/EditorOverride.css
- @BINPATH@/res/contenteditable.css
- @BINPATH@/res/designmode.css

mozilla-kde.patch

@@ -1,18 +1,6 @@
-Description: Add KDE integration to Firefox (toolkit parts)
-Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
-Author: Lubos Lunak <lunak@suse.com>
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
-     https://bugzilla.novell.com/show_bug.cgi?id=170055
-
-diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
---- a/modules/libpref/src/Makefile.in
-+++ b/modules/libpref/src/Makefile.in
-@@ -45,14 +45,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas
- # Optimizer bug with GCC 3.2.2 on OS/2
- ifeq ($(OS_ARCH), OS2)
- nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
- 	$(REPORT_BUILD)
- 	@$(MAKE_DEPS_AUTO_CXX)
+--- mozilla-release/modules/libpref/src/Makefile.in.kdemoz	2012-10-24 18:33:20.000000000 +0400
++++ mozilla-release/modules/libpref/src/Makefile.in	2012-10-30 16:22:26.870801260 +0400
+@@ -50,6 +50,8 @@ nsPrefService.$(OBJ_SUFFIX): nsPrefServi
  	$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS)
  endif
  
@@ -21,18 +9,9 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
  
  greprefs.js: $(GREPREF_FILES)
  	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@
- 
- libs:: greprefs.js
- 	$(INSTALL) $^ $(DIST)/bin/
-diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
---- a/modules/libpref/src/Preferences.cpp
-+++ b/modules/libpref/src/Preferences.cpp
-@@ -23,16 +23,17 @@
- #include "nsIStringEnumerator.h"
- #include "nsIZipReader.h"
- #include "nsPrefBranch.h"
- #include "nsXPIDLString.h"
- #include "nsCRT.h"
+--- mozilla-release/modules/libpref/src/Preferences.cpp.kdemoz	2012-10-24 18:33:20.000000000 +0400
++++ mozilla-release/modules/libpref/src/Preferences.cpp	2012-10-30 16:22:26.870801260 +0400
+@@ -28,6 +28,7 @@
  #include "nsCOMArray.h"
  #include "nsXPCOMCID.h"
  #include "nsAutoPtr.h"
@@ -40,17 +19,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  
  #include "nsQuickSort.h"
  #include "prmem.h"
- #include "pldhash.h"
- 
- #include "prefapi.h"
- #include "prefread.h"
- #include "prefapi_private_data.h"
-@@ -907,16 +908,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
- 
- static nsresult pref_LoadPrefsInDirList(const char *listId)
- {
-   nsresult rv;
-   nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
+@@ -912,6 +913,24 @@ static nsresult pref_LoadPrefsInDirList(
    if (NS_FAILED(rv))
      return rv;
  
@@ -75,17 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
    nsCOMPtr<nsISimpleEnumerator> list;
    dirSvc->Get(listId,
                NS_GET_IID(nsISimpleEnumerator),
-               getter_AddRefs(list));
-   if (!list)
-     return NS_OK;
- 
-   bool hasMore;
-@@ -932,17 +951,17 @@ static nsresult pref_LoadPrefsInDirList(
- 
-     nsCAutoString leaf;
-     path->GetNativeLeafName(leaf);
- 
-     // Do we care if a file provided by this process fails to load?
+@@ -937,7 +956,7 @@ static nsresult pref_LoadPrefsInDirList(
      if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi")))
        ReadExtensionPrefs(path);
      else
@@ -94,17 +53,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
    }
    return NS_OK;
  }
- 
- static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
- {
-   nsZipItemPtr<char> manifest(jarReader, name, true);
-   NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1036,28 +1055,40 @@ 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)
-     "macprefs.js"
- #elif defined(XP_WIN)
+@@ -1041,6 +1060,7 @@ static nsresult pref_InitInitialObjects(
      "winpref.js"
  #elif defined(XP_UNIX)
      "unix.js"
@@ -112,12 +61,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  #if defined(VMS)
      , "openvms.js"
  #elif defined(_AIX)
-     , "aix.js"
- #endif
- #elif defined(XP_OS2)
-     "os2pref.js"
- #elif defined(XP_BEOS)
-     "beos.js"
+@@ -1053,6 +1073,17 @@ static nsresult pref_InitInitialObjects(
  #endif
    };
  
@@ -135,20 +79,9 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
    rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles));
    if (NS_FAILED(rv))
      NS_WARNING("Error parsing application default preferences.");
- 
-   // Load jar:$app/omni.jar!/defaults/preferences/*.js
-   // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-   nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
-   // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
-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 = \
-   nsDownloadManagerUI.manifest \
-   $(NULL)
- endif
- 
- TEST_DIRS += test
+--- mozilla-release/toolkit/components/downloads/Makefile.in.kdemoz	2012-10-24 18:33:28.000000000 +0400
++++ mozilla-release/toolkit/components/downloads/Makefile.in	2012-10-30 16:22:26.870801260 +0400
+@@ -46,4 +46,7 @@ TEST_DIRS += test
  
  include $(topsrcdir)/config/rules.mk
  
@@ -156,15 +89,9 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downl
 +
 +
  CXXFLAGS += $(TK_CFLAGS)
-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
-@@ -35,16 +35,20 @@
- 
- #ifdef XP_WIN
- #include <shlobj.h>
- #ifdef DOWNLOAD_SCANNER
- #include "nsDownloadScanner.h"
+--- mozilla-release/toolkit/components/downloads/nsDownloadManager.cpp.kdemoz	2012-10-24 18:33:28.000000000 +0400
++++ mozilla-release/toolkit/components/downloads/nsDownloadManager.cpp	2012-10-30 16:22:26.871801071 +0400
+@@ -40,6 +40,10 @@
  #endif
  #endif
  
@@ -175,17 +102,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  #ifdef XP_MACOSX
  #include <CoreFoundation/CoreFoundation.h>
  #endif
- 
- #ifdef MOZ_WIDGET_ANDROID
- #include "AndroidBridge.h"
- #endif
- 
-@@ -2236,16 +2240,25 @@ nsDownload::SetState(DownloadState aStat
-       nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
- 
-       // Master pref to control this function.
-       bool showTaskbarAlert = true;
-       if (pref)
+@@ -2236,6 +2240,15 @@ nsDownload::SetState(DownloadState aStat
          pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert);
  
        if (showTaskbarAlert) {
@@ -201,17 +118,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
          PRInt32 alertInterval = 2000;
          if (pref)
            pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);
- 
-         PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
-         PRInt64 goat = PR_Now() - mStartTime;
-         showTaskbarAlert = goat > alertIntervalUSec;
- 
-@@ -2269,19 +2282,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
-               // the items they downloaded will have been removed.
-               alerts->ShowAlertNotification(
+@@ -2269,9 +2282,10 @@ nsDownload::SetState(DownloadState aStat
                    NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
                    message, !removeWhenDone, EmptyString(), mDownloadManager,
                    EmptyString());
@@ -223,52 +130,28 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  
  #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2)
        nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
-       nsCOMPtr<nsIFile> file;
-       nsAutoString path;
- 
-       if (fileURL &&
-           NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) &&
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -45,29 +45,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)
- *+ content/global/bindings/button.xml          (widgets/button.xml)
- *+ content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
- *+ content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
- *+ content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
+--- mozilla-release/toolkit/content/jar.mn.kdemoz	2012-10-24 18:33:29.000000000 +0400
++++ mozilla-release/toolkit/content/jar.mn	2012-10-30 16:22:26.871801071 +0400
+@@ -50,6 +50,8 @@ toolkit.jar:
+    content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
+    content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
  *+ content/global/bindings/dialog.xml          (widgets/dialog.xml)
 +*+ content/global/bindings/dialog-kde.xml      (widgets/dialog-kde.xml)
 +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
- *+ content/global/bindings/editor.xml          (widgets/editor.xml)
- *  content/global/bindings/expander.xml        (widgets/expander.xml)
+    content/global/bindings/editor.xml          (widgets/editor.xml)
+    content/global/bindings/expander.xml        (widgets/expander.xml)
  *  content/global/bindings/filefield.xml       (widgets/filefield.xml)
- *+ content/global/bindings/findbar.xml         (widgets/findbar.xml)
- *+ content/global/bindings/general.xml         (widgets/general.xml)
- *+ content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
- *+ content/global/bindings/listbox.xml         (widgets/listbox.xml)
- *+ content/global/bindings/menu.xml            (widgets/menu.xml)
- *+ content/global/bindings/menulist.xml        (widgets/menulist.xml)
- *+ content/global/bindings/notification.xml    (widgets/notification.xml)
- *+ content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
- *+ content/global/bindings/popup.xml           (widgets/popup.xml)
+@@ -63,6 +65,8 @@ toolkit.jar:
+    content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
+    content/global/bindings/popup.xml           (widgets/popup.xml)
  *+ content/global/bindings/preferences.xml     (widgets/preferences.xml)
 +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
 +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
- *+ content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
- *+ content/global/bindings/radio.xml           (widgets/radio.xml)
- *+ content/global/bindings/resizer.xml         (widgets/resizer.xml)
- *+ content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
- *+ content/global/bindings/scale.xml           (widgets/scale.xml)
- *+ content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
- *+ content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
- *+ content/global/bindings/splitter.xml        (widgets/splitter.xml)
-diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
-new file mode 100644
---- /dev/null
-+++ b/toolkit/content/widgets/dialog-kde.xml
+    content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
+    content/global/bindings/radio.xml           (widgets/radio.xml)
+    content/global/bindings/resizer.xml         (widgets/resizer.xml)
+--- mozilla-release/toolkit/content/widgets/dialog-kde.xml.kdemoz	2012-10-30 16:22:26.872801032 +0400
++++ mozilla-release/toolkit/content/widgets/dialog-kde.xml	2012-10-30 16:22:26.872801032 +0400
 @@ -0,0 +1,451 @@
 +<?xml version="1.0"?>
 +<!-- This Source Code Form is subject to the terms of the Mozilla Public
@@ -721,10 +604,8 @@ new file mode 100644
 +  </binding>
 +
 +</bindings>
-diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml
-new file mode 100644
---- /dev/null
-+++ b/toolkit/content/widgets/preferences-kde.xml
+--- mozilla-release/toolkit/content/widgets/preferences-kde.xml.kdemoz	2012-10-30 16:22:26.873801218 +0400
++++ mozilla-release/toolkit/content/widgets/preferences-kde.xml	2012-10-30 16:22:26.873801218 +0400
 @@ -0,0 +1,1339 @@
 +<?xml version="1.0"?>
 +
@@ -2065,15 +1946,9 @@ new file mode 100644
 +#    PrefWindow II  (???)
 +#    PrefWindow I   (June 4, 1999)
 +#
-diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
---- a/toolkit/xre/Makefile.in
-+++ b/toolkit/xre/Makefile.in
-@@ -69,17 +69,18 @@ else
- ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- CMMSRCS = nsNativeAppSupportCocoa.mm
- EXPORTS += MacQuirks.h
- else
- ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+--- mozilla-release/toolkit/xre/Makefile.in.kdemoz	2012-10-24 18:33:33.000000000 +0400
++++ mozilla-release/toolkit/xre/Makefile.in	2012-10-30 16:22:26.873801218 +0400
+@@ -74,7 +74,8 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
  CPPSRCS += nsNativeAppSupportOS2.cpp
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -2083,15 +1958,8 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
  MOCSRCS += moc_nsNativeAppSupportQt.cpp
- CPPSRCS += $(MOCSRCS)
- CPPSRCS += nsNativeAppSupportQt.cpp
- CPPSRCS += nsQAppInstance.cpp
- EXPORTS += nsQAppInstance.h
- else
-diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
-new file mode 100644
---- /dev/null
-+++ b/toolkit/xre/nsKDEUtils.cpp
+--- mozilla-release/toolkit/xre/nsKDEUtils.cpp.kdemoz	2012-10-30 16:22:26.874801346 +0400
++++ mozilla-release/toolkit/xre/nsKDEUtils.cpp	2012-10-30 16:22:26.874801346 +0400
 @@ -0,0 +1,373 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -2466,10 +2334,8 @@ new file mode 100644
 +    fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data
 +    fflush( commandFile );
 +    }
-diff --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h
-new file mode 100644
---- /dev/null
-+++ b/toolkit/xre/nsKDEUtils.h
+--- mozilla-release/toolkit/xre/nsKDEUtils.h.kdemoz	2012-10-30 16:22:26.874801346 +0400
++++ mozilla-release/toolkit/xre/nsKDEUtils.h	2012-10-30 16:22:26.874801346 +0400
 @@ -0,0 +1,81 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
@@ -2552,15 +2418,9 @@ new file mode 100644
 +    };
 +
 +#endif // nsKDEUtils
-diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
---- a/uriloader/exthandler/Makefile.in
-+++ b/uriloader/exthandler/Makefile.in
-@@ -58,18 +58,19 @@ LOCAL_INCLUDES = -I$(srcdir)
- LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
-             -I$(topsrcdir)/dom/ipc \
-             -I$(topsrcdir)/content/base/src \
-             -I$(topsrcdir)/content/events/src \
-             -I$(topsrcdir)/netwerk/base/src \
+--- mozilla-release/uriloader/exthandler/Makefile.in.kdemoz	2012-10-24 18:33:34.000000000 +0400
++++ mozilla-release/uriloader/exthandler/Makefile.in	2012-10-30 16:22:26.874801346 +0400
+@@ -63,8 +63,9 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas
              -I$(topsrcdir)/netwerk/protocol/http
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -2571,15 +2431,8 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
  endif
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),android)
- OSHELPER += nsMIMEInfoAndroid.cpp
- OSHELPER += nsAndroidHandlerApp.cpp
- OSHELPER += nsExternalSharingAppService.cpp
- EXPORTS += nsExternalSharingAppService.h
- OSHELPER += nsExternalURLHandlerService.cpp
-diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
-new file mode 100644
---- /dev/null
-+++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp
+--- mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.cpp.kdemoz	2012-10-30 16:22:26.874801346 +0400
++++ mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.cpp	2012-10-30 16:22:26.874801346 +0400
 @@ -0,0 +1,87 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -2668,10 +2521,8 @@ new file mode 100644
 +        return nsKDERegistry::GetFromType( aMIMEType );
 +    return nsGNOMERegistry::GetFromType( aMIMEType );
 +}
-diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h
-new file mode 100644
---- /dev/null
-+++ b/uriloader/exthandler/unix/nsCommonRegistry.h
+--- mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.h.kdemoz	2012-10-30 16:22:26.875800857 +0400
++++ mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.h	2012-10-30 16:22:26.875800857 +0400
 @@ -0,0 +1,56 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -2729,10 +2580,8 @@ new file mode 100644
 +
 +  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
 +};
-diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
-new file mode 100644
---- /dev/null
-+++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
+--- mozilla-release/uriloader/exthandler/unix/nsKDERegistry.cpp.kdemoz	2012-10-30 16:22:26.875800857 +0400
++++ mozilla-release/uriloader/exthandler/unix/nsKDERegistry.cpp	2012-10-30 16:22:26.875800857 +0400
 @@ -0,0 +1,119 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -2853,10 +2702,8 @@ new file mode 100644
 +        }
 +    return nsnull;
 +}
-diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
-new file mode 100644
---- /dev/null
-+++ b/uriloader/exthandler/unix/nsKDERegistry.h
+--- mozilla-release/uriloader/exthandler/unix/nsKDERegistry.h.kdemoz	2012-10-30 16:22:26.875800857 +0400
++++ mozilla-release/uriloader/exthandler/unix/nsKDERegistry.h	2012-10-30 16:22:26.875800857 +0400
 @@ -0,0 +1,62 @@
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -2920,15 +2767,9 @@ new file mode 100644
 +  static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command);
 +
 +};
-diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
---- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -16,30 +16,33 @@
- #include <QString>
- #if (MOZ_ENABLE_CONTENTACTION)
- #include <contentaction/contentaction.h>
- #include "nsContentHandlerApp.h"
- #endif
+--- mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp.kdemoz	2012-10-24 18:33:34.000000000 +0400
++++ mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2012-10-30 16:22:26.876800990 +0400
+@@ -21,7 +21,7 @@
  #endif
  
  #include "nsMIMEInfoUnix.h"
@@ -2937,8 +2778,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
  #include "nsIGIOService.h"
  #include "nsNetCID.h"
  #include "nsIIOService.h"
- #include "nsIGnomeVFSService.h"
- #include "nsAutoPtr.h"
+@@ -30,11 +30,14 @@
  #ifdef MOZ_ENABLE_DBUS
  #include "nsDBusHandlerApp.h"
  #endif
@@ -2954,17 +2794,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
  
  #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
    if (NS_FAILED(rv)){
-     HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nsnull);
-     if (action) {
-       nsCAutoString spec;
-       aURI->GetAsciiSpec(spec);
-       if (hildon_uri_open(spec.get(), action, nsnull))
-@@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
- 
-   return rv;
- }
- 
- NS_IMETHODIMP
+@@ -66,12 +69,12 @@ NS_IMETHODIMP
  nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval)
  {
    *_retval = false;
@@ -2979,17 +2809,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
      }
    }
    if (mimeInfo)
-     *_retval = true;
- 
-   if (*_retval)
-     return NS_OK;
- 
-@@ -119,16 +122,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
-     ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
-   if (action.isValid()) {
-     action.trigger();
-     return NS_OK;
-   }
+@@ -124,6 +127,23 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
    return NS_ERROR_FAILURE;
  #endif
  
@@ -3013,17 +2833,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
    nsCAutoString uriSpec;
    if (giovfs) {
-     // nsGIOMimeApp->Launch wants a URI string instead of local file
-     nsresult rv;
-     nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
-     NS_ENSURE_SUCCESS(rv, rv);
-     nsCOMPtr<nsIURI> uri;
-@@ -146,17 +166,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
-     /* Fallback to GnomeVFS */
-     nsCOMPtr<nsIGnomeVFSMimeApp> app;
-     if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
-       return app->Launch(nativePath);
-   }
+@@ -151,7 +171,7 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
  
    // If we haven't got an app we try to get a valid one by searching for the
    // extension mapped type
@@ -3032,20 +2842,9 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
    if (mimeInfo) {
      nsCAutoString type;
      mimeInfo->GetType(type);
-     if (giovfs) {
-       nsCOMPtr<nsIGIOMimeApp> app;
-       if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
-         return app->Launch(uriSpec);
-     } else if (gnomevfs) {
-diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
---- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
-+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
-@@ -10,17 +10,17 @@
- #if defined(MOZ_ENABLE_CONTENTACTION)
- #include <contentaction/contentaction.h>
- #include <QString>
- #endif
- 
+--- mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp.kdemoz	2012-10-24 18:33:34.000000000 +0400
++++ mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2012-10-30 16:22:26.876800990 +0400
+@@ -15,7 +15,7 @@
  #include "nsOSHelperAppService.h"
  #include "nsMIMEInfoUnix.h"
  #ifdef MOZ_WIDGET_GTK2
@@ -3054,17 +2853,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #endif
  #include "nsISupports.h"
  #include "nsString.h"
- #include "nsReadableUtils.h"
- #include "nsUnicharUtils.h"
- #include "nsXPIDLString.h"
- #include "nsIURL.h"
- #include "nsIFileStreams.h"
-@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco
-     ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
- 
-   if (action.isValid())
-     *aHandlerExists = true;
- #endif
+@@ -1162,7 +1162,7 @@ nsresult nsOSHelperAppService::OSProtoco
  
  #ifdef MOZ_WIDGET_GTK2
    // Check the GConf registry for a protocol handler
@@ -3073,11 +2862,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
    *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
  #endif
- #endif
- 
-   return NS_OK;
- }
- 
+@@ -1174,7 +1174,7 @@ nsresult nsOSHelperAppService::OSProtoco
  NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval)
  {
  #ifdef MOZ_WIDGET_GTK2
@@ -3086,17 +2871,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
    return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK;
  #else
    return NS_ERROR_NOT_AVAILABLE;
- #endif
- }
- 
- nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
- {
-@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c
-                                          minorType,
-                                          mime_types_description,
-                                          true);
- 
-   if (NS_FAILED(rv) || majorType.IsEmpty()) {
+@@ -1270,7 +1270,7 @@ nsOSHelperAppService::GetFromExtension(c
      
  #ifdef MOZ_WIDGET_GTK2
      LOG(("Looking in GNOME registry\n"));
@@ -3105,17 +2880,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
      if (gnomeInfo) {
        LOG(("Got MIMEInfo from GNOME registry\n"));
        return gnomeInfo;
-     }
- #endif
- 
-     rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
-                                   majorType,
-@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const 
- #ifdef MOZ_WIDGET_GTK2
-   nsMIMEInfoBase *gnomeInfo = nsnull;
-   if (handler.IsEmpty()) {
-     // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
-     // GNOME versions no longer have type-to-extension mappings, so we might
+@@ -1396,7 +1396,7 @@ nsOSHelperAppService::GetFromType(const
      // get back a MIMEInfo without any extensions set.  In that case we'll have
      // to look in our mime.types files for the extensions.    
      LOG(("Looking in GNOME registry\n"));
@@ -3124,20 +2889,9 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
      if (gnomeInfo && gnomeInfo->HasExtensions()) {
        LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
        return gnomeInfo;
-     }
-   }
- #endif
- 
-   // Now look up our extensions
-diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
---- a/widget/gtk2/Makefile.in
-+++ b/widget/gtk2/Makefile.in
-@@ -104,11 +104,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
- 
- INCLUDES	+= \
- 		-I$(srcdir)/../xpwidgets \
- 		-I$(srcdir)/../shared \
- 		-I$(topsrcdir)/layout/generic \
+--- mozilla-release/widget/gtk2/Makefile.in.kdemoz	2012-10-24 18:33:34.000000000 +0400
++++ mozilla-release/widget/gtk2/Makefile.in	2012-10-30 16:22:26.876800990 +0400
+@@ -110,6 +110,9 @@ INCLUDES	+= \
  		-I$(topsrcdir)/layout/xul/base/src \
  		-I$(topsrcdir)/other-licenses/atk-1.0 \
  		$(NULL)
@@ -3147,15 +2901,9 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
  ifdef MOZ_X11
  INCLUDES   	+= -I$(srcdir)/../shared/x11
  endif
-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 @@
- /* -*- 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
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
+--- mozilla-release/widget/gtk2/nsFilePicker.cpp.kdemoz	2012-10-24 18:33:35.000000000 +0400
++++ mozilla-release/widget/gtk2/nsFilePicker.cpp	2012-10-30 16:22:26.877801008 +0400
+@@ -6,6 +6,7 @@
  #include "mozilla/Util.h"
  
  #include <gtk/gtk.h>
@@ -3163,17 +2911,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  
  #include "nsIFileURL.h"
  #include "nsIURI.h"
- #include "nsIWidget.h"
- #include "nsILocalFile.h"
- #include "nsIStringBundle.h"
- 
- #include "nsArrayEnumerator.h"
-@@ -19,16 +20,17 @@
- #include "nsNetUtil.h"
- #include "nsReadableUtils.h"
- #include "mozcontainer.h"
- 
- #include "prmem.h"
+@@ -24,6 +25,7 @@
  #include "prlink.h"
  
  #include "nsFilePicker.h"
@@ -3181,17 +2919,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  
  #if (MOZ_PLATFORM_MAEMO == 5)
  #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
- #endif
- 
- using namespace mozilla;
- 
- #define MAX_PREVIEW_SIZE 180
-@@ -253,17 +255,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
-   return nsBaseFilePicker::AppendFilters(aFilterMask);
- }
- 
- NS_IMETHODIMP
- nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter)
+@@ -257,7 +259,9 @@ nsFilePicker::AppendFilter(const nsAStri
  {
    if (aFilter.EqualsLiteral("..apps")) {
      // No platform specific thing we can do here, really....
@@ -3202,17 +2930,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
    }
  
    nsCAutoString filter, name;
-   CopyUTF16toUTF8(aFilter, filter);
-   CopyUTF16toUTF8(aTitle, name);
- 
-   mFilters.AppendElement(filter);
-   mFilterNames.AppendElement(name);
-@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
-   return NS_ERROR_FAILURE;
- }
- 
- NS_IMETHODIMP
- nsFilePicker::Show(PRInt16 *aReturn)
+@@ -362,6 +366,9 @@ nsFilePicker::Show(PRInt16 *aReturn)
  {
    NS_ENSURE_ARG_POINTER(aReturn);
  
@@ -3222,17 +2940,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
    nsXPIDLCString title;
    title.Adopt(ToNewUTF8String(mTitle));
  
-   GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
- 
-   GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-   const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-                                ? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
-@@ -506,8 +513,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
-     *aReturn = nsIFilePicker::returnCancel;
-     break;
-   }
- 
-   gtk_widget_destroy(file_chooser);
+@@ -510,3 +517,229 @@ nsFilePicker::Show(PRInt16 *aReturn)
  
    return NS_OK;
  }
@@ -3462,18 +3170,12 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 +        }
 +    return NS_OK;
 +    }
-diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
---- a/widget/gtk2/nsFilePicker.h
-+++ b/widget/gtk2/nsFilePicker.h
-@@ -57,11 +57,17 @@ protected:
-   nsString  mDefault;
-   nsString  mDefaultExtension;
- 
-   nsTArray<nsCString> mFilters;
-   nsTArray<nsCString> mFilterNames;
+--- mozilla-release/widget/gtk2/nsFilePicker.h.kdemoz	2012-10-24 18:33:35.000000000 +0400
++++ mozilla-release/widget/gtk2/nsFilePicker.h	2012-10-30 16:25:26.142780119 +0400
+@@ -62,6 +62,12 @@ protected:
  
  private:
-   static nsILocalFile *mPrevDisplayDirectory;
+   static nsIFile *mPrevDisplayDirectory;
 +
 +  bool kdeRunning();
 +  bool getKdeRunning();
@@ -3483,30 +3185,18 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
  };
  
  #endif
-diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
---- a/xpcom/components/Makefile.in
-+++ b/xpcom/components/Makefile.in
-@@ -59,10 +59,11 @@ LOCAL_INCLUDES	= \
- # we don't want the shared lib, but we want to force the creation of a static lib.
- FORCE_STATIC_LIB = 1
- 
- include $(topsrcdir)/config/rules.mk
- 
+--- mozilla-release/xpcom/components/Makefile.in.kdemoz	2012-10-24 18:33:36.000000000 +0400
++++ mozilla-release/xpcom/components/Makefile.in	2012-10-30 16:22:26.877801008 +0400
+@@ -64,5 +64,6 @@ include $(topsrcdir)/config/rules.mk
  DEFINES	+= -D_IMPL_NS_COM
  
  ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
  CXXFLAGS += $(MOZ_GTK2_CFLAGS)
  endif
-diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
---- a/xpcom/components/ManifestParser.cpp
-+++ b/xpcom/components/ManifestParser.cpp
-@@ -30,16 +30,17 @@
- #include "nsTextFormatter.h"
- #include "nsVersionComparator.h"
- #include "nsXPCOMCIDInternal.h"
- 
- #include "nsIConsoleService.h"
+--- mozilla-release/xpcom/components/ManifestParser.cpp.kdemoz	2012-10-24 18:33:36.000000000 +0400
++++ mozilla-release/xpcom/components/ManifestParser.cpp	2012-10-30 16:22:26.878800909 +0400
+@@ -35,6 +35,7 @@
  #include "nsIScriptError.h"
  #include "nsIXULAppInfo.h"
  #include "nsIXULRuntime.h"
@@ -3514,17 +3204,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  
  using namespace mozilla;
  
- struct ManifestDirective
- {
-   const char* directive;
-   int argc;
- 
-@@ -397,16 +398,17 @@ ParseManifest(NSLocationType type, FileL
-   NS_NAMED_LITERAL_STRING(kPlatform, "platform");
-   NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
-   NS_NAMED_LITERAL_STRING(kApplication, "application");
-   NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
-   NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
+@@ -402,6 +403,7 @@ ParseManifest(NSLocationType type, FileL
    NS_NAMED_LITERAL_STRING(kOs, "os");
    NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
    NS_NAMED_LITERAL_STRING(kABI, "abi");
@@ -3532,17 +3212,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #if defined(MOZ_WIDGET_ANDROID)
    NS_NAMED_LITERAL_STRING(kTablet, "tablet");
  #endif
- 
-   // Obsolete
-   NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
- 
-   nsAutoString appID;
-@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL
-         CopyUTF8toUTF16(s, abi);
-         abi.Insert(PRUnichar('_'), 0);
-         abi.Insert(osTarget, 0);
-       }
-     }
+@@ -449,6 +451,7 @@ ParseManifest(NSLocationType type, FileL
    }
  
    nsAutoString osVersion;
@@ -3550,7 +3220,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #if defined(XP_WIN)
    OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
    if (GetVersionEx(&info)) {
-     nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+@@ -456,6 +459,7 @@ ParseManifest(NSLocationType type, FileL
                                           info.dwMajorVersion,
                                           info.dwMinorVersion);
    }
@@ -3558,8 +3228,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #elif defined(MOZ_WIDGET_COCOA)
    SInt32 majorVersion, minorVersion;
    if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) &&
-       (Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) {
-     nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+@@ -464,16 +468,19 @@ ParseManifest(NSLocationType type, FileL
                                           majorVersion,
                                           minorVersion);
    }
@@ -3579,17 +3248,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #endif
  
    // Because contracts must be registered after CIDs, we save and process them
-   // at the end.
-   nsTArray<CachedDirective> contracts;
- 
-   char *token;
-   char *newline = buf;
-@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL
-     TriState stOsVersion = eUnspecified;
-     TriState stOs = eUnspecified;
-     TriState stABI = eUnspecified;
- #if defined(MOZ_WIDGET_ANDROID)
-     TriState stTablet = eUnspecified;
+@@ -565,6 +572,7 @@ ParseManifest(NSLocationType type, FileL
  #endif
      bool platform = false;
      bool contentAccessible = false;
@@ -3597,8 +3256,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  
      while (NULL != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
        ToLowerCase(token);
-       NS_ConvertASCIItoUTF16 wtoken(token);
- 
+@@ -573,6 +581,7 @@ ParseManifest(NSLocationType type, FileL
        if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||
            CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
            CheckStringFlag(kABI, wtoken, abi, stABI) ||
@@ -3606,17 +3264,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
            CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
            CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
            CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion))
-         continue;
- 
- #if defined(MOZ_WIDGET_ANDROID)
-       bool tablet = false;
-       if (CheckFlag(kTablet, wtoken, tablet)) {
-@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL
-     }
- 
-     if (!ok ||
-         stApp == eBad ||
-         stAppVersion == eBad ||
+@@ -611,6 +620,7 @@ ParseManifest(NSLocationType type, FileL
          stGeckoVersion == eBad ||
          stOs == eBad ||
          stOsVersion == eBad ||
@@ -3624,20 +3272,9 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
  #ifdef MOZ_WIDGET_ANDROID
          stTablet == eBad ||
  #endif
-         stABI == eBad)
-       continue;
- 
-     if (directive->regfunc) {
-       if (GeckoProcessType_Default != XRE_GetProcessType())
-diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
---- a/xpcom/io/Makefile.in
-+++ b/xpcom/io/Makefile.in
-@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi
- DEFINES		+= -D_IMPL_NS_COM
- 
- ifeq ($(OS_ARCH),Linux)
- ifneq (,$(findstring lib64,$(libdir)))
- DEFINES     += -DHAVE_USR_LIB64_DIR
+--- mozilla-release/xpcom/io/Makefile.in.kdemoz	2012-10-24 18:33:37.000000000 +0400
++++ mozilla-release/xpcom/io/Makefile.in	2012-10-30 16:22:26.878800909 +0400
+@@ -162,7 +162,7 @@ DEFINES     += -DHAVE_USR_LIB64_DIR
  endif
  endif
  
@@ -3646,41 +3283,20 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
  
  ifeq ($(MOZ_PLATFORM_MAEMO),5)
  CFLAGS          += $(MOZ_DBUS_CFLAGS)
- CXXFLAGS        += $(MOZ_DBUS_CFLAGS)
- endif
- 
- ifdef MOZ_PLATFORM_MAEMO
- CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS)
-diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
---- a/xpcom/io/nsLocalFileUnix.cpp
-+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -48,16 +48,17 @@
- #include "prproces.h"
- #include "nsIDirectoryEnumerator.h"
- #include "nsISimpleEnumerator.h"
- #include "private/pprio.h"
- 
- #ifdef MOZ_WIDGET_GTK2
+--- mozilla-release/xpcom/io/nsLocalFileUnix.cpp.kdemoz	2012-10-24 18:33:37.000000000 +0400
++++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2012-10-30 16:50:57.867779335 +0400
+@@ -54,6 +54,7 @@
+ #ifdef MOZ_WIDGET_GTK
  #include "nsIGIOService.h"
  #include "nsIGnomeVFSService.h"
 +#include "nsKDEUtils.h"
  #endif
  
  #ifdef MOZ_WIDGET_COCOA
- #include <Carbon/Carbon.h>
- #include "CocoaFileUtils.h"
- #include "prmem.h"
- #include "plbase64.h"
- 
-@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con
-     return InitWithNativePath(aPersistentDescriptor);
- #endif
- }
- 
- NS_IMETHODIMP
+@@ -1765,21 +1766,13 @@ NS_IMETHODIMP
  nsLocalFile::Reveal()
  {
- #ifdef MOZ_WIDGET_GTK2
+ #ifdef MOZ_WIDGET_GTK
 -    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 -    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
 -    if (!giovfs && !gnomevfs)
@@ -3701,8 +3317,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
      } else {
          nsCOMPtr<nsIFile> parentDir;
          nsCAutoString dirPath;
-         if (NS_FAILED(GetParent(getter_AddRefs(parentDir))))
-             return NS_ERROR_FAILURE;
+@@ -1788,11 +1781,25 @@ nsLocalFile::Reveal()
          if (NS_FAILED(parentDir->GetNativePath(dirPath)))
              return NS_ERROR_FAILURE;
  
@@ -3711,14 +3326,13 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 -        else 
 -            return gnomevfs->ShowURIForInput(dirPath);        
 +        url = dirPath;
-     }
-+
++    }
 +    if(nsKDEUtils::kdeSupport()) {
 +      nsTArray<nsCString> command;
 +      command.AppendElement( NS_LITERAL_CSTRING("OPEN") );
 +      command.AppendElement( url );
 +      return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
+     }
 +
 +    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 +    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
@@ -3733,17 +3347,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #elif defined(MOZ_WIDGET_COCOA)
      CFURLRef url;
      if (NS_SUCCEEDED(GetCFURL(&url))) {
-       nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
-       ::CFRelease(url);
-       return rv;
-     }
-     return NS_ERROR_FAILURE;
-@@ -1826,16 +1834,23 @@ nsLocalFile::Launch()
- 
-     if (nsnull == connection)
-       return NS_ERROR_FAILURE;
- 
-     if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)
+@@ -1828,6 +1835,13 @@ nsLocalFile::Launch()
        return NS_ERROR_FAILURE;
      return NS_OK;
  #else
@@ -3757,8 +3361,3 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
      nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
      nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
      if (giovfs) {
-       return giovfs->ShowURIForInput(mPath);
-     } else if (gnomevfs) {
-       /* GnomeVFS fallback */
-       return gnomevfs->ShowURIForInput(mPath);
-     }