Merge lp:~debfx/firefox/firefox-4.0-kde into lp:firefox/trunk

[Felix Geyer]

  * Re-add KDE integration
    - add debian/patches/mozilla-kde.patch
    - add debian/patches/firefox-kde.patch
    - update debian/patches/series
    - update debian/rules
  * Make firefox-4.0 and abrowser-4.0 suggest firefox-kde-support
    - update debian/control

[lp:~debfx/firefox/firefox-4.0-kde]

672. By Chris Coulson on 2010-09-28

* Add support for running debhelper files through the Mozilla text
  preprocessor. This means we'll be able to support the different build
  configurations without having a huge debian/rules with lots of logic in
  - update debian/rules

673. By Chris Coulson on 2010-09-28

* Some cosmetic changes to debian/rules - the includes are all near to the top now, where people expect them to be
* Generate the pre-processed packaging files earlier in the build, else it fails

674. By Chris Coulson on 2010-09-28

* Fix DEB_MIN_SYSDEPS again, so it should be possible to build with either option again. Note that FF-on-XR is totally untested

675. By Chris Coulson on 2010-09-28

* Install Ubuntu preferences as vendor.js

676. By Chris Coulson on 2010-09-28

* Create the buildsymbols in common-install-arch, and move the installation in to debhelper files
  - update debian/rules
  - update debian/firefox-core.install.pp
  - add debian/firefox-mozsymbols.install.pp
* Remember to preprocess firefox.dirs.in and abrowser.dirs.in
  - update debian/rules

677. By Chris Coulson on 2010-09-28

Merge from lp:firefox

678. By Chris Coulson on 2010-09-28

* Blacklist plugin-container in Apport for DEB_MIN_SYSDEPS builds
  - rename debian/apport/firefox.in => debian/apport/firefox.pp
  - update debian/apport/firefox.pp

679. By Chris Coulson on 2010-09-28

* Refresh patches
  - update debian/patches/browser_branding.patch
  - update ebian/patches/bz591331_att469858_breakpad_allow_ptrace.patch
  - update debian/patches/lp548866_bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch

680. By Chris Coulson on 2010-09-29

* Disable more IPC tests which are causing the builds to hang
  - update debian/testsuite.mk

681. By Chris Coulson on 2010-09-29

* Preprocess the debhelper files as a dependency of pre-build rather than common-install-arch. I only moved it when I was including config/automake.mk (which assumes that the configure is already done)
  - update debian/rules

682. By Chris Coulson on 2010-10-01

* Build with "make -f client.mk" and using a mozconfig, rather than the
  autoconf/configure/make steps used previously. The client.mk contains the
  sequencing for doing PGO builds
  - update debian/firefox-mozsymbols.install.pp
  - add debian/mozconfig.pp
  - update debian/rules

683. By Chris Coulson on 2010-10-01

* Create the build symbols after running make install, else dh_strip fails later on
  - update debian/rules

684. By Chris Coulson on 2010-10-01

* Export MOZILLA_OFFICIAL to the environment rather than putting it in mozconfig (which doesn't work)
  - update debian/rules
  - update debian/mozconfig.pp

685. By Chris Coulson on 2010-10-01

* Don't hardcode MOZ_OBJDIR and DEB_BUILDDIR in the various places it is used
  - update debian/rules
  - update debian/firefox-mozsymbols.install.pp

686. By Chris Coulson on 2010-10-01

* Drop the functionality to disable patches on a pre-release basis - we're not actually using it in this branch yet. We can always bring it back again if we need it

687. By Chris Coulson on 2010-10-01

* Don't export @BINREAL@ from debian/rules - this was an unnecessary hack not needed now we are using a preprocessor
  - update debian/rules
  - update debian/apport/firefox.pp

688. By Chris Coulson on 2010-10-01

* Tidy up the testsuite code a little

689. By Chris Coulson on 2010-10-02

Oops, MOZ_OBJDIR needs to be defined before including testsuite.mk

690. By Chris Coulson on 2010-10-02

B'ah! Set MOZ_OBJDIR correctly now

691. By Chris Coulson on 2010-10-02

* Merge 2 targets in debian/rules (again). Move the installation of the desktop files and Apparmor profile in to the debhelper files
  - update debian/rules
  - update debian/firefox.install.pp
  - remove debian/firefox.dirs.in
  - update debian/firefox-core.install.pp
  - update debian/abrowser.install.pp
  - remove debian/abrowser.dirs.in

692. By Chris Coulson on 2010-10-03

* Don't use relative paths in testsuite.mk - especially for , as this breaks the testsuite
  - update debian/testsuite.mk

693. By Chris Coulson on 2010-10-03

* Improve dependency tracking in the build, which also means the test-suite doesn't run twice
  - update debian/testsuite.mk
  - update debian/rules

694. By Chris Coulson on 2010-10-03

* Fix an issue with a missing leading slash on some paths, caused by r691
  - update debian/usr.bin.firefox.apparmor.10.10
  - update debian/usr.bin.firefox.apparmor.10.04
  - update debian/usr.bin.firefox.apparmor.9.10
  - update debian/firefox.sh.in
  - update debian/rules

695. By Chris Coulson on 2010-10-05

* General tidy-ups in debian/rules

696. By Chris Coulson on 2010-10-05

* Fix an issue substituting the branding name in to the desktop file. The intention was that the pre-release versions would have the version number in the name
  - update debian/rules

697. By Chris Coulson on 2010-10-06

* Add support for building with PGO. Add a build option (DEB_BUILD_PGO)
  which will run the build with make -f client.mk profiledbuild. This is
  off by default, and requires GCC 4.5 anyway
  - update debian/rules
  - update debian/mozconfig.pp

698. By Chris Coulson on 2010-10-11

* Disable some new IPC tests
  - update debian/testsuite.mk

699. By Chris Coulson on 2010-10-15

* Drop debian/patches/bz591331_att469858_breakpad_allow_ptrace.patch again now it's landed upstream

700. By Jamie Strandboge on 2010-10-18

AppArmor: allow mmap for temporary files that we own (LP: #662918)

701. By Jamie Strandboge on 2010-10-21

* AppArmor
  - add owner read to environ and auxv in @{PROC} as well as
    /etc/lsb-release read and expr ix for the crash reporter

702. By Jamie Strandboge on 2010-10-21

update path for Xubuntu default settings (LP: #664093)

703. By Chris Coulson on 2010-10-24

* Refresh patches after landing of (bmo: 601830) aka app.update.url.manual for
  nightly builds should point to the nightly builds
  - update debian/patches/firefox-profilename.patch

704. By Chris Coulson on 2010-10-24

* Fix a typo

705. By Chris Coulson on 2010-10-24

* Add temporary change to clean up rogue Apparmor profile on upgrade for
  current nightly testers
  - update debian/firefox-core.preinst.in

706. By Chris Coulson on 2010-10-25

* Disable gnomevfs support on >= 11.04 (LP: #661287)
  - update debian/rules
  - update debian/mozconfig.pp

707. By Chris Coulson on 2010-11-03

* Run all pre-processed files through the Mozilla preprocessor, rather than having 2 steps (using sed)

708. By Chris Coulson on 2010-11-03

* Drop abrowser from the Firefox source package:
  - remove debian/abrowser-gnome-support.install.in
  - remove debian/abrowser-gnome-support.postinst.in
  - remove debian/abrowser-gnome-support.prerm.in
  - remove debian/abrowser.desktop.in
  - remove debian/abrowser.install.in
  - remove debian/abrowser.links.in
  - remove debian/abrowser.xml.in
  - update debian/control
  - rename debian/firefox-core.dirs.in => debian/firefox.dirs.in
  - rename debian/firefox-core.docs.in => debian/firefox.docs.in
  - remove debian/firefox.install.in
  - rename debian/firefox-core.install.in => debian/firefox.install.in
  - update debian/firefox.install.in
  - remove debian/firefox.links.in
  - rename debian/firefox-core.links.in => debian/firefox.links.in
  - update debian/firefox.links.in
  - rename debian/firefox-core.postinst.in => debian/firefox.postinst.in
  - rename debian/firefox-core.postrm.in => debian/firefox.postrm.in
  - rename debian/firefox-core.preinst.in => debian/firefox.preinst.in
  - rename debian/firefox-core.prerm.in => debian/firefox.prerm.in
  - update debian/firefox.sh.in
  - update debian/mozclient/firefox-4.0.conf
  - remove debian/patches/awesome_branding_updates.patch
  - remove debian/patches/browser_branding.patch
  - update debian/patches/series
  - update debian/rules
  - remove debian/ubuntu-abrowser.js.in

709. By Chris Coulson on 2010-11-03

* New upstream snapshot 4.0 B8 HG20101103r56843

710. By Chris Coulson on 2010-11-03

* Don't build with -pie on Natty (LP: #663294)
  - update debian/rules

711. By Chris Coulson on 2010-11-03

* Fix a couple of small errors

712. By Chris Coulson on 2010-11-03

Revert r707 for now, as the preprocessor chokes on the include's in the apparmor profile

713. By Chris Coulson on 2010-11-03

* Revert a change from r711 too

714. By Chris Coulson on 2010-11-03

* Auto-generate debian/control in the clean target, auto-populating
  the build-depends
  - add debian/control.pp
  - update debian/rules
  - update debian/mozconfig.pp

715. By Chris Coulson on 2010-11-03

* Don't autogenerate debian/control automatically, it's too fragile. And work around a CDBS issue. *sigh*

716. By Chris Coulson on 2010-11-03

* Actually, revert the last commit. We should autogenerate debian/control in the clean target

717. By Chris Coulson on 2010-11-03

* Fix the logic for switching off gnomevfs support

718. By Chris Coulson on 2010-11-04

* Enable GIO support
  - update debian/mozconfig.pp

719. By Chris Coulson on 2010-11-04

* Fix the case where gnomevfs is disabled

720. By Chris Coulson on 2010-11-04

* Drop unneeded patches
  - remove debian/patches/bz386904_config_rules_install_dist_files.patch
  - remove debian/patches/ftbfs_crashreporter.patch
  - update debian/patches/series

721. By Chris Coulson on 2010-11-04

* Rewrite the launcher script to not wrap around the upstream start
  scripts, but start the Firefox binary directly. The upstream start scripts
  contain a lot of complexity for dealing with things that we don't need to
  worry about, and are quite slow. Also, add in the hooks for the new
  profile migrator
  - update debian/firefox.sh.in

722. By Chris Coulson on 2010-11-05

* Replace the old profile migrator. The previous one relied on hard-coded
  values and fragile shell script that isn't really scalable enough
  now that stable Ubuntu releases see new major Firefox versions. The
  new profile migrator doesn't require any hard-coded values, and should
  be lower maintenance
  - add debian/migrator/xulapp-profilemigrator
  - remove debian/migrator/main.c
  - update debian/rules
  - update debian/firefox.sh.in
  - update debian/firefox.install.pp
  - update debian/control

723. By Chris Coulson on 2010-11-05

* Don't run debian/control through the pre-processor, to avoid having to run pre-build as part of clean

724. By Chris Coulson on 2010-11-05

* Add a license header to the profile migrator

725. By Chris Coulson on 2010-11-05

* Fix a small error

726. By Chris Coulson on 2010-11-05

* Automate the checking of the version-compare logic in the profile migrator

727. By Chris Coulson on 2010-11-05

* Fix python-gtk2 depends

728. By Chris Coulson on 2010-11-05

* Display the StartupWMClass as the browser name in the profile migrator

729. By Chris Coulson on 2010-11-05

* Set WM Class and icon name on the dialog, and also make the primary text bigger

730. By Chris Coulson on 2010-11-05

* Add quotes around STARTUP_WM_CLASS in debian/firefox.sh.in, just in case the implementation has spaces in it

731. By Chris Coulson on 2010-11-08

* Refresh patches after landing of bmo: 596075 aka Move First-Run Video To
  Be A Tab Pointing To A Mozilla-Hosted Web Page
  - update debian/patches/firefox-profilename
* Refresh patches after landing of bmo: 588410 aka Fix make install to
  work with omnijar
  - remove debian/patches/bz588410_fix_make_install_with_omnijar.patch
  - update debian/patches/series
* Don't install run-mozilla.sh and upstream firefox shell script
  - update debian/firefox.install.pp
* Fix launcher script to work with FF-on-XR builds
  - rename debian/firefox.sh.in => debian/firefox.sh.pp
  - update debian/firefox.sh.pp

732. By Chris Coulson on 2010-11-08

* When importing settings from a beta profile, don't abandon the source profile. This was only necessary with the previous profile migrator because it triggered the dialog on discovery of non-abandoned beta profiles. The new one doesn't require this.

This means that the profile migrator now supports persistently named profiles, such as firefox-next and firefox-trunk, without breaking them every time the branch series is updated

733. By Chris Coulson on 2010-11-08

* Add another hunk for the last commit

734. By Chris Coulson on 2010-11-08

* Make the ASKLATER option in the profile migrator work correctly by writing the old series version to the state file if it doesn't already exists, so it triggers the migrator again on the next run

735. By Chris Coulson on 2010-11-08

* Fix some syntax errors in various places

736. By Chris Coulson on 2010-11-08

* Port bz460917_att350845_reload_new_plugins to Firefox 4 so that
  we can start the plugin installer without throwing an exception
  - update debian/patches/bz460917_att350845_reload_new_plugins.patch

737. By Chris Coulson on 2010-11-08

* Revert the compile-time checks to run-time checks in the launcher
  script, as the preprocessor removes the #!/bin/sh line
  - rename debian/firefox.sh.pp => debian/firefox.sh.in
  - update debian/firefox.sh.in
  - update debian/rules

738. By Chris Coulson on 2010-11-08

* Change the marker used by the preprocessor to %% (rather than #). This means we can run everything through the preprocessor without removing comments or other import lines from shell scripts, and means we drop the second step of running everythinh through sed

739. By Chris Coulson on 2010-11-09

* Remove an unneeded step from clean

740. By Chris Coulson on 2010-11-09

* Don't use update-notifier for the restart required notification - it
  is redundant having 2 separate mechanisms, and the update-notifier
  notification was never translated properly anyway. This means we rely
  on the in-browser notification from ubufox
  - remove debian/firefox-restart-required.update-notifier.in
  - update debian/firefox.install.in
  - update debian/firefox.postinst.in
  - update debian/rules

741. By Chris Coulson on 2010-11-10

* Build with --enable-jsd in the hope that Venkman might start working
  - update debian/mozconfig.in

742. By Chris Coulson on 2010-11-10

* Make sure our vendor.js preferences are included in the build
  - rename debian/ubuntu-firefox.js.in => debian/vendor.js.in
  - update debian/rules
  - update debian/patches/install_ubuntu_prefs.patch

743. By Chris Coulson on 2010-11-10

* Don't build with --enable-jsd, venkman is just totally broken on FF4.0 right now

744. By Chris Coulson on 2010-11-11

* Really don't build with -pie this time

745. By Chris Coulson on 2010-11-15

* Rebase patches after landing of bmo: 606289 aka Fix logo link in about:
  - update debian/patches/firefox-profilename

746. By Chris Coulson on 2010-11-15

* Add x-scheme-handler magic to desktop files
  - update debian/firefox.desktop.in
  - update debian/firefox-beta.desktop.in
  - update debian/firefox-nightly.desktop.in
  - update debian/firefox-unofficial.desktop.in

747. By Chris Coulson on 2010-11-15

* Revert r708 and add abrowser again

748. By Chris Coulson on 2010-11-15

* New upstream snapshot 4.0 B8 HG 20101115r57519

749. By Chris Coulson on 2010-11-16

* Consolidate some of the variables used in the debhelper files
* Add a fix for dealing with unversioned source packages
* Drop part of firefox-fsh to not hard-code the install locations to Firefox. This guarantees that we'll
  remain parallel installable with Firefox in Natty for now

750. By Chris Coulson on 2010-11-16

* Fix the profile migrator to not crash on profiles where
  'LastVersion=Safe Mode' (LP: #674607)
  - update debian/migrator/xulapp-profilemigrator

751. By Chris Coulson on 2010-11-23

* Bump minimum NSS / NSPR version
  - update debian/rules
* Fix the profile migrator to not hang when ~/.mozilla doesn't exist, and
  other improvements- update debian/migrator/xulapp-profilemigrator
  - update debian/migrator/xulapp-profilemigrator
* Build with --enable-startup-notification again, this got dropped
  in the 3.6 => 4.0 update
  - update debian/mozconfig.in
* Ship the testpilot extension for beta as per the official builds, based
  on the discussion on #developers. We achieve this by building with
  --enable-update-channel=beta for the beta milestones only. The update
  channel isn't used anywhere at runtime because we disable the updater.
  This means that Ubuntu users can participate in testpilot user studies
  in Natty
  - update debian/rules
  - update debian/firefox-core.install.in
  - update debian/mozconfig.in
* Add a hack to the launcher to handle being launched from an alternative,
  which is a symlink to the launcher script, and breaks the current launch
  mechanism. Also remove a useless stat() from the current script
  - update debian/firefox.sh.in
* Re-add patch that got dropped to not remove and re-add search plugins
  during upgrade
  - add debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch
  - update debian/patches/series

752. By Chris Coulson on 2010-11-23

Really add patch this time

753. By Jamie Strandboge on 2010-11-24

pull in natty apparmor changes

754. By Chris Coulson on 2010-11-26

* Move libmozgnome.so to the main package in common-binary-predeb-arch.
  The previous method of deleting it from -gnome-support and copying it to
  the main package from debian/tmp in each of the binary-predeb targets
  meant that we were shipping an unstripped copy, which caused a lintian
  error. This new method ensures we retain the stripped SO and we still
  only move it after dh_shlibdeps has run
  - update debian/rules

755. By Chris Coulson on 2010-11-26

* Refresh patches

756. By Jamie Strandboge on 2010-12-17

update AppArmor profiles to what is in firefox-4.0

757. By Micah Gersten on 2010-12-19

* Change xubuntu applications defaults list in natty apparmor profile; Path
  changed in xubuntu-default-settings (11.04.0)
  - update usr.bin.firefox.apparmor.11.04

758. By Jamie Strandboge on 2010-12-21

debian/usr.bin.firefox.apparmor.11.04: remove redundant abstractions

759. By Chris Coulson on 2010-12-29

* Merge from lp:~debfx/firefox/firefox-4.0-kde

760. By Chris Coulson on 2010-12-31

* Generate the en-US xpi at build time again for importing in to Launchpad
  - update debian/rules
  - update debian/translation-support/install.rdf.in

761. By Felix Geyer on 2011-01-08

Refresh KDE patches

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-16 22:53:52 +0000
+++ debian/changelog	2010-11-19 17:04:04 +0000
@@ -585,6 +585,16 @@
     - update debian/control
     - update debian/rules
 
+  [ Felix Geyer <[e-mail]> ]
+  * Re-add KDE integration
+    - add debian/patches/mozilla-kde.patch
+    - add debian/patches/firefox-kde.patch
+    - update debian/patches/series
+    - update debian/rules
+  * Make firefox-4.0 suggest firefox-kde-support
+    - update debian/control
+    - update debian/control.pp
+
  -- Chris Coulson <[e-mail]>  Tue, 16 Nov 2010 22:53:20 +0000
 
 firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low

=== modified file 'debian/control'
--- debian/control	2010-11-05 22:16:57 +0000
+++ debian/control	2010-11-19 17:04:04 +0000
@@ -59,7 +59,7 @@
 	kubuntu-firefox-installer,
         firefox-4.0-gnome-support,
 	firefox-4.0-core
-Suggests: firefox-4.0-gnome-support (= ${binary:Version}),
+Suggests: firefox-4.0-gnome-support (= ${binary:Version}) | firefox-kde-support,
 	latex-xft-fonts,
 	libthai0
 XB-Xul-AppId: {ec8030f7-c20a-464f-9b0e-13a3a9e97384}

=== modified file 'debian/control.pp'
--- debian/control.pp	2010-11-15 17:52:02 +0000
+++ debian/control.pp	2010-11-19 17:04:04 +0000
@@ -50,7 +50,7 @@
 	@APPNAME_OTHER@
 Replaces: firefox-4.0-branding, 
 	kubuntu-firefox-installer
-Suggests: @APPNAME@-gnome-support (= ${binary:Version})
+Suggests: @APPNAME@-gnome-support (= ${binary:Version}) | firefox-kde-support
 XB-Xul-AppId: {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 Description: Safe and easy web browser from Mozilla
  Firefox delivers safe, easy web browsing. A familiar user interface,

=== added file 'debian/patches/firefox-kde.patch'
--- debian/patches/firefox-kde.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/firefox-kde.patch	2010-11-19 17:04:04 +0000
@@ -0,0 +1,458 @@
+diff -Nur a/browser/app/Makefile.in b/browser/app/Makefile.in
+--- a/browser/app/Makefile.in
++++ b/browser/app/Makefile.in
+@@ -49,6 +49,7 @@
+ 
+ PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
+ 		  $(srcdir)/profile/channel-prefs.js \
++		  $(srcdir)/profile/kde.js \
+ 		  $(NULL)
+ 
+ 
+diff -Nur a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
+--- a/browser/base/content/browser-kde.xul
++++ b/browser/base/content/browser-kde.xul
+@@ -194,7 +194,7 @@
+       </row>
+       <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
+       <hbox id="editBookmarkPanelBottomButtons" pack="end">
+-#ifndef XP_UNIX
++#ifdef XP_UNIX
+         <button id="editBookmarkPanelDoneButton"
+                 class="editBookmarkPanelBottomButton"
+                 label="&editBookmark.done.label;"
+diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -25,6 +25,8 @@
+ *       content/browser/browser.css                   (content/browser.css)
+ *       content/browser/browser.js                    (content/browser.js)
+ *       content/browser/browser.xul                   (content/browser.xul)
++*       content/browser/browser-kde.xul               (content/browser-kde.xul)
++%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
+ *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
+ *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
+ *       content/browser/inspector.html                (content/inspector.html)
+diff -Nur a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
+--- a/browser/components/build/nsModule.cpp
++++ b/browser/components/build/nsModule.cpp
+@@ -46,7 +46,7 @@
+ #elif defined(XP_MACOSX)
+ #include "nsMacShellService.h"
+ #elif defined(MOZ_WIDGET_GTK2)
+-#include "nsGNOMEShellService.h"
++#include "nsUnixShellService.h"
+ #endif
+ 
+ #ifndef WINCE
+@@ -89,8 +89,6 @@
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
+ #elif defined(XP_MACOSX)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
+-#elif defined(MOZ_WIDGET_GTK2)
+-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
+ #endif
+ 
+ #ifndef WINCE
+@@ -156,7 +154,7 @@
+ #if defined(XP_WIN)
+     { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
+ #elif defined(MOZ_WIDGET_GTK2)
+-    { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor },
++    { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor },
+ #endif
+     { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
+     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
+diff -Nur 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
+@@ -57,7 +57,8 @@
+ CPPSRCS = nsMacShellService.cpp
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
+-CPPSRCS = nsGNOMEShellService.cpp
++CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+ endif
+ endif
+ endif
+diff -Nur a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
+--- a/browser/components/shell/src/nsKDEShellService.cpp
++++ b/browser/components/shell/src/nsKDEShellService.cpp
+@@ -0,0 +1,193 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is Shell Service.
++ *
++ * The Initial Developer of the Original Code is mozilla.org.
++ * Portions created by the Initial Developer are Copyright (C) 2004
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsKDEShellService.h"
++#include "nsShellService.h"
++#include "nsKDEUtils.h"
++#include "nsCOMPtr.h"
++#include "nsIPrefService.h"
++#include "nsIProcess.h"
++#include "nsILocalFile.h"
++#include "nsServiceManagerUtils.h"
++#include "nsComponentManagerUtils.h"
++
++nsresult
++nsKDEShellService::Init()
++    {
++    if( !nsKDEUtils::kdeSupport())
++        return NS_ERROR_NOT_AVAILABLE;
++    return NS_OK;
++    }
++
++NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService)
++
++NS_IMETHODIMP
++nsKDEShellService::IsDefaultBrowser(PRBool aStartupCheck,
++                                      PRBool* aIsDefaultBrowser)
++    {
++    *aIsDefaultBrowser = PR_FALSE;
++    if (aStartupCheck)
++        mCheckedThisSession = PR_TRUE;
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" ));
++    if( nsKDEUtils::command( command ))
++        *aIsDefaultBrowser = PR_TRUE;
++    return NS_OK;
++    }
++
++NS_IMETHODIMP
++nsKDEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
++                                       PRBool aForAllUsers)
++    {
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" ));
++    command.AppendCString( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" ));
++    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
++    }
++
++NS_IMETHODIMP
++nsKDEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
++{
++  // If we've already checked, the browser has been started and this is a 
++  // new window open, and we don't want to check again.
++  if (mCheckedThisSession) {
++    *aResult = PR_FALSE;
++    return NS_OK;
++  }
++
++  nsCOMPtr<nsIPrefBranch> prefs;
++  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
++  if (pserve)
++    pserve->GetBranch("", getter_AddRefs(prefs));
++
++  if (prefs)
++    prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult);
++
++  return NS_OK;
++}
++
++NS_IMETHODIMP
++nsKDEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck)
++{
++  nsCOMPtr<nsIPrefBranch> prefs;
++  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
++  if (pserve)
++    pserve->GetBranch("", getter_AddRefs(prefs));
++
++  if (prefs)
++    prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck);
++
++  return NS_OK;
++}
++
++NS_IMETHODIMP
++nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, 
++                                          PRInt32 aPosition)
++    {
++    return NS_ERROR_NOT_IMPLEMENTED;
++    }
++
++NS_IMETHODIMP
++nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor)
++    {
++    return NS_ERROR_NOT_IMPLEMENTED;
++    }
++
++NS_IMETHODIMP
++nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor)
++    {
++    return NS_ERROR_NOT_IMPLEMENTED;
++    }
++
++NS_IMETHODIMP
++nsKDEShellService::OpenApplication(PRInt32 aApplication)
++    {
++    nsCStringArray command;
++    if( aApplication == APPLICATION_MAIL )
++        command.AppendCString( NS_LITERAL_CSTRING( "OPENMAIL" ));
++    else if( aApplication == APPLICATION_NEWS )
++        command.AppendCString( NS_LITERAL_CSTRING( "OPENNEWS" ));
++    else
++        return NS_ERROR_NOT_IMPLEMENTED;
++    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
++    }
++
++NS_IMETHODIMP
++nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI)
++    {
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "RUN" ));
++    nsCString app;
++    nsresult rv = aApplication->GetNativePath( app );
++    NS_ENSURE_SUCCESS( rv, rv );
++    command.AppendCString( app );
++    command.AppendCString( aURI );
++    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
++    }
++
++NS_IMETHODIMP
++nsKDEShellService::GetDefaultFeedReader(nsILocalFile** _retval)
++    {
++    *_retval = nsnull;
++
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" ));
++    nsCStringArray output;
++    if( !nsKDEUtils::command( command, &output ) || output.Count() != 1 )
++        return NS_ERROR_FAILURE;
++
++    nsCString path;
++    path = *output[ 0 ];
++    if (path.IsEmpty())
++        return NS_ERROR_FAILURE;
++
++    nsresult rv;
++    nsCOMPtr<nsILocalFile> defaultReader =
++        do_CreateInstance("@mozilla.org/file/local;1", &rv);
++    NS_ENSURE_SUCCESS(rv, rv);
++
++    rv = defaultReader->InitWithNativePath(path);
++    NS_ENSURE_SUCCESS(rv, rv);
++
++    PRBool exists;
++    rv = defaultReader->Exists(&exists);
++    NS_ENSURE_SUCCESS(rv, rv);
++    if (!exists)
++        return NS_ERROR_FAILURE;
++
++    NS_ADDREF(*_retval = defaultReader);
++    return NS_OK;
++    }
+diff -Nur a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
+--- a/browser/components/shell/src/nsKDEShellService.h
++++ b/browser/components/shell/src/nsKDEShellService.h
+@@ -0,0 +1,59 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is Shell Service.
++ *
++ * The Initial Developer of the Original Code is mozilla.org.
++ * Portions created by the Initial Developer are Copyright (C) 2004
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#ifndef nskdeshellservice_h____
++#define nskdeshellservice_h____
++
++#include "nsIShellService.h"
++#include "nsStringAPI.h"
++
++class nsKDEShellService : public nsIShellService
++{
++public:
++  nsKDEShellService() : mCheckedThisSession(PR_FALSE) { }
++
++  NS_DECL_ISUPPORTS
++  NS_DECL_NSISHELLSERVICE
++
++  nsresult Init() NS_HIDDEN;
++
++private:
++  ~nsKDEShellService() {}
++
++  PRPackedBool mCheckedThisSession;
++};
++
++#endif // nskdeshellservice_h____
+diff -Nur a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp
+--- a/browser/components/shell/src/nsUnixShellService.cpp
++++ b/browser/components/shell/src/nsUnixShellService.cpp
+@@ -0,0 +1,52 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is Shell Service.
++ *
++ * The Initial Developer of the Original Code is mozilla.org.
++ * Portions created by the Initial Developer are Copyright (C) 2004
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsUnixShellService.h"
++#include "nsGNOMEShellService.h"
++#include "nsKDEShellService.h"
++#include "nsKDEUtils.h"
++#include "mozilla/ModuleUtils.h"
++
++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init)
++
++NS_METHOD
++nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
++{
++    if( nsKDEUtils::kdeSupport())
++        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
++    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
++}
+diff -Nur a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h
+--- a/browser/components/shell/src/nsUnixShellService.h
++++ b/browser/components/shell/src/nsUnixShellService.h
+@@ -0,0 +1,45 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is Shell Service.
++ *
++ * The Initial Developer of the Original Code is mozilla.org.
++ * Portions created by the Initial Developer are Copyright (C) 2004
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#ifndef nsunixshellservice_h____
++#define nsunixshellservice_h____
++
++#include "nsIShellService.h"
++
++NS_METHOD
++nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
++
++#endif // nsunixshellservice_h____
+diff -Nur a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -437,6 +437,7 @@
+ @BINPATH@/@PREF_DIR@/firefox.js
+ @BINPATH@/@PREF_DIR@/firefox-branding.js
+ @BINPATH@/@PREF_DIR@/channel-prefs.js
++@BINPATH@/@PREF_DIR@/kde.js
+ #ifdef MOZ_SERVICES_SYNC
+ @BINPATH@/@PREF_DIR@/services-sync.js
+ #endif
+--- /dev/null
++++ b/browser/app/profile/kde.js
+@@ -0,0 +1 @@
++pref("browser.preferences.instantApply", false);

=== added file 'debian/patches/mozilla-kde.patch'
--- debian/patches/mozilla-kde.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mozilla-kde.patch	2010-11-19 17:04:04 +0000
@@ -0,0 +1,1647 @@
+diff -Nur a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
+--- a/modules/libpref/src/Makefile.in	2010-11-15 21:39:52.000000000 +0100
++++ b/modules/libpref/src/Makefile.in	2010-11-18 12:18:51.850643351 +0100
+@@ -95,6 +95,8 @@
+ 	$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS)
+ endif
+ 
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
++
+ 
+ greprefs.js: $(GREPREF_FILES)
+ 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@
+diff -Nur a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp
+--- a/modules/libpref/src/nsPrefService.cpp	2010-11-15 21:41:29.000000000 +0100
++++ b/modules/libpref/src/nsPrefService.cpp	2010-11-18 12:18:51.850643351 +0100
+@@ -60,6 +60,7 @@
+ #include "nsCOMArray.h"
+ #include "nsXPCOMCID.h"
+ #include "nsAutoPtr.h"
++#include "nsKDEUtils.h"
+ 
+ #include "nsQuickSort.h"
+ #include "prmem.h"
+@@ -765,6 +766,24 @@
+   nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
+   if (NS_FAILED(rv)) return rv;
+ 
++  // make sure we load these special files after all the others
++  static const char* specialFiles[] = {
++#if defined(XP_UNIX)
++    ""
++#endif
++  };
++
++  if (nsKDEUtils::kdeSession()) {
++    for(int i = 0;
++        i < NS_ARRAY_LENGTH(specialFiles);
++        ++i ) {
++      if (*specialFiles[ i ] == '\0') {
++        specialFiles[ i ] = "kde.js";
++        break;
++      }
++    }
++  }
++
+   nsCOMPtr<nsISimpleEnumerator> dirList;
+   dirSvc->Get(listId,
+               NS_GET_IID(nsISimpleEnumerator),
+@@ -778,7 +797,7 @@
+         nsCOMPtr<nsIFile> dir = do_QueryInterface(elem);
+         if (dir) {
+           // Do we care if a file provided by this process fails to load?
+-          pref_LoadPrefsInDir(dir, nsnull, 0); 
++          pref_LoadPrefsInDir(dir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
+         }
+       }
+     }
+@@ -819,6 +838,7 @@
+       "winpref.js"
+ #elif defined(XP_UNIX)
+       "unix.js"
++      , "" // placeholder for KDE  (empty is otherwise harmless)
+ #if defined(VMS)
+       , "openvms.js"
+ #elif defined(_AIX)
+@@ -831,6 +851,17 @@
+ #endif
+   };
+ 
++  if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper?
++    for( int i = 0;
++         i < NS_ARRAY_LENGTH(specialFiles);
++         ++i ) {
++      if( *specialFiles[ i ] == '\0' ) {
++        specialFiles[ i ] = "kde.js";
++        break;
++      }
++    }
++  }
++
+   rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
+   if (NS_FAILED(rv)) {
+     NS_WARNING("Error parsing application default preferences.");
+diff -Nur a/toolkit/components/downloads/src/Makefile.in b/toolkit/components/downloads/src/Makefile.in
+--- a/toolkit/components/downloads/src/Makefile.in	2010-11-15 21:40:13.000000000 +0100
++++ b/toolkit/components/downloads/src/Makefile.in	2010-11-18 12:18:51.850643351 +0100
+@@ -76,3 +76,4 @@
+ 
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+ 
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+diff -Nur a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp
+--- a/toolkit/components/downloads/src/nsDownloadManager.cpp	2010-11-15 21:40:13.000000000 +0100
++++ b/toolkit/components/downloads/src/nsDownloadManager.cpp	2010-11-18 12:18:51.850643351 +0100
+@@ -76,6 +76,10 @@
+ #endif
+ #endif
+ 
++#if defined(XP_UNIX) && !defined(XP_MACOSX)
++#include "nsKDEUtils.h"
++#endif
++
+ #ifdef XP_MACOSX
+ #include <CoreFoundation/CoreFoundation.h>
+ #endif
+@@ -2195,6 +2199,15 @@
+         pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert);
+ 
+       if (showTaskbarAlert) {
++        if( nsKDEUtils::kdeSupport()) {
++            nsCStringArray command;
++            command.AppendCString( NS_LITERAL_CSTRING( "DOWNLOADFINISHED" ));
++            nsAutoString displayName;
++            GetDisplayName( displayName );
++            command.AppendCString( nsCAutoString( ToNewUTF8String( displayName )));
++            nsKDEUtils::command( command );
++        } else {
++        // begin non-KDE block
+         PRInt32 alertInterval = 2000;
+         if (pref)
+           pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);
+@@ -2230,6 +2243,7 @@
+                   EmptyString());
+             }
+         }
++        } // end non-KDE block
+       }
+ 
+ #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX)
+diff -Nur a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+--- a/toolkit/content/jar.mn	2010-11-15 21:40:16.000000000 +0100
++++ b/toolkit/content/jar.mn	2010-11-18 12:18:51.850643351 +0100
+@@ -45,6 +45,8 @@
+ *+ 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/filefield.xml       (widgets/filefield.xml)
+@@ -58,6 +60,8 @@
+ *+ 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)
+diff -Nur a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
+--- a/toolkit/content/widgets/dialog-kde.xml	2010-11-15 21:40:17.000000000 +0100
++++ b/toolkit/content/widgets/dialog-kde.xml	2010-11-18 12:18:51.850643351 +0100
+@@ -16,7 +16,7 @@
+           
+       <xul:hbox class="dialog-button-box" anonid="buttons"
+                 xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient"
+-#ifdef XP_UNIX
++#ifdef XP_UNIX_GNOME
+                 >
+         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+         <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
+@@ -25,6 +25,15 @@
+         <xul:spacer anonid="spacer" flex="1"/>
+         <xul:button dlgtype="cancel" class="dialog-button"/>
+         <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
++#elif XP_UNIX
++                pack="end">
++	<xul:button dlgtype="help" class="dialog-button" hidden="true"/>
++	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++	<xul:spacer anonid="spacer" flex="1" hidden="true"/>
++	<xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
++	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++	<xul:button dlgtype="cancel" class="dialog-button"/>
++	<xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+ #else
+                 pack="end">
+         <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+diff -Nur a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml
+--- a/toolkit/content/widgets/preferences-kde.xml	2010-11-15 21:40:17.000000000 +0100
++++ b/toolkit/content/widgets/preferences-kde.xml	2010-11-18 12:18:51.860642952 +0100
+@@ -573,7 +573,7 @@
+         </xul:deck>
+       </xul:hbox>
+       <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons"
+-#ifdef XP_UNIX
++#ifdef XP_UNIX_GNOME
+                 >
+         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+         <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
+@@ -582,6 +582,15 @@
+         <xul:spacer anonid="spacer" flex="1"/>
+         <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+         <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
++#elif XP_UNIX
++                pack="end">
++	<xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
++	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++	<xul:spacer anonid="spacer" flex="1"/>
++	<xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
++	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++	<xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
++	<xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+ #else
+                 pack="end">
+         <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+diff -Nur a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2010-11-15 21:40:41.000000000 +0100
++++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -49,6 +49,8 @@
+ #include "nsPrintfCString.h"
+ #include "nsNetUtil.h"
+ #include "nsISupportsPrimitives.h"
++#include "nsVoidArray.h"
++#include "nsKDEUtils.h"
+ 
+ class nsUnixSystemProxySettings : public nsISystemProxySettings {
+ public:
+@@ -65,6 +67,7 @@
+   PRBool IsProxyMode(const char* aMode);
+   nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult);
+   nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
++  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
+ };
+ 
+ NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
+@@ -406,12 +409,40 @@
+   rv = aURI->GetPort(&port);
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
++  if( nsKDEUtils::kdeSupport())
++    return GetProxyFromKDE( scheme, host, port, aResult );
++
+   if (!mGConf)
+     return GetProxyFromEnvironment(scheme, host, port, aResult);
+ 
+   return GetProxyFromGConf(scheme, host, port, aResult);
+ }
+ 
++nsresult
++nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,
++                                             const nsACString& aHost,
++                                             PRInt32 aPort,
++                                             nsACString& aResult)
++{
++  nsCAutoString url;
++  url = aScheme;
++  url += "://";
++  url += aHost;
++  if( aPort >= 0 )
++      {
++      url += ":";
++      url += nsPrintfCString("%d", aPort);
++      }
++  nsCStringArray command;
++  command.AppendCString( NS_LITERAL_CSTRING( "GETPROXY" ));
++  command.AppendCString( url );
++  nsCStringArray result;
++  if( !nsKDEUtils::command( command, &result ) || result.Count() != 1 )
++      return NS_ERROR_FAILURE;
++  aResult = *result[ 0 ];
++  return NS_OK;
++}
++
+ #define NS_UNIXSYSTEMPROXYSERVICE_CID  /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\
+      { 0x0fa3158c, 0xd5a7, 0x43de, \
+        {0x91, 0x81, 0xa2, 0x85, 0xe7, 0x4c, 0xf1, 0xd4 } }
+diff -Nur a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
+--- a/toolkit/xre/Makefile.in	2010-11-15 21:41:30.000000000 +0100
++++ b/toolkit/xre/Makefile.in	2010-11-18 12:18:51.860642952 +0100
+@@ -102,7 +102,8 @@
+ CPPSRCS += nsNativeAppSupportBeOS.cpp
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+-CPPSRCS += nsNativeAppSupportUnix.cpp
++CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp
++EXPORTS += nsKDEUtils.h
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+ CPPSRCS += nsNativeAppSupportQt.cpp
+diff -Nur a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
+--- a/toolkit/xre/nsKDEUtils.cpp	1970-01-01 01:00:00.000000000 +0100
++++ b/toolkit/xre/nsKDEUtils.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -0,0 +1,334 @@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is Unix Native App Support.
++ *
++ * The Initial Developer of the Original Code is
++ * Mozilla Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 2007
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsKDEUtils.h"
++#include "nsIWidget.h"
++
++#include <gtk/gtk.h>
++
++#include <limits.h>
++#include <stdio.h>
++#include <sys/wait.h>
++#include <unistd.h>
++#include <X11/Xlib.h>
++
++//#define DEBUG_KDE
++#ifdef DEBUG_KDE
++#define KMOZILLAHELPER "kmozillahelper"
++#else
++// not need for lib64, it's a binary
++#define KMOZILLAHELPER "/usr/lib/mozilla/kmozillahelper"
++#endif
++
++#define KMOZILLAHELPER_VERSION 6
++#define MAKE_STR2( n ) #n
++#define MAKE_STR( n ) MAKE_STR2( n )
++
++static bool getKdeSession()
++    {
++    Display* dpy = XOpenDisplay( NULL );
++    if( dpy == NULL )
++        return false;
++    Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", True );
++    bool kde = false;
++    if( kde_full_session != None )
++        {
++        int cnt;
++        if( Atom* props = XListProperties( dpy, DefaultRootWindow( dpy ), &cnt ))
++            {
++            for( int i = 0;
++                 i < cnt;
++                 ++i )
++                {
++                if( props[ i ] == kde_full_session )
++                    {
++                    kde = true;
++#ifdef DEBUG_KDE
++                    fprintf( stderr, "KDE SESSION %d\n", kde );
++#endif
++                    break;
++                    }
++                }
++            XFree( props );
++            }
++        }
++    XCloseDisplay( dpy );
++    return kde;
++    }
++
++static bool getKdeSupport()
++    {
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "CHECK" ));
++    command.AppendCString( NS_LITERAL_CSTRING( MAKE_STR( KMOZILLAHELPER_VERSION )));
++    bool kde = nsKDEUtils::command( command );
++#ifdef DEBUG_KDE
++    fprintf( stderr, "KDE RUNNING %d\n", kde );
++#endif
++    return kde;
++    }
++
++nsKDEUtils::nsKDEUtils()
++    : commandFile( NULL )
++    , replyFile( NULL )
++    {
++    }
++
++nsKDEUtils::~nsKDEUtils()
++    {
++//    closeHelper(); not actually useful, exiting will close the fd too
++    }
++
++nsKDEUtils* nsKDEUtils::self()
++    {
++    static nsKDEUtils s;
++    return &s;
++    }
++
++static bool helperRunning = false;
++static bool helperFailed = false;
++
++bool nsKDEUtils::kdeSession()
++    {
++    static bool session = getKdeSession();
++    return session;
++    }
++
++bool nsKDEUtils::kdeSupport()
++    {
++    static bool support = kdeSession() && getKdeSupport();
++    return support && helperRunning;
++    }
++
++struct nsKDECommandData
++    {
++    FILE* file;
++    nsCStringArray* output;
++    GMainLoop* loop;
++    bool success;
++    };
++
++static gboolean kdeReadFunc( GIOChannel*, GIOCondition, gpointer data )
++    {
++    nsKDECommandData* p = static_cast< nsKDECommandData* >( data );
++    char buf[ 8192 ]; // TODO big enough
++    bool command_done = false;
++    bool command_failed = false;
++    while( !command_done && !command_failed && fgets( buf, 8192, p->file ) != NULL )
++        { // TODO what if the kernel splits a line into two chunks?
++//#ifdef DEBUG_KDE
++//        fprintf( stderr, "READ: %s %d\n", buf, feof( p->file ));
++//#endif
++        if( char* eol = strchr( buf, '\n' ))
++            *eol = '\0';
++        command_done = ( strcmp( buf, "\\1" ) == 0 );
++        command_failed = ( strcmp( buf, "\\0" ) == 0 );
++        nsCAutoString line( buf );
++        line.ReplaceSubstring( "\\n", "\n" );
++        line.ReplaceSubstring( "\\" "\\", "\\" ); //  \\ -> \ , i.e. unescape
++        if( p->output && !( command_done || command_failed ))
++            p->output->AppendCString( nsCString( buf )); // TODO utf8?
++        }
++    bool quit = false;
++    if( feof( p->file ) || command_failed )
++        {
++        quit = true;
++        p->success = false;
++        }
++    if( command_done )
++        { // reading one reply finished
++        quit = true;
++        p->success = true;
++        }
++    if( quit )
++        {
++        if( p->loop )
++            g_main_loop_quit( p->loop );
++        return FALSE;
++        }
++    return TRUE;
++    }
++
++bool nsKDEUtils::command( const nsCStringArray& command, nsCStringArray* output )
++    {
++    return self()->internalCommand( command, NULL, false, output );
++    }
++
++bool nsKDEUtils::commandBlockUi( const nsCStringArray& command, const GtkWindow* parent, nsCStringArray* output )
++    {
++    return self()->internalCommand( command, parent, true, output );
++    }
++
++bool nsKDEUtils::internalCommand( const nsCStringArray& command, const GtkWindow* parent, bool blockUi,
++    nsCStringArray* output )
++    {
++    if( !startHelper())
++        return false;
++    // if Gtk has meanwhile gotten a grab (bnc#555202, somehow the file dialog
++    // is called with a delay), then do not do anything, as this app would keep
++    // the grabs but block waiting for the helper, which would be unable to do
++    // anything because of the grab
++    if( blockUi && gdk_pointer_is_grabbed())
++        return false;
++    feedCommand( command );
++    // do not store the data in 'this' but in extra structure, just in case there
++    // is reentrancy (can there be? the event loop is re-entered)
++    nsKDECommandData data;
++    data.file = replyFile;
++    data.output = output;
++    data.success = false;
++    if( blockUi )
++        {
++        data.loop = g_main_loop_new( NULL, FALSE );
++        GtkWidget* window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
++        if( parent && parent->group )
++            gtk_window_group_add_window( parent->group, GTK_WINDOW( window ));
++        gtk_widget_realize( window );
++        gtk_widget_set_sensitive( window, TRUE );
++        gtk_grab_add( window );
++        GIOChannel* channel = g_io_channel_unix_new( fileno( data.file ));
++        g_io_add_watch( channel, static_cast< GIOCondition >( G_IO_IN | G_IO_ERR | G_IO_HUP ), kdeReadFunc, &data );
++        g_io_channel_unref( channel );
++        g_main_loop_run( data.loop );
++        g_main_loop_unref( data.loop );
++        gtk_grab_remove( window );
++        gtk_widget_destroy( window );
++        }
++    else
++        {
++        data.loop = NULL;
++        while( kdeReadFunc( NULL, static_cast< GIOCondition >( 0 ), &data ))
++            ;
++        }
++    return data.success;
++    }
++
++bool nsKDEUtils::startHelper()
++    {
++    if( helperRunning )
++        return true;
++    if( helperFailed )
++        return false;
++    helperFailed = true;
++    int fdcommand[ 2 ];
++    int fdreply[ 2 ];
++    if( pipe( fdcommand ) < 0 )
++        return false;
++    if( pipe( fdreply ) < 0 )
++        {
++        close( fdcommand[ 0 ] );
++        close( fdcommand[ 1 ] );
++        return false;
++        }
++    char* args[ 2 ] = { const_cast< char* >( KMOZILLAHELPER ), NULL };
++    switch( fork())
++        {
++        case -1:
++            {
++            close( fdcommand[ 0 ] );
++            close( fdcommand[ 1 ] );
++            close( fdreply[ 0 ] );
++            close( fdreply[ 1 ] );
++            return false;
++            }
++        case 0: // child
++            {
++            if( dup2( fdcommand[ 0 ], STDIN_FILENO ) < 0 )
++                _exit( 1 );
++            if( dup2( fdreply[ 1 ], STDOUT_FILENO ) < 0 )
++                _exit( 1 );
++            int maxfd = 1024; // close all other fds
++            struct rlimit rl;
++            if( getrlimit( RLIMIT_NOFILE, &rl ) == 0 )
++                maxfd = rl.rlim_max;
++            for( int i = 3;
++                 i < maxfd;
++                 ++i )
++                close( i );
++#ifdef DEBUG_KDE
++            execvp( KMOZILLAHELPER, args );
++#else
++            execv( KMOZILLAHELPER, args );
++#endif
++            _exit( 1 ); // failed
++            }
++        default: // parent
++            {
++            commandFile = fdopen( fdcommand[ 1 ], "w" );
++            replyFile = fdopen( fdreply[ 0 ], "r" );
++            close( fdcommand[ 0 ] );
++            close( fdreply[ 1 ] );
++            if( commandFile == NULL || replyFile == NULL )
++                {
++                closeHelper();
++                return false;
++                }
++            // ok, helper ready, getKdeRunning() will check if it works
++            }
++        }
++    helperFailed = false;
++    helperRunning = true;
++    return true;
++    }
++
++void nsKDEUtils::closeHelper()
++    {
++    if( commandFile != NULL )
++        fclose( commandFile ); // this will also make the helper quit
++    if( replyFile != NULL )
++        fclose( replyFile );
++    helperRunning = false;
++    }
++
++void nsKDEUtils::feedCommand( const nsCStringArray& command )
++    {
++    for( int i = 0;
++         i < command.Count();
++         ++i )
++        {
++        nsCString line = *command[ i ];
++        line.ReplaceSubstring( "\\", "\\" "\\" ); // \ -> \\ , i.e. escape
++        line.ReplaceSubstring( "\n", "\\n" );
++#ifdef DEBUG_KDE
++        fprintf( stderr, "COMM: %s\n", line.get());
++#endif
++        fputs( line.get(), commandFile );
++        fputs( "\n", commandFile );
++        }
++    fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data
++    fflush( commandFile );
++    }
+diff -Nur a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h
+--- a/toolkit/xre/nsKDEUtils.h	1970-01-01 01:00:00.000000000 +0100
++++ b/toolkit/xre/nsKDEUtils.h	2010-11-18 12:18:51.860642952 +0100
+@@ -0,0 +1,77 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
++ *
++ * ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is Mozilla Communicator client code.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1998
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either of the GNU General Public License Version 2 or later (the "GPL"),
++ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#ifndef nsKDEUtils_h__
++#define nsKDEUtils_h__
++
++#include "nsStringGlue.h"
++#include "nsVoidArray.h"
++#include <stdio.h>
++
++typedef struct _GtkWindow GtkWindow;
++
++class NS_EXPORT nsKDEUtils
++    {
++    public:
++        /* Returns true if running inside a KDE session (regardless of whether there is KDE
++           support available for Firefox). This should be used e.g. when determining
++           dialog button order but not for code that requires the KDE support. */
++        static bool kdeSession();
++        /* Returns true if running inside a KDE session and KDE support is available
++           for Firefox. This should be used everywhere where the external helper is needed. */
++        static bool kdeSupport();
++        /* Executes the given helper command, returns true if helper returned success. */
++        static bool command( const nsCStringArray& command, nsCStringArray* output = NULL );
++        /* Like command(), but additionally blocks the parent widget like if there was
++           a modal dialog shown and enters the event loop (i.e. there are still paint updates,
++           this is for commands that take long). */
++        static bool commandBlockUi( const nsCStringArray& command, const GtkWindow* parent, nsCStringArray* output = NULL );
++    private:
++        nsKDEUtils();
++        ~nsKDEUtils();
++        static nsKDEUtils* self();
++        bool startHelper();
++        void closeHelper();
++        void feedCommand( const nsCStringArray& command );
++        bool internalCommand( const nsCStringArray& command, const GtkWindow* parent, bool isParent,
++            nsCStringArray* output );
++        FILE* commandFile;
++        FILE* replyFile;
++    };
++
++#endif // nsKDEUtils
+diff -Nur a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
+--- a/uriloader/exthandler/Makefile.in	2010-11-15 21:40:50.000000000 +0100
++++ b/uriloader/exthandler/Makefile.in	2010-11-18 12:18:51.860642952 +0100
+@@ -99,8 +99,9 @@
+ endif
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+-OSHELPER	+= nsGNOMERegistry.cpp
++OSHELPER	+= nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp
+ OSHELPER  += nsMIMEInfoUnix.cpp
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+ endif
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+diff -Nur a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
+--- a/uriloader/exthandler/unix/nsCommonRegistry.cpp	1970-01-01 01:00:00.000000000 +0100
++++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -0,0 +1,87 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the GNOME helper app implementation.
++ *
++ * The Initial Developer of the Original Code is
++ * IBM Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 2003
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *  Brian Ryner <[e-mail]>  (Original Author)
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsCommonRegistry.h"
++
++#include "nsGNOMERegistry.h"
++#include "nsKDERegistry.h"
++#include "nsString.h"
++#include "nsVoidArray.h"
++#include "nsKDEUtils.h"
++
++/* static */ PRBool
++nsCommonRegistry::HandlerExists(const char *aProtocolScheme)
++{
++    if( nsKDEUtils::kdeSupport())
++        return nsKDERegistry::HandlerExists( aProtocolScheme );
++    return nsGNOMERegistry::HandlerExists( aProtocolScheme );
++}
++
++/* static */ nsresult
++nsCommonRegistry::LoadURL(nsIURI *aURL)
++{
++    if( nsKDEUtils::kdeSupport())
++        return nsKDERegistry::LoadURL( aURL );
++    return nsGNOMERegistry::LoadURL( aURL );
++}
++
++/* static */ void
++nsCommonRegistry::GetAppDescForScheme(const nsACString& aScheme,
++                                     nsAString& aDesc)
++{
++    if( nsKDEUtils::kdeSupport())
++        return nsKDERegistry::GetAppDescForScheme( aScheme, aDesc );
++    return nsGNOMERegistry::GetAppDescForScheme( aScheme, aDesc );
++}
++
++
++/* static */ already_AddRefed<nsMIMEInfoBase>
++nsCommonRegistry::GetFromExtension(const nsACString& aFileExt)
++{
++    if( nsKDEUtils::kdeSupport())
++        return nsKDERegistry::GetFromExtension( aFileExt );
++    return nsGNOMERegistry::GetFromExtension( aFileExt );
++}
++
++/* static */ already_AddRefed<nsMIMEInfoBase>
++nsCommonRegistry::GetFromType(const nsACString& aMIMEType)
++{
++    if( nsKDEUtils::kdeSupport())
++        return nsKDERegistry::GetFromType( aMIMEType );
++    return nsGNOMERegistry::GetFromType( aMIMEType );
++}
+diff -Nur a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h
+--- a/uriloader/exthandler/unix/nsCommonRegistry.h	1970-01-01 01:00:00.000000000 +0100
++++ b/uriloader/exthandler/unix/nsCommonRegistry.h	2010-11-18 12:18:51.860642952 +0100
+@@ -0,0 +1,56 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the GNOME helper app implementation.
++ *
++ * The Initial Developer of the Original Code is
++ * IBM Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 2003
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *  Brian Ryner <[e-mail]>  (Original Author)
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsIURI.h"
++#include "nsCOMPtr.h"
++
++class nsMIMEInfoBase;
++
++class nsCommonRegistry
++{
++ public:
++  static PRBool HandlerExists(const char *aProtocolScheme);
++
++  static nsresult LoadURL(nsIURI *aURL);
++
++  static void GetAppDescForScheme(const nsACString& aScheme,
++                                  nsAString& aDesc);
++
++  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsACString& aFileExt);
++
++  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
++};
+diff -Nur a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
+--- a/uriloader/exthandler/unix/nsKDERegistry.cpp	1970-01-01 01:00:00.000000000 +0100
++++ b/uriloader/exthandler/unix/nsKDERegistry.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -0,0 +1,119 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the GNOME helper app implementation.
++ *
++ * The Initial Developer of the Original Code is
++ * IBM Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 2003
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *  Brian Ryner <[e-mail]>  (Original Author)
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsKDERegistry.h"
++#include "prlink.h"
++#include "prmem.h"
++#include "nsString.h"
++#include "nsILocalFile.h"
++#include "nsMIMEInfoUnix.h"
++#include "nsAutoPtr.h"
++#include "nsKDEUtils.h"
++
++/* static */ PRBool
++nsKDERegistry::HandlerExists(const char *aProtocolScheme)
++{
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "HANDLEREXISTS" ));
++    command.AppendCString( nsCAutoString( aProtocolScheme ));
++    return nsKDEUtils::command( command );
++}
++
++/* static */ nsresult
++nsKDERegistry::LoadURL(nsIURI *aURL)
++{
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "OPEN" ));
++    nsCString url;
++    aURL->GetSpec( url );
++    command.AppendCString( url );
++    return nsKDEUtils::command( command );
++}
++
++/* static */ void
++nsKDERegistry::GetAppDescForScheme(const nsACString& aScheme,
++                                     nsAString& aDesc)
++{
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "GETAPPDESCFORSCHEME" ));
++    command.AppendCString( aScheme );
++    nsCStringArray output;
++    if( nsKDEUtils::command( command, &output ) && output.Count() == 1 )
++        CopyUTF8toUTF16( *output[ 0 ], aDesc );
++}
++
++
++/* static */ already_AddRefed<nsMIMEInfoBase>
++nsKDERegistry::GetFromExtension(const nsACString& aFileExt)
++{
++    NS_ASSERTION(aFileExt[0] != '.', "aFileExt shouldn't start with a dot");
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "GETFROMEXTENSION" ));
++    command.AppendCString( aFileExt );
++    return GetFromHelper( command );
++}
++
++/* static */ already_AddRefed<nsMIMEInfoBase>
++nsKDERegistry::GetFromType(const nsACString& aMIMEType)
++{
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "GETFROMTYPE" ));
++    command.AppendCString( aMIMEType );
++    return GetFromHelper( command );
++}
++
++/* static */ already_AddRefed<nsMIMEInfoBase>
++nsKDERegistry::GetFromHelper(const nsCStringArray& command)
++{
++    nsCStringArray output;
++    if( nsKDEUtils::command( command, &output ) && output.Count() == 3 )
++        {
++        nsCString mimetype = *output[ 0 ];
++        nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix( mimetype );
++        NS_ENSURE_TRUE(mimeInfo, nsnull);
++        nsCString description = *output[ 1 ];
++        mimeInfo->SetDescription(NS_ConvertUTF8toUTF16(description));
++        nsCString handlerAppName = *output[ 2 ];
++        mimeInfo->SetDefaultDescription(NS_ConvertUTF8toUTF16(handlerAppName));
++        mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault);
++        nsMIMEInfoBase* retval;
++        NS_ADDREF((retval = mimeInfo));
++        return retval;
++        }
++    return nsnull;
++}
+diff -Nur a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
+--- a/uriloader/exthandler/unix/nsKDERegistry.h	1970-01-01 01:00:00.000000000 +0100
++++ b/uriloader/exthandler/unix/nsKDERegistry.h	2010-11-18 12:18:51.860642952 +0100
+@@ -0,0 +1,61 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the GNOME helper app implementation.
++ *
++ * The Initial Developer of the Original Code is
++ * IBM Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 2003
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *  Brian Ryner <[e-mail]>  (Original Author)
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the MPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the MPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include "nsIURI.h"
++#include "nsCOMPtr.h"
++
++class nsMIMEInfoBase;
++class nsCAutoString;
++class nsCStringArray;
++
++class nsKDERegistry
++{
++ public:
++  static PRBool HandlerExists(const char *aProtocolScheme);
++
++  static nsresult LoadURL(nsIURI *aURL);
++
++  static void GetAppDescForScheme(const nsACString& aScheme,
++                                  nsAString& aDesc);
++
++  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsACString& aFileExt);
++
++  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
++ private:
++  static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsCStringArray& command);
++
++};
+diff -Nur a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2010-11-15 21:40:50.000000000 +0100
++++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -53,18 +53,21 @@
+ #endif
+ 
+ #include "nsMIMEInfoUnix.h"
+-#include "nsGNOMERegistry.h"
++#include "nsCommonRegistry.h"
+ #include "nsIGIOService.h"
+ #include "nsIGnomeVFSService.h"
+ #include "nsAutoPtr.h"
+ #ifdef MOZ_ENABLE_DBUS
+ #include "nsDBusHandlerApp.h"
+ #endif
++#if defined(XP_UNIX) && !defined(XP_MACOSX)
++#include "nsKDEUtils.h"
++#endif
+ 
+ nsresult
+ nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
+ {
+-  nsresult rv = nsGNOMERegistry::LoadURL(aURI);
++  nsresult rv = nsCommonRegistry::LoadURL(aURI);
+ 
+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+   if (NS_FAILED(rv)){
+@@ -96,12 +99,12 @@
+ nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval)
+ {
+   *_retval = PR_FALSE;
+-  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
++  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
+   if (!mimeInfo) {
+     nsCAutoString ext;
+     nsresult rv = GetPrimaryExtension(ext);
+     if (NS_SUCCEEDED(rv)) {
+-      mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
++      mimeInfo = nsCommonRegistry::GetFromExtension(ext);
+     }
+   }
+   if (mimeInfo)
+@@ -154,6 +157,23 @@
+   return NS_ERROR_FAILURE;
+ #endif
+ 
++  if( nsKDEUtils::kdeSupport()) {
++    PRBool supports;
++    if( NS_SUCCEEDED( GetHasDefaultHandler( &supports )) && supports ) {
++      nsCStringArray command;
++      command.AppendCString( NS_LITERAL_CSTRING( "OPEN" ));
++      command.AppendCString( nativePath );
++      command.AppendCString( NS_LITERAL_CSTRING( "MIMETYPE" ));
++      command.AppendCString( mSchemeOrType );
++      if( nsKDEUtils::command( command ))
++        return NS_OK;
++    }
++    if (!mDefaultApplication)
++      return NS_ERROR_FILE_NOT_FOUND;
++
++    return LaunchWithIProcess(mDefaultApplication, nativePath);
++  }
++
+   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+   nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+   if (giovfs) {
+@@ -169,7 +189,7 @@
+ 
+   // If we haven't got an app we try to get a valid one by searching for the
+   // extension mapped type
+-  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
++  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath);
+   if (mimeInfo) {
+     nsCAutoString type;
+     mimeInfo->GetType(type);
+diff -Nur a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2010-11-15 21:40:50.000000000 +0100
++++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -49,7 +49,7 @@
+ #include "nsOSHelperAppService.h"
+ #include "nsMIMEInfoUnix.h"
+ #ifdef MOZ_WIDGET_GTK2
+-#include "nsGNOMERegistry.h"
++#include "nsCommonRegistry.h"
+ #endif
+ #include "nsISupports.h"
+ #include "nsString.h"
+@@ -1224,7 +1224,7 @@
+ 
+ #ifdef MOZ_WIDGET_GTK2
+   // Check the GConf registry for a protocol handler
+-  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
++  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+   *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
+ #endif
+@@ -1236,7 +1236,7 @@
+ NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval)
+ {
+ #ifdef MOZ_WIDGET_GTK2
+-  nsGNOMERegistry::GetAppDescForScheme(aScheme, _retval);
++  nsCommonRegistry::GetAppDescForScheme(aScheme, _retval);
+   return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK;
+ #else
+   return NS_ERROR_NOT_AVAILABLE;
+@@ -1332,7 +1332,7 @@
+     
+ #ifdef MOZ_WIDGET_GTK2
+     LOG(("Looking in GNOME registry\n"));
+-    nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromExtension(aFileExt).get();
++    nsMIMEInfoBase *gnomeInfo = nsCommonRegistry::GetFromExtension(aFileExt).get();
+     if (gnomeInfo) {
+       LOG(("Got MIMEInfo from GNOME registry\n"));
+       return gnomeInfo;
+@@ -1458,7 +1458,7 @@
+     // 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"));
+-    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get();
++    gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType).get();
+     if (gnomeInfo && gnomeInfo->HasExtensions()) {
+       LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
+       return gnomeInfo;
+diff -Nur a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
+--- a/widget/src/gtk2/Makefile.in	2010-11-15 21:40:52.000000000 +0100
++++ b/widget/src/gtk2/Makefile.in	2010-11-18 12:18:51.860642952 +0100
+@@ -162,6 +162,9 @@
+ 		-I$(srcdir)/../shared \
+ 		-I$(topsrcdir)/other-licenses/atk-1.0 \
+ 		$(NULL)
++
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
++
+ ifdef MOZ_X11
+ INCLUDES   	+= -I$(srcdir)/../shared/x11
+ endif
+diff -Nur a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
+--- a/widget/src/gtk2/nsFilePicker.cpp	2010-11-15 21:41:30.000000000 +0100
++++ b/widget/src/gtk2/nsFilePicker.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -36,6 +36,7 @@
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #include <gtk/gtk.h>
++#include <gdk/gdkx.h>
+ 
+ #include "nsIFileURL.h"
+ #include "nsIURI.h"
+@@ -55,6 +56,7 @@
+ 
+ #include "nsFilePicker.h"
+ #include "nsAccessibilityHelper.h"
++#include "nsKDEUtils.h"
+ 
+ #ifdef MOZ_PLATFORM_MAEMO
+ #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
+@@ -275,7 +277,9 @@
+ {
+   if (aFilter.EqualsLiteral("..apps")) {
+     // No platform specific thing we can do here, really....
+-    return NS_OK;
++    // Unless it's KDE.
++    if( mMode != modeOpen || !nsKDEUtils::kdeSupport())
++        return NS_OK;
+   }
+ 
+   nsCAutoString filter, name;
+@@ -423,6 +427,9 @@
+ NS_IMETHODIMP
+ nsFilePicker::Show(PRInt16 *aReturn)
+ {
++  if( nsKDEUtils::kdeSupport())
++      return kdeFileDialog( aReturn );
++
+   NS_ENSURE_ARG_POINTER(aReturn);
+ 
+   nsXPIDLCString title;
+@@ -573,3 +580,229 @@
+ 
+   return NS_OK;
+ }
++
++nsCString nsFilePicker::kdeMakeFilter( int index )
++    {
++    nsCString buf = mFilters[ index ];
++    for( PRUint32 i = 0;
++         i < buf.Length();
++         ++i )
++        if( buf[ i ] == ';' ) // KDE separates just using spaces
++            buf.SetCharAt( ' ', i );
++    if (!mFilterNames[index].IsEmpty())
++        {
++        buf += "|";
++        buf += mFilterNames[index].get();
++        }
++    return buf;
++    }
++
++static PRInt32 windowToXid( nsIWidget* widget )
++    {
++    GtkWindow *parent_widget = get_gtk_window_for_nsiwidget( widget );
++    GdkWindow* gdk_window = gtk_widget_get_window( gtk_widget_get_toplevel( GTK_WIDGET( parent_widget )));
++    return GDK_WINDOW_XID( gdk_window );
++    }
++
++NS_IMETHODIMP nsFilePicker::kdeFileDialog(PRInt16 *aReturn)
++    {
++    NS_ENSURE_ARG_POINTER(aReturn);
++
++    if( mMode == modeOpen && mFilters.Length() == 1 && mFilters[ 0 ].EqualsLiteral( "..apps" ))
++        return kdeAppsDialog( aReturn );
++
++    nsXPIDLCString title;
++    title.Adopt(ToNewUTF8String(mTitle));
++
++    const char* arg = NULL;
++    if( mAllowURLs )
++        {
++        switch( mMode )
++            {
++            case nsIFilePicker::modeOpen:
++            case nsIFilePicker::modeOpenMultiple:
++                arg = "GETOPENURL";
++                break;
++            case nsIFilePicker::modeSave:
++                arg = "GETSAVEURL";
++                break;
++            case nsIFilePicker::modeGetFolder:
++                arg = "GETDIRECTORYURL";
++                break;
++            }
++        }
++    else
++        {
++        switch( mMode )
++            {
++            case nsIFilePicker::modeOpen:
++            case nsIFilePicker::modeOpenMultiple:
++                arg = "GETOPENFILENAME";
++                break;
++            case nsIFilePicker::modeSave:
++                arg = "GETSAVEFILENAME";
++                break;
++            case nsIFilePicker::modeGetFolder:
++                arg = "GETDIRECTORYFILENAME";
++                break;
++            }
++        }
++
++  nsCAutoString directory;
++  if (mDisplayDirectory) {
++    mDisplayDirectory->GetNativePath(directory);
++  } else if (mPrevDisplayDirectory) {
++    mPrevDisplayDirectory->GetNativePath(directory);
++  }
++
++    nsCAutoString startdir;
++  if (!directory.IsEmpty()) {
++    startdir = directory;
++  }
++  if (mMode == nsIFilePicker::modeSave) {
++    if( !startdir.IsEmpty())
++      {
++      startdir += "/";
++      startdir += ToNewUTF8String(mDefault);
++      }
++    else
++      startdir = ToNewUTF8String(mDefault);
++  }
++  if( startdir.IsEmpty())
++      startdir = ".";
++
++    nsCAutoString filters;
++    PRInt32 count = mFilters.Length();
++    if( count == 0 ) //just in case
++        filters = "*";
++    else
++        {
++        filters = kdeMakeFilter( 0 );
++        for (PRInt32 i = 1; i < count; ++i)
++            {
++            filters += "\n";
++            filters += kdeMakeFilter( i );
++            }
++        }
++
++    nsCStringArray command;
++    command.AppendCString( nsCAutoString( arg ));
++    command.AppendCString( startdir );
++    if( mMode != nsIFilePicker::modeGetFolder )
++        {
++        command.AppendCString( filters );
++        nsCAutoString selected;
++        selected.AppendInt( mSelectedType );
++        command.AppendCString( selected );
++        }
++    command.AppendCString( title );
++    if( mMode == nsIFilePicker::modeOpenMultiple )
++        command.AppendCString( NS_LITERAL_CSTRING( "MULTIPLE" ));
++    if( PRInt32 xid = windowToXid( mParentWidget ))
++        {
++        command.AppendCString( NS_LITERAL_CSTRING( "PARENT" ));
++        nsCAutoString parent;
++        parent.AppendInt( xid );
++        command.AppendCString( parent );
++        }
++
++    nsCStringArray output;
++    if( nsKDEUtils::commandBlockUi( command, get_gtk_window_for_nsiwidget( mParentWidget ), &output ))
++        {
++        *aReturn = nsIFilePicker::returnOK;
++        mFiles.Clear();
++        if( mMode != nsIFilePicker::modeGetFolder )
++            {
++            mSelectedType = atoi( output[ 0 ]->get());
++            output.RemoveCStringAt( 0 );
++            }
++        if (mMode == nsIFilePicker::modeOpenMultiple)
++            {
++            mFileURL.Truncate();
++            PRUint32 count = output.Count();
++            for( PRUint32 i = 0;
++                 i < count;
++                 ++i )
++                {
++                nsCOMPtr<nsILocalFile> localfile;
++                nsresult rv = NS_NewNativeLocalFile( *output[ i ],
++                                      PR_FALSE,
++                                      getter_AddRefs(localfile));
++                if (NS_SUCCEEDED(rv))
++                    mFiles.AppendObject(localfile);
++                }
++            }
++        else
++            {
++            if( output.Count() == 0 )
++                mFileURL = nsCString();
++            else if( mAllowURLs )
++                mFileURL = *output[ 0 ];
++            else // GetFile() actually requires it to be url even for local files :-/
++                {
++                mFileURL = nsCString( "file://" );
++                mFileURL.Append( *output[ 0 ] );
++                }
++            }
++  // Remember last used directory.
++  nsCOMPtr<nsILocalFile> file;
++  GetFile(getter_AddRefs(file));
++  if (file) {
++    nsCOMPtr<nsIFile> dir;
++    file->GetParent(getter_AddRefs(dir));
++    nsCOMPtr<nsILocalFile> localDir(do_QueryInterface(dir));
++    if (localDir) {
++      localDir.swap(mPrevDisplayDirectory);
++    }
++  }
++        if (mMode == nsIFilePicker::modeSave)
++            {
++            nsCOMPtr<nsILocalFile> file;
++            GetFile(getter_AddRefs(file));
++            if (file)
++                {
++                PRBool exists = PR_FALSE;
++                file->Exists(&exists);
++                if (exists) // TODO do overwrite check in the helper app
++                    *aReturn = nsIFilePicker::returnReplace;
++                }
++            }
++        }
++    else
++        {
++        *aReturn = nsIFilePicker::returnCancel;
++        }
++    return NS_OK;
++    }
++
++
++NS_IMETHODIMP nsFilePicker::kdeAppsDialog(PRInt16 *aReturn)
++    {
++    NS_ENSURE_ARG_POINTER(aReturn);
++
++    nsXPIDLCString title;
++    title.Adopt(ToNewUTF8String(mTitle));
++
++    nsCStringArray command;
++    command.AppendCString( NS_LITERAL_CSTRING( "APPSDIALOG" ));
++    command.AppendCString( title );
++    if( PRInt32 xid = windowToXid( mParentWidget ))
++        {
++        command.AppendCString( NS_LITERAL_CSTRING( "PARENT" ));
++        nsCAutoString parent;
++        parent.AppendInt( xid );
++        command.AppendCString( parent );
++        }
++
++    nsCStringArray output;
++    if( nsKDEUtils::commandBlockUi( command, get_gtk_window_for_nsiwidget( mParentWidget ), &output ))
++        {
++        *aReturn = nsIFilePicker::returnOK;
++        mFileURL = output.Count() > 0 ? *output[ 0 ] : nsCString();
++        }
++    else
++        {
++        *aReturn = nsIFilePicker::returnCancel;
++        }
++    return NS_OK;
++    }
+diff -Nur a/widget/src/gtk2/nsFilePicker.h b/widget/src/gtk2/nsFilePicker.h
+--- a/widget/src/gtk2/nsFilePicker.h	2010-11-15 21:40:52.000000000 +0100
++++ b/widget/src/gtk2/nsFilePicker.h	2010-11-18 12:18:51.860642952 +0100
+@@ -94,6 +94,12 @@
+ 
+ private:
+   static nsILocalFile *mPrevDisplayDirectory;
++
++  bool kdeRunning();
++  bool getKdeRunning();
++  NS_IMETHODIMP kdeFileDialog(PRInt16 *aReturn);
++  NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn);
++  nsCString kdeMakeFilter( int index );
+ };
+ 
+ #endif
+diff -Nur a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
+--- a/xpcom/components/Makefile.in	2010-11-15 21:40:53.000000000 +0100
++++ b/xpcom/components/Makefile.in	2010-11-18 12:18:51.860642952 +0100
+@@ -99,5 +99,6 @@
+ DEFINES	+= -D_IMPL_NS_COM
+ 
+ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+ CXXFLAGS += $(MOZ_GTK2_CFLAGS)
+ endif
+diff -Nur a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
+--- a/xpcom/components/ManifestParser.cpp	2010-11-15 21:40:53.000000000 +0100
++++ b/xpcom/components/ManifestParser.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -60,6 +60,7 @@
+ #include "nsIScriptError.h"
+ #include "nsIXULAppInfo.h"
+ #include "nsIXULRuntime.h"
++#include "nsKDEUtils.h"
+ 
+ struct ManifestDirective
+ {
+@@ -427,6 +428,7 @@
+   NS_NAMED_LITERAL_STRING(kOs, "os");
+   NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
+   NS_NAMED_LITERAL_STRING(kABI, "abi");
++  NS_NAMED_LITERAL_STRING(kDesktop, "desktop");
+ 
+   // Obsolete
+   NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
+@@ -466,6 +468,7 @@
+   }
+ 
+   nsAutoString osVersion;
++  nsAutoString desktop;
+ #if defined(XP_WIN)
+   OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
+   if (GetVersionEx(&info)) {
+@@ -473,6 +476,7 @@
+                                          info.dwMajorVersion,
+                                          info.dwMinorVersion);
+   }
++  desktop = NS_LITERAL_STRING("win");
+ #elif defined(XP_MACOSX)
+   SInt32 majorVersion, minorVersion;
+   if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) &&
+@@ -481,10 +485,12 @@
+                                          majorVersion,
+                                          minorVersion);
+   }
++  desktop = NS_LITERAL_STRING("macosx");
+ #elif defined(MOZ_WIDGET_GTK2)
+   nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+                                        gtk_major_version,
+                                        gtk_minor_version);
++  desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome");
+ #endif
+ 
+   // Because contracts must be registered after CIDs, we save and process them
+@@ -563,6 +569,7 @@
+     TriState stABI = eUnspecified;
+     bool platform = false;
+     bool contentAccessible = false;
++    TriState stDesktop = eUnspecified;
+ 
+     while (NULL != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
+       ToLowerCase(token);
+@@ -571,6 +578,7 @@
+       if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||
+           CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
+           CheckStringFlag(kABI, wtoken, abi, stABI) ||
++          CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||
+           CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
+           CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion))
+         continue;
+@@ -599,6 +607,7 @@
+         stAppVersion == eBad ||
+         stOs == eBad ||
+         stOsVersion == eBad ||
++        stDesktop == eBad ||
+         stABI == eBad)
+       continue;
+ 
+diff -Nur a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
+--- a/xpcom/io/Makefile.in	2010-11-15 21:41:30.000000000 +0100
++++ b/xpcom/io/Makefile.in	2010-11-18 12:18:51.860642952 +0100
+@@ -197,7 +197,7 @@
+ endif
+ endif
+ 
+-LOCAL_INCLUDES	+= -I..
++LOCAL_INCLUDES	+= -I.. -I$(topsrcdir)/toolkit/xre
+ 
+ ifeq ($(MOZ_PLATFORM_MAEMO),5)
+ CFLAGS          += $(MOZ_DBUS_CFLAGS)
+diff -Nur a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+--- a/xpcom/io/nsLocalFileUnix.cpp	2010-11-15 21:40:56.000000000 +0100
++++ b/xpcom/io/nsLocalFileUnix.cpp	2010-11-18 12:18:51.860642952 +0100
+@@ -96,6 +96,7 @@
+ #ifdef MOZ_WIDGET_GTK2
+ #include "nsIGIOService.h"
+ #include "nsIGnomeVFSService.h"
++#include "nsKDEUtils.h"
+ #endif
+ 
+ #ifdef XP_MACOSX
+@@ -1823,21 +1824,13 @@
+ nsLocalFile::Reveal()
+ {
+ #ifdef MOZ_WIDGET_GTK2
+-    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+-    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+-    if (!giovfs && !gnomevfs)
+-        return NS_ERROR_FAILURE;
+-
++    nsCAutoString url;
+     PRBool isDirectory;
+     if (NS_FAILED(IsDirectory(&isDirectory)))
+         return NS_ERROR_FAILURE;
+ 
+     if (isDirectory) {
+-        if (giovfs)
+-            return giovfs->ShowURIForInput(mPath);
+-        else 
+-            /* Fallback to GnomeVFS */
+-            return gnomevfs->ShowURIForInput(mPath);
++        url = mPath;
+     } else {
+         nsCOMPtr<nsIFile> parentDir;
+         nsCAutoString dirPath;
+@@ -1846,11 +1839,25 @@
+         if (NS_FAILED(parentDir->GetNativePath(dirPath)))
+             return NS_ERROR_FAILURE;
+ 
+-        if (giovfs)
+-            return giovfs->ShowURIForInput(dirPath);
+-        else 
+-            return gnomevfs->ShowURIForInput(dirPath);        
++        url = dirPath;
++    }
++
++    if(nsKDEUtils::kdeSupport()) {
++      nsCStringArray command;
++      command.AppendCString( NS_LITERAL_CSTRING( "OPEN" ));
++      command.AppendCString( 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);
++    if (!giovfs && !gnomevfs)
++      return NS_ERROR_FAILURE;
++
++    if (giovfs)
++      return giovfs->ShowURIForInput(url);
++    else
++      return gnomevfs->ShowURIForInput(url);
+ #elif defined(XP_MACOSX)
+     CFURLRef url;
+     if (NS_SUCCEEDED(GetCFURL(&url))) {
+@@ -1886,6 +1893,13 @@
+       return NS_ERROR_FAILURE;
+     return NS_OK;
+ #else
++    if( nsKDEUtils::kdeSupport()) {
++      nsCStringArray command;
++      command.AppendCString( NS_LITERAL_CSTRING( "OPEN" ));
++      command.AppendCString( mPath );
++      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);
+     if (giovfs) {

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-15 17:52:02 +0000
+++ debian/patches/series	2010-11-19 17:04:04 +0000
@@ -14,3 +14,5 @@
 bzXXX_plugin_for_mimetype_pref.patch
 #bz467738_att351145_lockPref_everywhere.patch
 install_ubuntu_prefs.patch
+mozilla-kde.patch
+firefox-kde.patch

=== modified file 'debian/rules'
--- debian/rules	2010-11-16 13:10:55 +0000
+++ debian/rules	2010-11-19 17:04:04 +0000
@@ -402,6 +402,11 @@
 	                chmod a+x debian/$$i; \
 	        done
 
+	# KDE integration
+	cp $(DEB_SRCDIR)/toolkit/content/widgets/dialog.xml $(DEB_SRCDIR)/toolkit/content/widgets/dialog-kde.xml
+	cp $(DEB_SRCDIR)/toolkit/content/widgets/preferences.xml $(DEB_SRCDIR)/toolkit/content/widgets/preferences-kde.xml
+	cp $(DEB_SRCDIR)/browser/base/content/browser.xul $(DEB_SRCDIR)/browser/base/content/browser-kde.xul
+
 clean:: regen-debian-control
 	set -e; for i in $(UUDECODE); do \
 	        rm -f debian/$$i; \