commit 91202fbcdff7ad6488f4ed8192c3ccb8f82ac7c3
Author: Rosa <rosa@rosa-build.rosalab.ru>
Date:   Wed Feb 1 14:23:54 2012 +0400

    Automatic import for version 5.0.1

diff --git a/.abf.yml b/.abf.yml
new file mode 100644
index 0000000..ec5e3d6
--- /dev/null
+++ b/.abf.yml
@@ -0,0 +1,3 @@
+---
+sources:
+  firefox-5.0.1.source.tar.bz2: c93b3513e160d87535a9d61c5e06a6a701e9cd3e
diff --git a/firefox-3.6.3-appname.patch b/firefox-3.6.3-appname.patch
new file mode 100644
index 0000000..d4aa893
--- /dev/null
+++ b/firefox-3.6.3-appname.patch
@@ -0,0 +1,29 @@
+From: Wolfgang Rosenauer <wr@rosenauer.org>
+Subject: Hardcode app starter for default check
+
+diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
+--- a/browser/components/shell/src/nsGNOMEShellService.cpp
++++ b/browser/components/shell/src/nsGNOMEShellService.cpp
+@@ -127,17 +127,21 @@ nsGNOMEShellService::Init()
+   nsCOMPtr<nsILocalFile> appPath;
+   rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile),
+                    getter_AddRefs(appPath));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+-  return appPath->GetNativePath(mAppPath);
++  /* This path to firefox is hardcoded for the default path setting */
++  mAppPath.Assign ("/usr/bin/firefox");
++  
++  //return appPath->GetNativePath(mAppPath);
++  return NS_OK;
+ }
+ 
+ NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
+ 
+ PRBool
+ nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
+ {
+ 
diff --git a/firefox-5.0-asciidel.patch b/firefox-5.0-asciidel.patch
new file mode 100644
index 0000000..1916cb3
--- /dev/null
+++ b/firefox-5.0-asciidel.patch
@@ -0,0 +1,15 @@
+Patch from: Bill Nottingham <notting@redhat.com>
+
+diff -up mozilla-release/browser/base/Makefile.in.fu mozilla-release/browser/base/Makefile.in
+--- mozilla-release/browser/base/Makefile.in.fu	2011-06-24 16:50:23.802042086 -0400
++++ mozilla-release/browser/base/Makefile.in	2011-06-24 16:50:42.324042096 -0400
+@@ -62,7 +62,7 @@ EXTRA_JS_MODULES = \
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-PRE_RELEASE_SUFFIX := ""
++PRE_RELEASE_SUFFIX :=
+ 
+ DEFINES += \
+ 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+
diff --git a/firefox-5.0.1.source.tar.bz2.asc b/firefox-5.0.1.source.tar.bz2.asc
new file mode 100644
index 0000000..7a3b158
--- /dev/null
+++ b/firefox-5.0.1.source.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (Cygwin)
+
+iEYEABECAAYFAk4WvpQACgkQtXtUhBd4X+hPXACfcpm9QhgI7NnSEaQ3/ndVUx4k
+xHwAn2/1gNJw/ZBQajKTwv17L2Z8nrGx
+=1mKA
+-----END PGP SIGNATURE-----
diff --git a/firefox-disable-check-default-browser.patch b/firefox-disable-check-default-browser.patch
new file mode 100644
index 0000000..4cfef8a
--- /dev/null
+++ b/firefox-disable-check-default-browser.patch
@@ -0,0 +1,12 @@
+diff -Naur mozilla/browser/app/profile/firefox.js mozilla.tpg/browser/app/profile/firefox.js
+--- mozilla/browser/app/profile/firefox.js	2008-02-04 19:36:22.000000000 +0000
++++ mozilla.tpg/browser/app/profile/firefox.js	2008-02-29 21:26:08.000000000 +0000
+@@ -184,7 +184,7 @@
+ 
+ // Whether or not the application should check at startup each time if it 
+ // is the default browser.
+-pref("browser.shell.checkDefaultBrowser", true);
++pref("browser.shell.checkDefaultBrowser", false);
+ 
+ // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
+ // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
diff --git a/firefox-kde.patch b/firefox-kde.patch
new file mode 100644
index 0000000..cf97557
--- /dev/null
+++ b/firefox-kde.patch
@@ -0,0 +1,1646 @@
+diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
+--- a/browser/app/Makefile.in
++++ b/browser/app/Makefile.in
+@@ -44,16 +44,17 @@ srcdir		= @srcdir@
+ VPATH		= @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+ DIRS		= profile/extensions
+ 
+ PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
+ 		  $(srcdir)/profile/channel-prefs.js \
++		  $(srcdir)/profile/kde.js \
+ 		  $(NULL)
+ 
+ 
+ # hardcode en-US for the moment
+ AB_CD = en-US
+ 
+ DEFINES += -DAB_CD=$(AB_CD)
+ 
+diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
+new file mode 100644
+--- /dev/null
++++ b/browser/base/content/browser-kde.xul
+@@ -0,0 +1,1078 @@
++#filter substitution
++<?xml version="1.0"?>
++# -*- Mode: HTML -*-
++#
++# ***** 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, released
++# March 31, 1998.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1998-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#   Blake Ross <blake@cs.stanford.edu>
++#   David Hyatt <hyatt@mozilla.org>
++#   Joe Hewitt <hewitt@netscape.com>
++#   Pierre Chanial <chanial@noos.fr>
++#   Dean Tessman <dean_tessman@hotmail.com>
++#   Johnathan Nightingale <johnath@mozilla.com>
++#   Dão Gottwald <dao@mozilla.com>
++#   Ehsan Akhgari <ehsan.akhgari@gmail.com>
++#   Robert Strong <robert.bugzilla@gmail.com>
++#   Rob Campbell <rcampbell@mozilla.com>
++#   Patrick Walton <pcwalton@mozilla.com>
++#   David Dahl <ddahl@mozilla.com>
++#   Frank Yan <fyan@mozilla.com>
++#
++# 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 *****
++
++<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
++<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
++<?xml-stylesheet href="chrome://global/skin/webConsole.css" type="text/css"?>
++<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
++
++<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
++<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
++<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
++
++# All DTD information is stored in a separate file so that it can be shared by
++# hiddenWindow.xul.
++#include browser-doctype.inc
++
++<window id="main-window"
++        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++        xmlns:svg="http://www.w3.org/2000/svg"
++        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
++        onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();"
++        title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
++        title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
++#ifdef XP_MACOSX
++        title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
++        titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
++        titlemodifier=""
++        titlemodifier_normal=""
++        titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
++#else
++        title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
++        titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
++        titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
++        titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
++#endif
++        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
++        lightweightthemes="true"
++        lightweightthemesfooter="browser-bottombox"
++        windowtype="navigator:browser"
++        screenX="4" screenY="4"
++        browsingmode="normal"
++        persist="screenX screenY width height sizemode">
++
++# All JS files which are not content (only) dependent that browser.xul
++# wishes to include *must* go into the global-scripts.inc file
++# so that they can be shared by macBrowserOverlay.xul.
++#include global-scripts.inc
++<script type="application/javascript" src="chrome://browser/content/nsContextMenu.js"/>
++
++#ifdef MOZ_SAFE_BROWSING
++<script type="application/javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/>
++#endif
++<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
++
++<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
++
++# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
++# browser-sets.inc file for sharing with hiddenWindow.xul.
++#include browser-sets.inc
++
++  <popupset id="mainPopupSet">
++    <menupopup id="tabContextMenu"
++               onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"
++               onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
++      <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
++                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
++      <menuseparator/>
++      <menuitem id="context_pinTab" label="&pinAppTab.label;"
++                accesskey="&pinAppTab.accesskey;"
++                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
++      <menuitem id="context_unpinTab" label="&unpinAppTab.label;" hidden="true"
++                accesskey="&unpinAppTab.accesskey;"
++                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
++      <menu id="context_tabViewMenu" label="&moveToGroup.label;"
++            accesskey="&moveToGroup.accesskey;">
++        <menupopup id="context_tabViewMenuPopup"
++                   onpopupshowing="if (event.target == this) TabView.moveToGroupPopupShowing(event);">
++          <menuseparator id="context_tabViewNamedGroups" hidden="true"/>
++          <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;"
++                    oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
++        </menupopup>
++      </menu>
++      <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
++                accesskey="&moveToNewWindow.accesskey;"
++                tbattr="tabbrowser-multiple"
++                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
++      <menuseparator/>
++      <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
++                tbattr="tabbrowser-multiple"
++                oncommand="gBrowser.reloadAllTabs();"/>
++      <menuitem id="context_bookmarkAllTabs"
++                label="&bookmarkAllTabs.label;"
++                accesskey="&bookmarkAllTabs.accesskey;"
++                command="Browser:BookmarkAllTabs"/>
++      <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;"
++                oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
++      <menuseparator/>
++      <menuitem id="context_undoCloseTab"
++                label="&undoCloseTab.label;"
++                accesskey="&undoCloseTab.accesskey;"
++                observes="History:UndoCloseTab"/>
++      <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
++                oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
++    </menupopup>
++
++    <!-- bug 415444/582485: event.stopPropagation is here for the cloned version
++         of this menupopup -->
++    <menupopup id="backForwardMenu"
++               onpopupshowing="return FillHistoryMenu(event.target);"
++               oncommand="gotoHistoryIndex(event); event.stopPropagation();"
++               onclick="checkForMiddleClick(this, event);"/>
++    <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
++
++    <!-- for search and content formfill/pw manager -->
++    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
++
++    <!-- for url bar autocomplete -->
++    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
++
++    <!-- for invalid form error message -->
++    <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent">
++      <description/>
++    </panel>
++
++    <panel id="editBookmarkPanel"
++           type="arrow"
++           orient="vertical"
++           ignorekeys="true"
++           hidden="true"
++           onpopupshown="StarUI.panelShown(event);"
++           aria-labelledby="editBookmarkPanelTitle">
++      <row id="editBookmarkPanelHeader" align="center" hidden="true">
++        <vbox align="center">
++          <image id="editBookmarkPanelStarIcon"/>
++        </vbox>
++        <vbox>
++          <label id="editBookmarkPanelTitle"/>
++          <description id="editBookmarkPanelDescription"/>
++          <hbox>
++            <button id="editBookmarkPanelRemoveButton"
++                    class="editBookmarkPanelHeaderButton"
++                    oncommand="StarUI.removeBookmarkButtonCommand();"
++                    accesskey="&editBookmark.removeBookmark.accessKey;"/>
++          </hbox>
++        </vbox>
++      </row>
++      <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
++      <hbox id="editBookmarkPanelBottomButtons" pack="end">
++#ifdef XP_UNIX
++        <button id="editBookmarkPanelDoneButton"
++                class="editBookmarkPanelBottomButton"
++                label="&editBookmark.done.label;"
++                default="true"
++                oncommand="StarUI.panel.hidePopup();"/>
++        <button id="editBookmarkPanelDeleteButton"
++                class="editBookmarkPanelBottomButton"
++                label="&editBookmark.cancel.label;"
++                oncommand="StarUI.cancelButtonOnCommand();"/>
++#else
++        <button id="editBookmarkPanelDeleteButton"
++                class="editBookmarkPanelBottomButton"
++                label="&editBookmark.cancel.label;"
++                oncommand="StarUI.cancelButtonOnCommand();"/>
++        <button id="editBookmarkPanelDoneButton"
++                class="editBookmarkPanelBottomButton"
++                label="&editBookmark.done.label;"
++                default="true"
++                oncommand="StarUI.panel.hidePopup();"/>
++#endif
++      </hbox>
++    </panel>
++
++    <panel id="highlighter-panel"
++           hidden="true"
++           ignorekeys="true"
++           noautofocus="true"
++           noautohide="true"
++           onclick="InspectorUI.stopInspecting();"
++           onmousemove="InspectorUI.highlighter.handleMouseMove(event);"
++           onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/>
++
++    <panel id="inspector-tree-panel"
++           orient="vertical"
++           hidden="true"
++           ignorekeys="true"
++           noautofocus="true"
++           noautohide="true"
++           titlebar="normal"
++           close="true"
++           onpopuphiding="InspectorUI.closeInspectorUI(true);"
++           label="&inspectPanelTitle.label;">
++      <toolbar id="inspector-toolbar"
++               nowindowdrag="true">
++        <toolbarbutton id="inspector-inspect-toolbutton"
++                       label="&inspectButton.label;"
++                       accesskey="&inspectButton.accesskey;"
++                       class="toolbarbutton-text"
++                       command="Inspector:Inspect"/>
++        <toolbarbutton id="inspector-previous-toolbutton"
++                       label="&inspectPreviousButton.label;"
++                       accesskey="&inspectPreviousButton.accesskey;"
++                       class="toolbarbutton-text"
++                       command="Inspector:Previous"/>
++        <toolbarbutton id="inspector-next-toolbutton"
++                       label="&inspectNextButton.label;"
++                       accesskey="&inspectNextButton.accesskey;"
++                       class="toolbarbutton-text"
++                       command="Inspector:Next"/>
++        <toolbarbutton id="inspector-style-toolbutton"
++                       label="&inspectStyleButton.label;"
++                       accesskey="&inspectStyleButton.accesskey;"
++                       class="toolbarbutton-text"
++                       oncommand="InspectorUI.toggleStylePanel();"/>
++        <toolbarbutton id="inspector-dom-toolbutton"
++                       label="&inspectObjectButton.label;"
++                       accesskey="&inspectObjectButton.accesskey;"
++                       class="toolbarbutton-text"
++                       oncommand="InspectorUI.toggleDOMPanel();"/>
++      </toolbar>
++      <hbox id="tree-panel-resizer-box" align="end">
++        <spacer flex="1" />
++        <resizer dir="bottomend" />
++      </hbox>
++    </panel>
++
++    <panel id="inspector-style-panel"
++           hidden="true"
++           orient="vertical"
++           ignorekeys="true"
++           noautofocus="true"
++           noautohide="true"
++           titlebar="normal"
++           label="&inspectStylePanelTitle.label;">
++        <listbox id="inspector-style-listbox" flex="1"/>
++        <hbox align="end">
++          <spacer flex="1" />
++          <resizer dir="bottomend"/>
++        </hbox>
++    </panel>
++
++    <menupopup id="toolbar-context-menu"
++               onpopupshowing="onViewToolbarsPopupShowing(event);">
++      <menuseparator/>
++      <menuitem command="cmd_ToggleTabsOnTop"
++                type="checkbox"
++                label="&viewTabsOnTop.label;"
++                accesskey="&viewTabsOnTop.accesskey;"/>
++      <menuseparator/>
++      <menuitem command="cmd_CustomizeToolbars"
++                label="&viewCustomizeToolbar.label;"
++                accesskey="&viewCustomizeToolbar.accesskey;"/>
++    </menupopup>
++
++    <menupopup id="blockedPopupOptions"
++               onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"
++               onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);">
++      <menuitem observes="blockedPopupAllowSite"/>
++      <menuitem observes="blockedPopupEditSettings"/>
++      <menuitem observes="blockedPopupDontShowMessage"/>
++      <menuseparator observes="blockedPopupsSeparator"/>
++    </menupopup>
++
++    <menupopup id="autohide-context"
++           onpopupshowing="FullScreen.getAutohide(this.firstChild);">
++      <menuitem type="checkbox" label="&fullScreenAutohide.label;"
++                accesskey="&fullScreenAutohide.accesskey;"
++                oncommand="FullScreen.setAutohide();"/>
++      <menuseparator/>
++      <menuitem label="&fullScreenExit.label;"
++                accesskey="&fullScreenExit.accesskey;"
++                oncommand="BrowserFullScreen();"/>
++    </menupopup>
++
++    <menupopup id="contentAreaContextMenu"
++               onpopupshowing="if (event.target != this)
++                                 return true;
++                               gContextMenu = new nsContextMenu(this, gBrowser);
++                               if (gContextMenu.shouldDisplay)
++                                 updateEditUIVisibility();
++                               return gContextMenu.shouldDisplay;"
++               onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }">
++#include browser-context.inc
++    </menupopup>
++
++    <menupopup id="placesContext"/>
++
++    <panel id="notification-popup" type="arrow" position="after_start"
++           hidden="true" orient="vertical"/>
++
++    <!-- Popup for site identity information -->
++    <panel id="identity-popup"
++           type="arrow"
++           hidden="true"
++           noautofocus="true"
++           onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
++           level="top">
++      <hbox id="identity-popup-container" align="top">
++        <image id="identity-popup-icon"/>
++        <vbox id="identity-popup-content-box">
++          <label id="identity-popup-connectedToLabel"
++                 class="identity-popup-label"
++                 value="&identity.connectedTo;"/>
++          <label id="identity-popup-connectedToLabel2"
++                 class="identity-popup-label"
++                 value="&identity.unverifiedsite2;"/>
++          <description id="identity-popup-content-host"
++                       class="identity-popup-description"/>
++          <label id="identity-popup-runByLabel"
++                 class="identity-popup-label"
++                 value="&identity.runBy;"/>
++          <description id="identity-popup-content-owner"
++                       class="identity-popup-description"/>
++          <description id="identity-popup-content-supplemental"
++                       class="identity-popup-description"/>
++          <description id="identity-popup-content-verifier"
++                       class="identity-popup-description"/>
++          <hbox id="identity-popup-encryption" flex="1">
++            <vbox>
++              <image id="identity-popup-encryption-icon"/>
++            </vbox>
++            <description id="identity-popup-encryption-label" flex="1"
++                         class="identity-popup-description"/>
++          </hbox>
++          <!-- Footer button to open security page info -->
++          <hbox id="identity-popup-button-container" pack="end">
++            <button id="identity-popup-more-info-button"
++                    label="&identity.moreInfoLinkText;"
++                    onblur="gIdentityHandler.hideIdentityPopup();"
++                    oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
++          </hbox>
++        </vbox>
++      </hbox>
++    </panel>
++
++    <tooltip id="urlTooltip">
++      <label crop="center" flex="1" class="tooltip-label"/>
++    </tooltip>
++
++    <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
++      <hbox>
++        <button class="ctrlTab-preview" flex="1"/>
++        <button class="ctrlTab-preview" flex="1"/>
++        <button class="ctrlTab-preview" flex="1"/>
++        <button class="ctrlTab-preview" flex="1"/>
++        <button class="ctrlTab-preview" flex="1"/>
++        <button class="ctrlTab-preview" flex="1"/>
++      </hbox>
++      <hbox pack="center">
++        <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
++      </hbox>
++    </panel>
++
++    <panel id="allTabs-panel" hidden="true" norestorefocus="true" ignorekeys="true"
++           onmouseover="allTabs._updateTabCloseButton(event);">
++      <hbox id="allTabs-meta" align="center">
++        <spacer flex="1"/>
++        <textbox id="allTabs-filter"
++                 tooltiptext="&allTabs.filter.emptyText;"
++                 type="search"
++                 oncommand="allTabs.filter();"/>
++        <spacer flex="1"/>
++        <toolbarbutton class="KUI-panel-closebutton"
++                       oncommand="allTabs.close()"
++                       tooltiptext="&closeCmd.label;"/>
++      </hbox>
++      <stack id="allTabs-stack">
++        <vbox id="allTabs-container"><hbox/></vbox>
++        <toolbarbutton id="allTabs-tab-close-button"
++                       class="tabs-closebutton"
++                       oncommand="allTabs.closeTab(event);"
++                       tooltiptext="&closeCmd.label;"
++                       style="visibility:hidden"/>
++      </stack>
++    </panel>
++
++    <!-- Bookmarks and history tooltip -->
++    <tooltip id="bhTooltip"/>
++
++    <panel id="customizeToolbarSheetPopup"
++           noautohide="true">
++      <iframe id="customizeToolbarSheetIFrame"
++              style="&dialog.style;"
++              hidden="true"/>
++    </panel>
++
++    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
++  </popupset>
++
++#ifdef CAN_DRAW_IN_TITLEBAR
++<vbox id="titlebar">
++  <hbox id="titlebar-content">
++    <hbox id="appmenu-button-container">
++      <button id="appmenu-button"
++              type="menu"
++              label="&brandShortName;"
++              style="-moz-user-focus: ignore;">
++#include browser-appmenu.inc
++      </button>
++    </hbox>
++    <spacer id="titlebar-spacer" flex="1"/>
++    <hbox id="titlebar-buttonbox-container" align="start">
++      <hbox id="titlebar-buttonbox">
++        <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
++        <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
++        <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
++      </hbox>
++    </hbox>
++  </hbox>
++</vbox>
++#endif
++
++<deck flex="1" id="tab-view-deck">
++<vbox flex="1">
++
++  <toolbox id="navigator-toolbox"
++           defaultmode="icons" mode="icons"
++#ifdef WINCE
++           defaulticonsize="small" iconsize="small"
++#else
++           iconsize="large"
++#endif
++           tabsontop="true"
++           persist="tabsontop">
++    <!-- Menu -->
++    <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
++             defaultset="menubar-items"
++             mode="icons" iconsize="small" defaulticonsize="small"
++             lockiconsize="true"
++#ifdef MENUBAR_CAN_AUTOHIDE
++             toolbarname="&menubarCmd.label;"
++             accesskey="&menubarCmd.accesskey;"
++#endif
++             context="toolbar-context-menu">
++      <toolbaritem id="menubar-items" align="center">
++# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
++# hiddenWindow.xul.
++#include browser-menubar.inc
++      </toolbaritem>
++
++#ifdef CAN_DRAW_IN_TITLEBAR
++      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
++      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
++#endif
++    </toolbar>
++
++    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
++             toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
++             fullscreentoolbar="true" mode="icons" customizable="true"
++#ifdef WINCE
++             iconsize="small" defaulticonsize="small"
++             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls"
++#else
++             iconsize="large"
++             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
++#endif
++             context="toolbar-context-menu">
++
++      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
++                   context="backForwardMenu" removable="true"
++                   title="&backForwardItem.title;">
++        <toolbarbutton id="back-button" class="toolbarbutton-1"
++                       label="&backCmd.label;"
++                       command="Browser:BackOrBackDuplicate"
++                       onclick="checkForMiddleClick(this, event);"
++                       tooltiptext="&backButton.tooltip;"/>
++        <toolbarbutton id="forward-button" class="toolbarbutton-1"
++                       label="&forwardCmd.label;"
++                       command="Browser:ForwardOrForwardDuplicate"
++                       onclick="checkForMiddleClick(this, event);"
++                       tooltiptext="&forwardButton.tooltip;"/>
++      </toolbaritem>
++
++      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
++                   title="&locationItem.title;" class="chromeclass-location" removable="true">
++        <textbox id="urlbar" flex="1"
++                 placeholder="&urlbar.placeholder;"
++                 type="autocomplete"
++                 autocompletesearch="history"
++                 autocompletesearchparam="enable-actions"
++                 autocompletepopup="PopupAutoCompleteRichResult"
++                 completeselectedindex="true"
++                 tabscrolling="true"
++                 showcommentcolumn="true"
++                 showimagecolumn="true"
++                 enablehistory="true"
++                 maxrows="6"
++                 newlines="stripsurroundingwhitespace"
++                 oninput="gBrowser.userTypedValue = this.value;"
++                 ontextentered="this.handleCommand(param);"
++                 ontextreverted="return this.handleRevert();"
++                 pageproxystate="invalid"
++                 onsearchbegin="LocationBarHelpers._searchBegin();"
++                 onsearchcomplete="LocationBarHelpers._searchComplete();"
++                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
++                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
++          <box id="notification-popup-box" hidden="true" align="center">
++            <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
++            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
++            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
++            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
++            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
++          </box>
++          <!-- Use onclick instead of normal popup= syntax since the popup
++               code fires onmousedown, and hence eats our favicon drag events.
++               We only add the identity-box button to the tab order when the location bar
++               has focus, otherwise pressing F6 focuses it instead of the location bar -->
++          <box id="identity-box" role="button"
++               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
++               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
++               ondragstart="gIdentityHandler.onDragStart(event);">
++            <hbox id="identity-box-inner" align="center">
++              <stack id="page-proxy-stack"
++                     onclick="PageProxyClickHandler(event);">
++                <image id="urlbar-throbber" busy="false"/>
++                <image id="page-proxy-favicon" validate="never"
++                       pageproxystate="invalid"
++                       onerror="this.removeAttribute('src');"/>
++              </stack>
++              <hbox id="identity-icon-labels">
++                <label id="identity-icon-label" class="plain" flex="1"/>
++                <label id="identity-icon-country-label" class="plain"/>
++              </hbox>
++            </hbox>
++          </box>
++          <box id="urlbar-display-box" align="center">
++            <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
++          </box>
++          <hbox id="urlbar-icons">
++            <image id="page-report-button"
++                   class="urlbar-icon"
++                   hidden="true"
++                   tooltiptext="&pageReportIcon.tooltip;"
++                   onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
++
++            <image id="star-button"
++                   class="urlbar-icon"
++                   onclick="PlacesStarButton.onClick(event);"/>
++            <image id="go-button"
++                   class="urlbar-icon"
++                   tooltiptext="&goEndCap.tooltip;"
++                   onclick="gURLBar.handleCommand(event);"/>
++          </hbox>
++          <toolbarbutton id="urlbar-go-button"
++                         class="chromeclass-toolbar-additional"
++                         onclick="gURLBar.handleCommand(event);"
++                         tooltiptext="&goEndCap.tooltip;"/>
++          <toolbarbutton id="urlbar-reload-button"
++                         class="chromeclass-toolbar-additional"
++                         command="Browser:ReloadOrDuplicate"
++                         onclick="checkForMiddleClick(this, event);"
++                         tooltiptext="&reloadButton.tooltip;"/>
++          <toolbarbutton id="urlbar-stop-button"
++                         class="chromeclass-toolbar-additional"
++                         command="Browser:Stop"
++                         tooltiptext="&stopButton.tooltip;"/>
++        </textbox>
++      </toolbaritem>
++
++      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&reloadCmd.label;" removable="true"
++                     command="Browser:ReloadOrDuplicate"
++                     onclick="checkForMiddleClick(this, event);"
++                     tooltiptext="&reloadButton.tooltip;"/>
++
++      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&stopCmd.label;" removable="true"
++                     command="Browser:Stop"
++                     tooltiptext="&stopButton.tooltip;"/>
++
++      <toolbaritem id="search-container" title="&searchItem.title;"
++                   align="center" class="chromeclass-toolbar-additional"
++                   flex="100" persist="width" removable="true">
++        <searchbar id="searchbar" flex="1"/>
++      </toolbaritem>
++
++      <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     persist="class" removable="true"
++                     label="&homeButton.label;"
++                     ondragover="homeButtonObserver.onDragOver(event)"
++                     ondragenter="homeButtonObserver.onDragOver(event)"
++                     ondrop="homeButtonObserver.onDrop(event)"
++                     ondragexit="homeButtonObserver.onDragExit(event)"
++                     onclick="BrowserGoHome(event);"
++                     aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
++
++      <toolbaritem id="bookmarks-menu-button-container"
++                   class="chromeclass-toolbar-additional"
++                   removable="true"
++                   title="&bookmarksMenuButton.label;">
++        <toolbarbutton id="bookmarks-menu-button"
++                       type="menu"
++                       class="toolbarbutton-1"
++                       label="&bookmarksMenuButton.label;"
++                       tooltiptext="&bookmarksMenuButton.tooltip;"
++                       ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
++                       ondragover="PlacesMenuDNDHandler.onDragOver(event);"
++                       ondragexit="PlacesMenuDNDHandler.onDragExit(event);"
++                       ondrop="PlacesMenuDNDHandler.onDrop(event);">
++          <menupopup id="BMB_bookmarksPopup"
++                     placespopup="true"
++                     context="placesContext"
++                     openInTabs="children"
++                     oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
++                     onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
++                     onpopupshowing="BookmarksMenuButton.onPopupShowing(event);
++                                     if (!this.parentNode._placesView)
++                                       new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
++                     tooltip="bhTooltip" popupsinherittooltip="true">
++            <menuitem id="BMB_viewBookmarksToolbar"
++                      placesanonid="view-toolbar"
++                      toolbarId="PersonalToolbar"
++                      type="checkbox"
++                      oncommand="onViewToolbarCommand(event)"
++                      label="&viewBookmarksToolbar.label;"/>
++            <menuseparator/>
++            <menuitem id="BMB_bookmarksShowAll"
++                      label="&showAllBookmarks2.label;"
++                      command="Browser:ShowAllBookmarks"
++                      key="manBookmarkKb"/>
++            <menuseparator/>
++            <menuitem id="BMB_bookmarkThisPage"
++#ifndef XP_MACOSX
++                      class="menuitem-iconic"
++#endif
++                      label="&bookmarkThisPageCmd.label;"
++                      command="Browser:AddBookmarkAs"
++                      key="addBookmarkAsKb"/>
++            <menuitem id="BMB_subscribeToPageMenuitem"
++#ifndef XP_MACOSX
++                      class="menuitem-iconic"
++#endif
++                      label="&subscribeToPageMenuitem.label;"
++                      oncommand="return FeedHandler.subscribeToFeed(null, event);"
++                      onclick="checkForMiddleClick(this, event);"
++                      observes="singleFeedMenuitemState"/>
++            <menu id="BMB_subscribeToPageMenupopup"
++#ifndef XP_MACOSX
++                  class="menu-iconic"
++#endif
++                  label="&subscribeToPageMenupopup.label;"
++                  observes="multipleFeedsMenuState">
++              <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
++                         onpopupshowing="return FeedHandler.buildFeedList(event.target);"
++                         oncommand="return FeedHandler.subscribeToFeed(null, event);"
++                         onclick="checkForMiddleClick(this, event);"/>
++            </menu>
++            <menuseparator/>
++            <menu id="BMB_bookmarksToolbar"
++                  placesanonid="toolbar-autohide"
++                  class="menu-iconic bookmark-item"
++                  label="&personalbarCmd.label;"
++                  container="true">
++              <menupopup id="BMB_bookmarksToolbarPopup"
++                         placespopup="true"
++                         context="placesContext"
++                         onpopupshowing="if (!this.parentNode._placesView)
++                                           new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
++            </menu>
++            <menuseparator/>
++            <!-- Bookmarks menu items -->
++            <menuseparator builder="end"
++                           class="hide-if-empty-places-result"/>
++            <menuitem id="BMB_unsortedBookmarks"
++                      label="&bookmarksMenuButton.unsorted.label;"
++                      oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
++                      class="menuitem-iconic"/>
++          </menupopup>
++        </toolbarbutton>
++      </toolbaritem>
++
++      <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>
++      <hbox id="window-controls" hidden="true" fullscreencontrol="true">
++        <toolbarbutton id="minimize-button"
++                       tooltiptext="&fullScreenMinimize.tooltip;"
++                       oncommand="window.minimize();"/>
++
++        <toolbarbutton id="restore-button"
++                       tooltiptext="&fullScreenRestore.tooltip;"
++                       oncommand="BrowserFullScreen();"/>
++
++        <toolbarbutton id="close-button"
++                       tooltiptext="&fullScreenClose.tooltip;"
++                       oncommand="BrowserTryToCloseWindow();"/>
++      </hbox>
++    </toolbar>
++
++    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
++
++    <toolbar id="PersonalToolbar"
++             mode="icons" iconsize="small" defaulticonsize="small"
++             lockiconsize="true"
++             class="chromeclass-directories"
++             context="toolbar-context-menu"
++             defaultset="personal-bookmarks"
++             toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
++             collapsed="true"
++             customizable="true">
++      <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;"
++                   removable="true">
++        <hbox flex="1"
++              id="PlacesToolbar"
++              context="placesContext"
++              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
++              oncommand="BookmarksEventHandler.onCommand(event, this._placesView);"
++              tooltip="bhTooltip"
++              popupsinherittooltip="true">
++          <toolbarbutton class="bookmark-item bookmarks-toolbar-customize"
++                         mousethrough="never"
++                         label="&bookmarksToolbarItem.label;"/>
++          <hbox flex="1">
++            <hbox align="center">
++              <image id="PlacesToolbarDropIndicator"
++                     mousethrough="always"
++                     collapsed="true"/>
++            </hbox>
++            <scrollbox orient="horizontal"
++                       id="PlacesToolbarItems"
++                       flex="1"/>
++            <toolbarbutton type="menu"
++                           id="PlacesChevron"
++                           class="chevron"
++                           mousethrough="never"
++                           collapsed="true"
++                           tooltiptext="&bookmarksToolbarChevron.tooltip;"
++                           onpopupshowing="document.getElementById('PlacesToolbar')
++                                                   ._placesView._onChevronPopupShowing(event);">
++              <menupopup id="PlacesChevronPopup"
++                         placespopup="true"
++                         tooltip="bhTooltip" popupsinherittooltip="true"
++                         context="placesContext"/>
++            </toolbarbutton>
++          </hbox>
++        </hbox>
++      </toolbaritem>
++    </toolbar>
++
++#ifdef MENUBAR_CAN_AUTOHIDE
++#ifndef CAN_DRAW_IN_TITLEBAR
++#define APPMENU_ON_TABBAR
++#endif
++#endif
++
++
++    <toolbar id="TabsToolbar"
++             class="toolbar-primary"
++             fullscreentoolbar="true"
++             customizable="true"
++             mode="icons" lockmode="true"
++             iconsize="small" defaulticonsize="small" lockiconsize="true"
++             aria-label="&tabsToolbar.label;"
++             context="toolbar-context-menu"
++#ifdef APPMENU_ON_TABBAR
++             defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
++#else
++             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
++#endif
++             collapsed="true">
++
++#ifdef APPMENU_ON_TABBAR
++      <toolbarbutton id="appmenu-toolbar-button"
++                     class="chromeclass-toolbar-additional"
++                     type="menu"
++                     label="&brandShortName;"
++                     tooltiptext="&appMenuButton.tooltip;">
++#include browser-appmenu.inc
++      </toolbarbutton>
++#endif
++
++      <tabs id="tabbrowser-tabs"
++            class="tabbrowser-tabs"
++            tabbrowser="content"
++            flex="1"
++            setfocus="false"
++            tooltip="tabbrowser-tab-tooltip">
++        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
++      </tabs>
++
++      <toolbarbutton id="new-tab-button"
++                     class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&tabCmd.label;"
++                     command="cmd_newNavigatorTab"
++                     onclick="checkForMiddleClick(this, event);"
++                     tooltiptext="&newTabButton.tooltip;"
++                     ondrop="newTabButtonObserver.onDrop(event)"
++                     ondragover="newTabButtonObserver.onDragOver(event)"
++                     ondragenter="newTabButtonObserver.onDragOver(event)"
++                     ondragexit="newTabButtonObserver.onDragExit(event)"
++                     removable="true"/>
++
++      <toolbarbutton id="alltabs-button"
++                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
++                     type="menu"
++                     label="&listAllTabs.label;"
++                     tooltiptext="&listAllTabs.label;"
++                     removable="true">
++        <menupopup id="alltabs-popup"
++                   position="after_end">
++          <menuitem id="menu_tabview"
++                    class="menuitem-iconic"
++                    key="key_tabview"
++                    label="&viewTabGroups.label;"
++                    command="Browser:ToggleTabView"
++                    observes="tabviewGroupsNumber"
++                    keepme="true"/>
++          <menuseparator id="alltabs-popup-separator" keepme="true"/>
++        </menupopup>
++      </toolbarbutton>
++
++      <toolbarbutton id="tabs-closebutton"
++                     class="close-button tabs-closebutton"
++                     command="cmd_close"
++                     label="&closeTab.label;"
++                     tooltiptext="&closeTab.label;"/>
++
++#ifdef CAN_DRAW_IN_TITLEBAR
++      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
++      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
++#endif
++    </toolbar>
++
++    <toolbarpalette id="BrowserToolbarPalette">
++
++# Update primaryToolbarButtons in browser/themes/browserShared.inc when adding
++# or removing default items with the toolbarbutton-1 class.
++
++      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&printButton.label;" command="cmd_print"
++                     tooltiptext="&printButton.tooltip;"/>
++
++      <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center"
++                   mousethrough="always">
++        <image/>
++      </toolbaritem>
++
++      <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     observes="Tools:Downloads"
++                     ondrop="DownloadsButtonDNDObserver.onDrop(event)"
++                     ondragover="DownloadsButtonDNDObserver.onDragOver(event)"
++                     ondragenter="DownloadsButtonDNDObserver.onDragOver(event)"
++                     ondragexit="DownloadsButtonDNDObserver.onDragExit(event)"
++                     label="&downloads.label;"
++                     tooltiptext="&downloads.tooltip;"/>
++
++      <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     observes="viewHistorySidebar" label="&historyButton.label;"
++                     tooltiptext="&historyButton.tooltip;"/>
++
++      <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     observes="viewBookmarksSidebar"
++                     tooltiptext="&bookmarksButton.tooltip;"
++                     ondrop="bookmarksButtonObserver.onDrop(event)"
++                     ondragover="bookmarksButtonObserver.onDragOver(event)"
++                     ondragenter="bookmarksButtonObserver.onDragOver(event)"
++                     ondragexit="bookmarksButtonObserver.onDragExit(event)"/>
++
++      <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&newNavigatorCmd.label;"
++                     command="key_newNavigator"
++                     tooltiptext="&newWindowButton.tooltip;"
++                     ondrop="newWindowButtonObserver.onDrop(event)"
++                     ondragover="newWindowButtonObserver.onDragOver(event)"
++                     ondragenter="newWindowButtonObserver.onDragOver(event)"
++                     ondragexit="newWindowButtonObserver.onDragExit(event)"/>
++
++      <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&cutCmd.label;"
++                     command="cmd_cut"
++                     tooltiptext="&cutButton.tooltip;"/>
++
++      <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&copyCmd.label;"
++                     command="cmd_copy"
++                     tooltiptext="&copyButton.tooltip;"/>
++
++      <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&pasteCmd.label;"
++                     command="cmd_paste"
++                     tooltiptext="&pasteButton.tooltip;"/>
++
++      <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     observes="View:FullScreen"
++                     type="checkbox"
++                     label="&fullScreenCmd.label;"
++                     tooltiptext="&fullScreenButton.tooltip;"/>
++
++      <toolbaritem id="zoom-controls" class="chromeclass-toolbar-additional"
++                   title="&zoomControls.label;">
++        <toolbarbutton id="zoom-out-button" class="toolbarbutton-1"
++                       label="&fullZoomReduceCmd.label;"
++                       command="cmd_fullZoomReduce"
++                       tooltiptext="&zoomOutButton.tooltip;"/>
++        <toolbarbutton id="zoom-in-button" class="toolbarbutton-1"
++                       label="&fullZoomEnlargeCmd.label;"
++                       command="cmd_fullZoomEnlarge"
++                       tooltiptext="&zoomInButton.tooltip;"/>
++      </toolbaritem>
++#ifdef MOZ_SERVICES_SYNC
++      <toolbarbutton id="sync-button"
++                     class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&syncToolbarButton.label;"
++                     oncommand="gSyncUI.handleToolbarButton()"/>
++#endif
++      <toolbarbutton id="feed-button"
++                     type="menu"
++                     class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     disabled="true"
++                     label="&feedButton.label;"
++                     tooltiptext="&feedButton.tooltip;"
++                     onclick="return FeedHandler.onFeedButtonClick(event);">
++        <menupopup position="after_end"
++                   id="feed-menu"
++                   onpopupshowing="return FeedHandler.buildFeedList(this);"
++                   oncommand="return FeedHandler.subscribeToFeed(null, event);"
++                   onclick="checkForMiddleClick(this, event);"/>
++      </toolbarbutton>
++
++      <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                     label="&tabGroupsButton.label;"
++                     command="Browser:ToggleTabView"
++                     tooltiptext="&tabGroupsButton.tooltip;"
++                     observes="tabviewGroupsNumber"/>
++    </toolbarpalette>
++  </toolbox>
++
++  <hbox flex="1" id="browser">
++    <vbox id="browser-border-start" hidden="true" layer="true"/>
++    <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
++      <sidebarheader id="sidebar-header" align="center">
++        <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
++        <image id="sidebar-throbber"/>
++        <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
++      </sidebarheader>
++      <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
++                style="min-width: 14em; width: 18em; max-width: 36em;"/>
++    </vbox>
++
++    <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/>
++    <vbox id="appcontent" flex="1">
++      <tabbrowser id="content" disablehistory="true"
++                  flex="1" contenttooltip="aHTMLTooltip"
++                  tabcontainer="tabbrowser-tabs"
++                  contentcontextmenu="contentAreaContextMenu"
++                  autocompletepopup="PopupAutoComplete"
++                  onclick="return contentAreaClick(event, false);"/>
++      <statuspanel id="statusbar-display" label=""/>
++    </vbox>
++    <vbox id="browser-border-end" hidden="true" layer="true"/>
++  </hbox>
++
++  <vbox id="browser-bottombox" layer="true">
++    <toolbar id="addon-bar"
++             toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
++             collapsed="true"
++             class="toolbar-primary chromeclass-toolbar"
++             context="toolbar-context-menu" toolboxid="navigator-toolbox"
++             mode="icons" iconsize="small" defaulticonsize="small"
++             lockiconsize="true"
++             defaultset="addonbar-closebutton,spring,status-bar"
++             customizable="true"
++             key="key_toggleAddonBar">
++      <toolbarbutton id="addonbar-closebutton"
++                     tooltiptext="&addonBarCloseButton.tooltip;"
++                     oncommand="setToolbarVisibility(this.parentNode, false);"/>
++      <statusbar id="status-bar" ordinal="1000"/>
++    </toolbar>
++  </vbox>
++
++#ifndef XP_UNIX
++  <svg:svg height="0">
++    <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
++      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
++      <svg:circle cx="-0.46" cy="0.5" r="0.63"/>
++    </svg:mask>
++    <svg:mask id="winstripe-keyhole-forward-mask-hover" maskContentUnits="objectBoundingBox">
++      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
++      <svg:circle cx="-0.35" cy="0.5" r="0.58"/>
++    </svg:mask>
++  </svg:svg>
++#endif
++#ifdef XP_MACOSX
++  <svg:svg height="0">
++    <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
++      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
++      <svg:circle cx="-0.46" cy="0.48" r="0.65"/>
++    </svg:mask>
++    <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
++      <svg:circle cx="9" cy="3" r="3" fill="white"/>
++      <svg:rect x="9" y="0" width="3" height="3" fill="white"/>
++      <svg:rect x="6" y="3" width="6" height="19" fill="white"/>
++      <svg:rect x="1" y="17" width="5" height="5" fill="white"/>
++      <svg:circle cx="1" cy="17" r="5"/>
++      <svg:rect x="0" y="22" width="12" height="1" fill="white"/>
++    </svg:mask>
++    <svg:mask id="pinstripe-tab-ontop-right-curve-mask" maskContentUnits="userSpaceOnUse">
++      <svg:circle cx="3" cy="3" r="3" fill="white"/>
++      <svg:rect x="0" y="0" width="3" height="3" fill="white"/>
++      <svg:rect x="0" y="3" width="6" height="19" fill="white"/>
++      <svg:rect x="6" y="17" width="5" height="5" fill="white"/>
++      <svg:circle cx="11" cy="17" r="5"/>
++      <svg:rect x="0" y="22" width="12" height="1" fill="white"/>
++    </svg:mask>
++    <svg:mask id="pinstripe-tab-onbottom-left-curve-mask" maskContentUnits="userSpaceOnUse">
++      <svg:circle cx="9" cy="20" r="3" fill="white"/>
++      <svg:rect x="9" y="20" width="3" height="3" fill="white"/>
++      <svg:rect x="6" y="1" width="6" height="19" fill="white"/>
++      <svg:rect x="1" y="1" width="5" height="5" fill="white"/>
++      <svg:circle cx="1" cy="6" r="5"/>
++      <svg:rect x="0" y="0" width="12" height="1" fill="white"/>
++    </svg:mask>
++    <svg:mask id="pinstripe-tab-onbottom-right-curve-mask" maskContentUnits="userSpaceOnUse">
++      <svg:circle cx="3" cy="20" r="3" fill="white"/>
++      <svg:rect x="0" y="20" width="3" height="3" fill="white"/>
++      <svg:rect x="0" y="1" width="6" height="19" fill="white"/>
++      <svg:rect x="6" y="1" width="5" height="5" fill="white"/>
++      <svg:circle cx="11" cy="6" r="5"/>
++      <svg:rect x="0" y="0" width="12" height="1" fill="white"/>
++    </svg:mask>
++  </svg:svg>
++#endif
++
++</vbox>
++# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
++#     Introducing the iframe dynamically, as needed, was found to be better than
++#     starting with an empty iframe here in browser.xul from a Ts standpoint.
++</deck>
++
++</window>
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -22,16 +22,18 @@ browser.jar:
+ *       content/browser/aboutHome.css                 (content/aboutHome.css)
+         content/browser/aboutHome-restore-icon.png    (content/aboutHome-restore-icon.png)
+         content/browser/aboutHome-restore-icon-small.png    (content/aboutHome-restore-icon-small.png)
+         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
+         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
+ *       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)
+ *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
+ *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
+ *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
+ *       content/browser/pageinfo/pageInfo.xml         (content/pageinfo/pageInfo.xml)
+ *       content/browser/pageinfo/feeds.js             (content/pageinfo/feeds.js)
+diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
+--- a/browser/components/build/nsModule.cpp
++++ b/browser/components/build/nsModule.cpp
+@@ -41,17 +41,17 @@
+ #include "nsBrowserCompsCID.h"
+ #include "DirectoryProvider.h"
+ 
+ #if defined(XP_WIN)
+ #include "nsWindowsShellService.h"
+ #elif defined(XP_MACOSX)
+ #include "nsMacShellService.h"
+ #elif defined(MOZ_WIDGET_GTK2)
+-#include "nsGNOMEShellService.h"
++#include "nsUnixShellService.h"
+ #endif
+ 
+ #ifndef WINCE
+ 
+ #include "nsProfileMigrator.h"
+ #include "nsDogbertProfileMigrator.h"
+ #if !defined(XP_OS2)
+ #include "nsOperaProfileMigrator.h"
+@@ -82,18 +82,16 @@ using namespace mozilla::browser;
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ 
+ NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
+ #if defined(XP_WIN)
+ 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
+ 
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
+ #if !defined(XP_OS2)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
+ #endif
+@@ -145,17 +143,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM
+ #endif /* WINCE */
+ NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
+ 
+ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
+     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
+ #if defined(XP_WIN)
+     { &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 },
+ #ifndef WINCE
+     { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor },
+ #if defined(XP_WIN) && !defined(__MINGW32__)
+     { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
+ #elif defined(XP_MACOSX)
+diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
+--- a/browser/components/preferences/advanced.js
++++ b/browser/components/preferences/advanced.js
+@@ -683,24 +683,42 @@ var gAdvancedPane = {
+     var brandBundle = document.getElementById("bundleBrand");
+     var shellBundle = document.getElementById("bundleShell");
+     var brandShortName = brandBundle.getString("brandShortName");
+     var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
+     var promptMessage;
+     const IPS = Components.interfaces.nsIPromptService;
+     var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                          .getService(IPS);
++
++    var env = Components.classes["@mozilla.org/process/environment;1"]
++                        .getService(Components.interfaces.nsIEnvironment);
++    var kde_session = 0;
++    if (env.get('KDE_FULL_SESSION') == "true")
++      kde_session = 1;
++
+     if (!shellSvc.isDefaultBrowser(false)) {
+       promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", 
+                                                      [brandShortName]);
+       var rv = psvc.confirmEx(window, promptTitle, promptMessage, 
+                               IPS.STD_YES_NO_BUTTONS,
+                               null, null, null, null, { });
+-      if (rv == 0)
++      if (rv == 0) {
+         shellSvc.setDefaultBrowser(true, false);
++        if (kde_session == 1) {
++          var shellObj = Components.classes["@mozilla.org/file/local;1"]
++                                   .createInstance(Components.interfaces.nsILocalFile);
++          shellObj.initWithPath("/usr/bin/kwriteconfig");
++          var process = Components.classes["@mozilla.org/process/util;1"]
++                                  .createInstance(Components.interfaces.nsIProcess);
++          process.init(shellObj);
++          var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"];
++          process.run(false, args, args.length);
++        }
++      }
+     }
+     else {
+       promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
+                                                      [brandShortName]);
+       psvc.alert(window, promptTitle, promptMessage);
+     }
+   }
+ #endif
+diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
+--- a/browser/components/shell/src/Makefile.in
++++ b/browser/components/shell/src/Makefile.in
+@@ -52,17 +52,18 @@ endif
+ 
+ ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
+ CPPSRCS = nsWindowsShellService.cpp
+ else
+ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ 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
+ 
+ ifdef CPPSRCS
+ LIBRARY_NAME = shellservice_s
+ endif
+ 
+diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
+new file mode 100644
+--- /dev/null
++++ b/browser/components/shell/src/nsKDEShellService.cpp
+@@ -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 --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
+new file mode 100644
+--- /dev/null
++++ b/browser/components/shell/src/nsKDEShellService.h
+@@ -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 --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp
+new file mode 100644
+--- /dev/null
++++ b/browser/components/shell/src/nsUnixShellService.cpp
+@@ -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 --git a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h
+new file mode 100644
+--- /dev/null
++++ b/browser/components/shell/src/nsUnixShellService.h
+@@ -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 --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -442,16 +442,17 @@
+ #endif
+ #endif
+ 
+ ; [Default Preferences]
+ ; All the pref files must be part of base to prevent migration bugs
+ @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
+ @BINPATH@/greprefs.js
+ @BINPATH@/defaults/autoconfig/platform.js
+ @BINPATH@/defaults/autoconfig/prefcalls.js
+ @BINPATH@/defaults/profile/prefs.js
+ 
diff --git a/firefox-lang.patch b/firefox-lang.patch
new file mode 100644
index 0000000..ee8d3c4
--- /dev/null
+++ b/firefox-lang.patch
@@ -0,0 +1,12 @@
+--- ./browser/app/profile/firefox.js.lang	2011-06-28 16:49:38.657881620 -0300
++++ ./browser/app/profile/firefox.js	2011-06-28 16:52:35.979709761 -0300
+@@ -430,6 +430,9 @@ pref("general.warnOnAboutConfig",
+ pref("dom.max_script_run_time",                   20);
+ #endif
+ 
++// Use system environment variable to choose locale
++pref("intl.locale.matchOS", true);
++
+ // This is the pref to control the location bar, change this to true to 
+ // force this - this makes the origin of popup windows more obvious to avoid
+ // spoofing. We would rather not do it by default because it affects UE for web
diff --git a/firefox-searchengines-askcom.xml b/firefox-searchengines-askcom.xml
new file mode 100644
index 0000000..da70523
--- /dev/null
+++ b/firefox-searchengines-askcom.xml
@@ -0,0 +1,11 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Ask.com</os:ShortName>
+<os:Description>Get more with each search.</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAACMuAAAjLgAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8fH5/5+f1v9pab7/QkKr/0JCqv9dXbT/h4fI/8fH6P//////////////////////////////////////s7Pg/xgYpv8GBqP/Bgaj/wYGof8GBp//Bgac/wYGlv8GBoz/MTGZ/6+v2v//////////////////////x8ft/wkJrv+Dg93/JSXH/wYGwf8GBr//BQW+/wUFuf8FBbT/BQWp/wUFnP8FBYv/QkKh/+3t+P///////////1lZzP8FBbv/wMDx/9DQ9v8FBdP/wMD0/6Gh7f/AwPL/goLk/yQkyP8zM8H/BASm/wQEk/8nJ5T/4eHy//////81NcT/BAS9/0ND2f///////////+/v/f+wsPP/kJDt///////v7/z/0ND1/6Gh5v+wsOT/AwOV/0FBoP//////TU3L/wQEvP8EBMv/wMD1/8DA9//Q0Pj/cnLq/2Fh6f//////r6/z////////////YmLY/wMDrP8DA4//nZ3R/5qa4v8EBLv/BATJ/0ND4f//////4OD7/0JC4//v7/3/sLD1/zEx5f///////////2Ji4/8EBMD/AwOk/0tLsP/8/P7/ODjJ/wQExv8EBNT/wMD3//////9DQ+n/goLw//////+BgfD/7+/9/9/f+//v7/3/FBTT/wMDs/81NbD//////9jY9P8bG8j/BATP/0ND4///////Q0Pq/wQE4/8EBOP/BATj/8DA+P+RkfP/U1Pr/zMz3f8DA7z/XFzG////////////3t73/zIy0v8EBNH/wMD1/wQE2v8EBNz/BATd/wQE3v+RkfH/wMD2/wQE2v8EBM//Bga+/83N7///////////////////////oKDp/1FR2v8EBMz/BATP/wQE0P8EBNH/YmLi//////8EBMv/Dw/G/6ys5//////////////////////////////////8/P7/vr7v/4aG4f9QUNb/Q0PU/0ND1P9fX9j/l5fk/+vr+f//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAD//w==</os:Image>
+<UpdateInterval>7</UpdateInterval>
+<SearchForm>http://www.ask.com</SearchForm>
+<os:Url type="text/html" method="GET" template="http://www.ask.com/web?q={searchTerms}&amp;o=@DISTRO_VALUE@&amp;l=dis"></os:Url>
+<os:Url type="application/x-suggestions+json" method="GET" template="http://ss.ask.com/query?q={searchTerms}&amp;li=ff">
+</os:Url>
+</SearchPlugin>
diff --git a/firefox-searchengines-exalead.xml b/firefox-searchengines-exalead.xml
new file mode 100644
index 0000000..365d07e
--- /dev/null
+++ b/firefox-searchengines-exalead.xml
@@ -0,0 +1,9 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Exalead</os:ShortName>
+<os:Description>Exalead search engine</os:Description>
+<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnp+gPklJSaMXFxfjAAAA+wAAAfxNSD/jZGNdpZucnj8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0dXcKbmxnliYkHfoAAAD/AAAA/ywpIf+qn37/2sif/7+sh/99clr7ZGNgmMDAwgsAAAAAAAAAAAAAAAC7vL4KW1pTu8vBmP/Ivpn/CQkH/0I+Mf/q3rD//vG///Hltf/s3a//48+k/6uZdv9PTUW/aGlrCwAAAAAAAAAAUVFOlMe/m///9cn//vTI/8rCn//p3rX///XF//ruvf/57bz/9em5//DktP/m06f/rpx5/1lZVZkAAAAAW1xdOI2Ic/3/+9T//PTQ/+Xdu//Bu5z/qqSI/5yWe/+dlnn/samG/9rPpP/8773/8eW1/+XRpf+Ge2H+cHFyO0hIRKTg2br///za/7axmf+ZlYH/w76k/93XuP/e17b/0Min/66nif+Be2P/aGNO/8O5k//77r3/n5Bx/yorK6dqaFzm8evO/5CNfP+xrZj//vja///52v/589P/+PHQ//ryzv//+M7/4tix/11ZR//c0aX/9uu6/zk1Kv8DAwXmYF1T/vbx1/+hnY3/7+rR//v12//48tj/9/LW//bw0v/278//9e3K//Pqwv/678H///LA/3t0XP8AAAD/AAAA/g8PD/7Nybj////s//v24P/59N7/+vTd//jz2f/48tb/9vDS//Xuzv/27sn/+O7D//Pouv/Mwpn/a2VR/w8OC/4MDQ7lsq+k////6//79uP/+/bk///96P/79d7/+PPZ//fy1f/48dL/6uPC/+HYtP/16r3/+Ou6//vtvf9eWUrmPj08o9rWyP///Ov//vrp/+nk1f99enH/+fPg//r03f/48tj///rb/7Oul/8+PDL/9+zB//bquv/bz6T/S0lDpWxsbDaSkIj8///+//767P/y7+H/Li0q/9nVxf//+uT/+PPZ//z22f/Y0rb/JSQf/+DXsP//+MX/jodr/mNkZjkAAAAAUlFQkc7Mxf////////zu/9LOwf/v6tn//ffi//n02//38dX/+fLS/9DKq//78cb/xryU/01MSJYAAAAAAAAAAK6urwlfXly4zczH//////////b///rn//z24f/9+N7///nc//z01f///9r/xr6a/1NSS7snJyoLAAAAAAAAAAAAAAAAgoKDCD08O5GOjYf43tzV//jz5P+ysKf/o6GY/8nErv/TzbH/ioZx+WFgXZSgoaMKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAm5ucO2JiX6FUU0/iERER/AoLDPwdHR3jW1tYo5+goTwAAAAAAAAAAAAAAAAAAAAA//8+CvgfCQngB250wANlcsADPC+AAXRlgAFyPoABCQmAAWtlgAFjb4ABYXDAA2UuwANpbuAHdGn4H2V0//9saQ==</os:Image>
+<os:Url type="text/html" method="GET" template="http://www.exalead.fr/search?q={searchTerms}">
+</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="http://www.exalead.fr/search/Suggestions?q={searchTerms}">
+</os:Url>
+</SearchPlugin>
\ No newline at end of file
diff --git a/firefox-searchengines-jamendo.xml b/firefox-searchengines-jamendo.xml
new file mode 100644
index 0000000..af1ff3b
--- /dev/null
+++ b/firefox-searchengines-jamendo.xml
@@ -0,0 +1,12 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
+<os:ShortName>Jamendo</os:ShortName>
+<os:Description>Jamendo Search</os:Description>
+<os:InputEncoding>ISO-8859-1</os:InputEncoding>
+<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QYPDS8GqqPMwQAAAclJREFUeNpj/P//f+L68wvOP2YgBJKN5OYEGDA/1PdfcOYBw///BNH5Zx+efP7JyFC+GpeRTIyMbqriRtICLExMn37+fvLx+603n1kY/vzBpSHOVNFERujX339ff/0R52JT4Od0VRbFpyFMT/b4g9erzj/8/vsvHwerND+XojAPC8Pv37g0fPr28+nbz7eevf3/n4GBgeEKAwMDAwMzg4EXw79/WBEnK7O5gujnrz8fvv4IF2Ri+P0bF9pw+vavX79N5YR4mRnggsyM2q6M//5hRb9//2ZiYHTXlWNnZLx4/yVEkJlR04nh31/s6O/fJ28+akgJaUgJ3nz8+t2nrwz//jIzqjlAHDcnw7M7zlGUm/3Wkzdfvn1n+PuP4d+/P7///Pn9R1dOjJ2J8dydZwz//iFC6dGrD6x6ChnuRuluRq8/fb3x5M2cneduPX2rJi4gwc/Fxw5VycyoaA2x4cjlBzcfvxbk4RQT5JEQ5FEUF2RjZlIQ49eSE7n3/O22kzdevPnI8O8fI6NzGWYMRDoZGKtKf/j649+//8/eftp15tazt58gUoxxzUsW7znHQBxIcDNmvrBv7b0nby7dfkIwtSZ4mM6rigIAJxY/knh2MaAAAAAASUVORK5CYII=</os:Image>
+<UpdateInterval>7</UpdateInterval>
+<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/jamendo.src</UpdateUrl>
+<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/jamendo.png</IconUpdateUrl>
+<SearchForm>http://www.jamendo.com/index.php</SearchForm>
+<os:Url type="text/html" method="GET" template="http://www.jamendo.com/index.php?p=search&amp;search_string={searchTerms}&amp;sourceid=mozilla-search">
+</os:Url>
+</SearchPlugin>
\ No newline at end of file
diff --git a/firefox-vendor.patch b/firefox-vendor.patch
new file mode 100644
index 0000000..cbaedf5
--- /dev/null
+++ b/firefox-vendor.patch
@@ -0,0 +1,20 @@
+--- mozilla/toolkit/mozapps/plugins/content/pluginInstallerDatasource.js.vendor	2008-05-28 20:49:33.000000000 +0200
++++ mozilla/toolkit/mozapps/plugins/content/pluginInstallerDatasource.js	2008-12-17 16:35:45.000000000 +0100
+@@ -56,6 +56,8 @@
+   var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
+                              .getService(Components.interfaces.nsIPrefBranch);
+   this.dsURI = prefBranch.getCharPref("pfs.datasource.url");
++  this.vendorSub = prefBranch.getCharPref("general.useragent.vendorSub");
++  this.vendorComment = prefBranch.getCharPref("general.useragent.vendorComment");
+ }
+ 
+ nsRDFItemUpdater.prototype = {
+@@ -68,6 +70,8 @@
+     dsURI = dsURI.replace(/%APP_RELEASE%/g, this.appRelease);
+     dsURI = dsURI.replace(/%CLIENT_OS%/g, this.clientOS);
+     dsURI = dsURI.replace(/%CHROME_LOCALE%/g, this.chromeLocale);
++    dsURI = dsURI.replace(/%VENDOR_SUB%/g, this.vendorSub);
++    dsURI = dsURI.replace(/%VENDOR_COMMENT%/g, this.vendorComment);
+ 
+     var ds = this._rdfService.GetDataSource(dsURI);
+     var rds = ds.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource)
diff --git a/firefox.desktop b/firefox.desktop
new file mode 100644
index 0000000..b7fc67b
--- /dev/null
+++ b/firefox.desktop
@@ -0,0 +1,153 @@
+[Desktop Entry]
+Version=1.0
+Name=Firefox
+GenericName=Web Browser
+GenericName[af]=Web Blaaier
+GenericName[ar]=متصفّح وِب
+GenericName[as]=ৱেব চৰক
+GenericName[az]=Veb Səyyahı
+GenericName[be]=Гартач сеціва
+GenericName[bg]=Уеб браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[br]=Furcher ar Gwiad
+GenericName[bs]=Web preglednik
+GenericName[ca]=Navegador web
+GenericName[cs]=Prohlížeč WWW
+GenericName[cy]=Porwr Gwe
+GenericName[da]=Internetbrowser
+GenericName[de]=Webbrowser
+GenericName[el]=Περιηγητής ιστοσελίδων
+GenericName[eo]=TTT-legilo
+GenericName[es]=Navegador web
+GenericName[et]=Veebisirvija
+GenericName[eu]=Web arakatzailea
+GenericName[fa]=مرورگر وب
+GenericName[fi]=WWW-selain
+GenericName[fo]=Vevlesari
+GenericName[fr]=Navigateur Web
+GenericName[ga]=Brabhsálaí Lín
+GenericName[gl]=Navegador web
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web pretraživač
+GenericName[hu]=Webböngésző
+GenericName[id]=Browser Web
+GenericName[is]=Vafri
+GenericName[it]=Browser web
+GenericName[ja]=GNOME ウェブ・ブラウザ
+GenericName[ka]=ვებ ბრაუზერი
+GenericName[kn]=ಜಾಾಲ ವೀಕ್ಷಕ
+GenericName[ko]=웹 브라우저
+GenericName[ku]=Geroka Torê
+GenericName[ky]=Web Браузер
+GenericName[li]=Wèb Browser
+GenericName[lo]=ຮງກເບິ່ງຖານເບິ່ງຂໍ້ມູນ
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Tīmekļa pārlūkprogramma
+GenericName[mk]=Веб прелистувач
+GenericName[ml]=വെബ് ബ്രൌസര്‍
+GenericName[mn]=Вэб-Хөтөч
+GenericName[mr]=वेब ब्राउझर
+GenericName[ms]=Pelungsur Web
+GenericName[nb]=Nettleser
+GenericName[nds]=Nettkieker
+GenericName[ne]=वेब ब्राउजर
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[oc]=Navegaire web
+GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
+GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator Internet
+GenericName[ru]=Веб-браузер
+GenericName[se]=Fierpmádatlogan
+GenericName[sk]=Webový prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sq]=Shfletuesi Web
+GenericName[sr]=Интернет прегледник
+GenericName[sr@Latn]=Internet preglednik
+GenericName[ss]=Ibrawuza ye-Web 
+GenericName[sv]=Webbläsare
+GenericName[ta]=இணைய உலாவி
+GenericName[tg]=Тафсири веб
+GenericName[th]=เว็บเบราว์เซอร์
+GenericName[tk]=Web Ahtarçysy
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Переглядач веб-сторінок
+GenericName[ur]=ویب براؤزر
+GenericName[uz]=Veb-brauzer
+GenericName[uz@cyrillic]=Веб-браузер
+GenericName[vi]=Bộ duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[xh]=Umkhangeli zincwadi we Web
+GenericName[zh_CN]=Web 浏览器
+GenericName[zh_TW]=網頁瀏覽器
+Comment=Browse the Web
+Comment[af]=Blaai die Web
+Comment[am]=ዌብን ይቃኙ
+Comment[ar]=تصفّح الوِب
+Comment[az]=Vebdə gəz
+Comment[bg]=Сърфиране из интернет
+Comment[bn]=ওয়েব ব্রাউজ করুন
+Comment[bs]=Pretražujte web
+Comment[ca]=Navega pel web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[cy]=Pori'r We
+Comment[da]=Surf på internettet
+Comment[de]=Im Internet surfen
+Comment[el]=Περιηγηθείτε στο Διαδίκτυο
+Comment[eo]=Foliumi la TTT-on
+Comment[es]=Navegue por la web
+Comment[et]=Veebi sirvimine
+Comment[eu]=Web-a arakatu
+Comment[fa]=مرور بر وب
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Navigue sur Internet
+Comment[fur]=Navighe tal Web
+Comment[hi]=वेब पर ब्राउज करें
+Comment[hr]=Pregledaj Web
+Comment[hu]=A világháló böngészése
+Comment[hy]=Զբոսնել Ցանցում
+Comment[is]=Flakka á vefnum
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ka]=ინტერნეტში გასეირნება
+Comment[ko]=웹을 돌아 다닙니다
+Comment[ku]=Geryana Înternet
+Comment[ky]=Вебди аралоо
+Comment[lv]=Pārlūkojiet Web
+Comment[mt]=Ibbrawżja l-web
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW 
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegar na Web
+Comment[ro]=Navigați pe Web
+Comment[ru]=Веб-навигация
+Comment[sc]=Sfollya s'arretza
+Comment[sk]=Prezerať Web
+Comment[sl]=Brskanje po spletu
+Comment[sq]=Shfletues Web
+Comment[sr@Latn]=Pretražite Internet
+Comment[sv]=Surfa på webben
+Comment[ta]=வலையத்ைத மேலோட
+Comment[tg]=Шабакаро баррасӣ кунед
+Comment[th]=Browse the Web
+Comment[tl]=I-browse ang Web
+Comment[tr]=Web' de gezin
+Comment[uk]=Переглядайте Тенета
+Comment[vi]=Duyệt web
+Comment[wa]=Naivyî so les pådjes waibe
+Comment[zh_CN]=浏览 Web
+Comment[zh_TW]=瀏覽網頁
+Exec=firefox %u
+Icon=firefox
+Terminal=false
+Type=Application
+StartupWMClass=Firefox
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;
+Categories=GTK;Network;WebBrowser;X-MandrivaLinux-Internet-WebBrowsers;X-MandrivaLinux-CrossDesktop;
diff --git a/firefox.spec b/firefox.spec
new file mode 100644
index 0000000..703eae1
--- /dev/null
+++ b/firefox.spec
@@ -0,0 +1,796 @@
+%define major 5
+%define realver %{major}.0.1
+
+# (tpg) MOZILLA_FIVE_HOME
+%define mozillalibdir %{_libdir}/%{name}-%{realver}
+%define pluginsdir %{_libdir}/mozilla/plugins
+%define firefox_channel release
+
+%if %mandriva_branch == Cooker
+# Cooker
+%define release 1
+%else
+# Old distros
+%define subrel 1
+%define release %mkrel 0
+%endif
+
+Summary:	Mozilla Firefox web browser
+Name:		firefox
+Version:	%{realver}
+Release:	%{release}
+License:	MPLv1+
+Group:		Networking/WWW
+Url:		http://www.firefox.com/
+Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{realver}/source/firefox-%{realver}.source.tar.bz2
+Source1:	%{SOURCE0}.asc
+Source4:	firefox.desktop
+Source5:	firefox-searchengines-jamendo.xml
+Source6:	firefox-searchengines-exalead.xml
+Source8:	firefox-searchengines-askcom.xml
+Source9:	kde.js
+Patch1:		firefox-lang.patch
+Patch2:		firefox-vendor.patch
+Patch3:		firefox-disable-check-default-browser.patch
+Patch4:		firefox-kde.patch
+Patch41:	mozilla-kde.patch
+# (OpenSuse) add patch to make firefox always use /usr/bin/firefox when "make firefox
+# the default web browser" is used fix mdv bug#58784
+Patch5:		firefox-3.6.3-appname.patch
+Patch6:		firefox-5.0-asciidel.patch
+BuildRequires:	gtk+2-devel
+BuildRequires:	libnspr-devel >= 4.8.7
+BuildRequires:	nss-devel
+BuildRequires:	nss-static-devel
+BuildRequires:	sqlite3-devel
+BuildRequires:	libproxy-devel
+BuildRequires:	libalsa-devel
+BuildRequires:	libiw-devel
+BuildRequires:	unzip
+BuildRequires:	zip
+#(tpg) older versions doesn't support apng extension
+%if %mdkversion > 201200
+BuildRequires:	libpng-devel >= 1.4.1
+%endif
+BuildRequires:	makedepend
+BuildRequires:	python
+BuildRequires:	valgrind
+BuildRequires:	rootcerts
+BuildRequires:	doxygen
+BuildRequires:	libgnome-vfs2-devel
+BuildRequires:	libgnome2-devel
+BuildRequires:	libgnomeui2-devel
+BuildRequires:	java-rpmbuild
+BuildRequires:	wget
+BuildRequires:	libnotify-devel
+%if %mdkversion >= 201100
+BuildRequires:	cairo-devel >= 1.10
+%endif
+BuildRequires:	yasm >= 1.0.1
+BuildRequires:	mesagl-devel
+Provides:	webclient
+#Requires:	indexhtml
+Requires:       xdg-utils
+%define ff_deps myspell-en_US nspluginwrapper
+Suggests:	%{ff_deps}
+
+#Requires:	mailcap
+
+#Conflicts with stable firefox
+#Conflicts:	firefox
+#Obsoletes:	firefox
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
+
+%description
+Mozilla Firefox is a web browser
+
+%package	devel
+Summary:	Development files for %{name}
+Group:		Development/Other
+
+%description	devel
+Files and macros mainly for building Firefox extensions.
+
+%prep
+%setup -qn mozilla-%{firefox_channel}
+
+# disabled for tests
+%patch1 -p1 -b .lang
+%patch2 -p1 -b .vendor
+%patch3 -p1 -b .defaultbrowser
+%patch6 -p1 -b .wintitle
+## KDE INTEGRATION
+# copy current files and patch them later to keep them in sync
+%patch4 -p1 -b .kde
+%patch41 -p1 -b .kdemoz
+# install kde.js
+install -m 644 %{SOURCE9} browser/app/profile/kde.js
+
+# disabled for now, lets see!
+#%patch5 -p1 -b .appname
+
+# (tpg) remove ff bookmarks, use mdv ones
+rm -rf browser/locales/en-US/profile/bookmarks.html
+touch browser/locales/en-US/profile/bookmarks.html
+
+# needed to regenerate certdata.c
+pushd security/nss/lib/ckfw/builtins
+perl ./certdata.perl < /etc/pki/tls/mozilla/certdata.txt
+popd
+
+
+%build
+
+# (gmoro) please dont enable all options by hand
+# we need to trust firefox defaults
+export MOZCONFIG=./mozconfig
+cat << EOF > $MOZCONFIG
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
+ac_add_options --prefix="%{_prefix}"
+ac_add_options --libdir="%{_libdir}"
+ac_add_options --sysconfdir="%{_sysconfdir}"
+ac_add_options --mandir="%{_mandir}"
+ac_add_options --includedir="%{_includedir}"
+ac_add_options --datadir="%{_datadir}"
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-zlib
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+#ac_add_options --enable-chrome-format=jar
+#ac_add_options --enable-update-channel=beta
+ac_add_options --enable-official-branding
+ac_add_options --enable-libproxy
+%if %mdkversion > 201200
+ac_add_options --with-system-png
+%else
+ac_add_options --without-system-png
+%endif
+ac_add_options --with-system-jpeg
+
+%if %mdkversion >= 201100
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-sqlite
+%else
+ac_add_options --disable-system-cairo
+ac_add_options --disable-system-sqlite
+%endif
+ac_add_options --with-distribution-id=com.mandriva
+ac_add_options --disable-crashreporter
+EOF
+
+make -f client.mk build
+
+%install
+
+make -C %{_builddir}/obj/browser/installer STRIP=/bin/true
+
+# Copy files to buildroot
+%{__mkdir_p} %{buildroot}%{mozillalibdir}
+cp -rf %{_builddir}/obj/dist/firefox/* %{buildroot}%{mozillalibdir}
+
+%{__mkdir_p}  %{buildroot}%{_bindir}
+ln -sf %{mozillalibdir}/firefox %{buildroot}%{_bindir}/firefox
+
+# Create an own %_libdir/mozilla/plugins
+%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins
+
+# (tpg) desktop entry
+%{__mkdir_p} %{buildroot}%{_datadir}/applications
+install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/firefox.desktop
+
+# (gmoro) icons
+%{__cp} %{buildroot}%{mozillalibdir}/chrome/icons/default/default16.png %{buildroot}/%{mozillalibdir}/icons/
+for i in 16 32 48 ; do
+%{__mkdir_p} %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps
+ln -sf %{mozillalibdir}/chrome/icons/default/default$i.png %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps/firefox.png ;
+done
+
+# exclusions
+rm -f %{buildroot}%{mozillalibdir}/README.txt
+rm -f %{buildroot}%{mozillalibdir}/removed-files
+rm -f %{buildroot}%{mozillalibdir}/precomplete
+
+install -D -m644 browser/app/profile/prefs.js %{buildroot}%{mozillalibdir}/defaults/profile/prefs.js
+cat << EOF >> %{buildroot}%{mozillalibdir}/defaults/profile/prefs.js
+user_pref("browser.search.selectedEngine","Ask.com");
+user_pref("browser.search.order.1","Ask.com");
+user_pref("browser.search.order.2","Exalead");
+user_pref("browser.search.order.3","Google");
+user_pref("browser.search.order.4","Yahoo");
+user_pref("browser.EULA.override", true);
+user_pref("browser.shell.checkDefaultBrowser", false);
+user_pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html");
+user_pref("browser.ctrlTab.previews", true);
+user_pref("browser.tabs.insertRelatedAfterCurrent", false);
+user_pref("app.update.auto", false);
+user_pref("app.update.enabled", false);
+user_pref("app.update.autoInstallEnabled", false);
+user_pref("security.ssl.require_safe_negotiation", false);
+user_pref("browser.startup.homepage","file:///usr/share/doc/HTML/index.html");
+EOF
+
+# search engines
+cp -f %{SOURCE5} %{buildroot}%{mozillalibdir}/searchplugins/jamendo.xml
+cp -f %{SOURCE6} %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml
+cp -f %{SOURCE8} %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml
+
+# Correct distro values on search engines
+sed -i 's/@DISTRO_VALUE@/ffx/' %{buildroot}%{mozillalibdir}/searchplugins/askcom.xml
+sed -i 's/@DISTRO_VALUE@//' %{buildroot}%{mozillalibdir}/searchplugins/exalead.xml
+
+%find_lang %{name}
+
+mkdir -p %{buildroot}%{_sys_macros_dir}
+cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
+# Macros from %{name} package
+%%firefox_major              %{major}
+%%firefox_version            %{realver}
+%%firefox_mozillapath        %{mozillalibdir}
+%%firefox_pluginsdir         %{pluginsdir}
+%%firefox_appid              \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
+%%firefox_extdir             %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi)
+FIN
+
+%post
+unset DISPLAY
+if [ ! -r /etc/sysconfig/oem ]; then
+  case `grep META_CLASS /etc/sysconfig/system` in
+    *powerpack) bookmark="mozilla-powerpack.html" ;;
+    *desktop) bookmark="mozilla-one.html";;
+    *) bookmark="mozilla-download.html";;
+  esac
+  ln -s -f ../../../../share/mdk/bookmarks/mozilla/$bookmark  %{mozillalibdir}/defaults/profile/bookmarks.html
+fi
+
+%files -f %{name}.lang
+%{_bindir}/firefox
+%{_iconsdir}/hicolor/*/apps/*.png
+%{_datadir}/applications/*.desktop
+%{_libdir}/%{name}-%{realver}*
+%dir %{_libdir}/mozilla
+%dir %{pluginsdir}
+
+%files devel
+%{_sys_macros_dir}/%{name}.macros
+
+
+%changelog
+* Wed Aug 03 2011 Funda Wang <fwang@mandriva.org> 5.0.1-0.1mdv2011.0
++ Revision: 692943
+- new version 5.0.1
+
+* Tue Jun 28 2011 Götz Waschk <waschk@mandriva.org> 5.0-2
++ Revision: 687985
+- bump yasm dep to 1.0.1
+
+  + Nicolas Lécureuil <nlecureuil@mandriva.com>
+    - Clean spec file
+
+* Wed Jun 22 2011 Nicolas Lécureuil <nlecureuil@mandriva.com> 5.0-1
++ Revision: 686583
+- Now that this is in firefox branch do not conflict with firefox
+
+* Wed Jun 22 2011 Guilherme Moro <guilherme@mandriva.com> 5.0-0
++ Revision: 686571
+- New version
+
+* Tue May 17 2011 Oden Eriksson <oeriksson@mandriva.com> 0:4.0.1-2
++ Revision: 675845
+- rebuild
+
+* Thu Apr 28 2011 Funda Wang <fwang@mandriva.org> 0:4.0.1-1
++ Revision: 660096
+- new version 4.0.1
+- firefox is just firefox, we will promote its function in generic name
+
+* Mon Mar 21 2011 Funda Wang <fwang@mandriva.org> 0:4.0-1
++ Revision: 647262
+- 4.0 final
+
+* Sun Mar 20 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.rc2.3
++ Revision: 647142
+- New version 4.0 rc2
+
+  + Nicolas Lécureuil <nlecureuil@mandriva.com>
+    - Enable back kde firefox integration
+
+* Thu Mar 10 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.rc1.1
++ Revision: 643637
+- update mozilla dir
+- update file dir
+- 4.0 rc1
+
+* Sat Feb 26 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.b12.1
++ Revision: 639838
+- 4.0 b12
+
+* Tue Feb 08 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.b11.1
++ Revision: 636905
+- disable elf hack also
+- 4.0 b11
+
+* Mon Jan 31 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.b10.2
++ Revision: 634408
+- now ships boundled weave sync
+- update url
+- drop unused BR
+
+* Thu Jan 27 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.b10.1
++ Revision: 633161
+- 4.0 b10
+
+* Fri Jan 21 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.b9.3
++ Revision: 631980
+- rebuild
+- update desc
+
+* Tue Jan 18 2011 Guilherme Moro <guilherme@mandriva.com> 0:4.0-0.b9.2
++ Revision: 631629
+- Fixed build with the new omni.jar format and enabled again system nss
+
+* Tue Jan 18 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.b9.1
++ Revision: 631440
+- 4.0 b9
+- escape macros
+- add more firefox macro to ease packaging extensions per discussion on cooker@
+
+* Wed Jan 05 2011 Funda Wang <fwang@mandriva.org> 0:4.0-0.b8.1mdv2011.0
++ Revision: 628756
+- fix file list
+
+  + Thierry Vignaud <tv@mandriva.org>
+    - new release
+
+* Thu Nov 18 2010 Funda Wang <fwang@mandriva.org> 0:4.0-0.b7.4mdv2011.0
++ Revision: 598569
+- more specific firefox preversion for extensions
+
+* Fri Nov 12 2010 Funda Wang <fwang@mandriva.org> 0:4.0-0.b7.3mdv2011.0
++ Revision: 596420
+- finally fix xulrunne req
+
+* Fri Nov 12 2010 Funda Wang <fwang@mandriva.org> 0:4.0-0.b7.2mdv2011.0
++ Revision: 596408
+- fix prefinal requires
+
+* Thu Nov 11 2010 Funda Wang <fwang@mandriva.org> 0:4.0-0.b7.1mdv2011.0
++ Revision: 595945
+- add specific BR for prefinal version
+
+  + Thierry Vignaud <tv@mandriva.org>
+    - advise to svn cp xulrunner sources instead of adding again the sources in SVN
+    - new release
+
+* Thu Sep 16 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 0:4.0-0.b6.1mdv2011.0
++ Revision: 579047
+- update to new version 4.0b6
+
+* Tue Sep 07 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 0:4.0-0.b5.1mdv2011.0
++ Revision: 576695
+- update to new version 4.0b5
+
+* Mon Aug 30 2010 Funda Wang <fwang@mandriva.org> 0:4.0-0.b4.2mdv2011.0
++ Revision: 574483
+- rebuild for new xulrunner
+
+* Wed Aug 25 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 0:4.0-0.b4.1mdv2011.0
++ Revision: 573010
+- update to new version 4.0b4
+
+* Tue Aug 24 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 0:4.0-0.b3.2mdv2011.0
++ Revision: 572952
++ rebuild (emptylog)
+
+* Mon Aug 23 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 0:4.0-0.b3.1mdv2011.0
++ Revision: 572074
+- add buildrequires on mesagl-devel
+- update to new version 4.0b3
+- disable patches 4 an 17 (need a rediff)
+- do no build against system-wide nss (temporary)
+- sync configure options with xulrunner
+
+* Sat Jul 24 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 0:3.6.8-1mdv2011.0
++ Revision: 558168
+- update to new version 3.6.8
+
+  + Frederic Crozat <fcrozat@mandriva.com>
+    - revert for cooker / stable
+
+* Mon Jun 28 2010 Frederic Crozat <fcrozat@mandriva.com> 0:3.6.6-1mdv2010.1
++ Revision: 549343
+- Fix release number for cooker / 2010.1
+
+* Mon Jun 28 2010 Frederic Crozat <fcrozat@mandriva.com> 0:3.6.6-0.1mdv2010.1
++ Revision: 549287
+- Release 3.6.6
+
+* Sun Jun 27 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.4-1mdv2010.1
++ Revision: 549245
+- sync with MDVSA-2010:125
+
+* Mon May 17 2010 Christophe Fergeau <cfergeau@mandriva.com> 0:3.6.3-10mdv2010.1
++ Revision: 544926
+- enable default app path patch
+
+  + Ahmad Samir <ahmadsamir@mandriva.org>
+    - add patch from OpenSuse to make firefox always use /usr/bin/firefox when
+      "make firefox the default web browser" is used, should fix mdv#58784 (patch is
+      disabled at the moment).
+
+* Fri Apr 16 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.3-9mdv2010.1
++ Revision: 535414
+- actually make that sqlite3 version discovery working...
+
+* Thu Apr 15 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.3-8mdv2010.1
++ Revision: 535078
+- fix #58754 (firefox 3.6.3 should require latest sqlite)
+
+* Mon Apr 12 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.3-7mdv2010.1
++ Revision: 533712
+- actually use the correct name and major for sqlite3
+- bump release
+- pull a recent enough sqlite3
+
+* Fri Apr 09 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.3-6mdv2010.1
++ Revision: 533450
+- re-enable two of the patches (duh!)
+
+* Thu Apr 08 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.3-5mdv2010.1
++ Revision: 533027
+- set security.ssl.require_safe_negotiation to false. there's too many sites that are affected, including https://qa.mandriva.com
+
+* Wed Apr 07 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.3-4mdv2010.1
++ Revision: 532692
+- rebuild
+- more backport fixes
+- adjust deps a bit
+
+* Tue Apr 06 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.3-3mdv2010.1
++ Revision: 532334
+- make it backportable to 2008.0
+
+* Tue Apr 06 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.3-2mdv2010.1
++ Revision: 532016
+- fix CVE-2009-3555
+
+* Sun Apr 04 2010 Funda Wang <fwang@mandriva.org> 0:3.6.3-1mdv2010.1
++ Revision: 531036
+- new version 3.6.3
+
+* Tue Mar 23 2010 Oden Eriksson <oeriksson@mandriva.com> 0:3.6.2-1mdv2010.1
++ Revision: 526886
+- it really needs nss-3.12.6
+- adjust deps
+- 3.6.2
+- adjust deps
+- rather removed more annoyances...
+- fix "incorrect" opening of new tabs, revert to 3.5 behaviour
+
+* Thu Jan 21 2010 Funda Wang <fwang@mandriva.org> 0:3.6-1mdv2010.1
++ Revision: 494597
+- New version 3.6 final
+
+* Wed Jan 20 2010 Nicolas Lécureuil <nlecureuil@mandriva.com> 0:3.6-0.rc2.2mdv2010.1
++ Revision: 493941
+- Add kde integration patch
+- Add kde.js as source.
+  This is not used yet but will be to add kde integration into firefox
+
+* Mon Jan 18 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 0:3.6-0.rc2.1mdv2010.1
++ Revision: 493330
+- update to new versin 3.6-rc2
+
+* Sat Jan 09 2010 Götz Waschk <waschk@mandriva.org> 0:3.6-0.rc1.1mdv2010.1
++ Revision: 488183
+- really fix firefox libdir
+
+  + Ahmad Samir <ahmadsamir@mandriva.org>
+    -fix spec
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - update to new version 3.6-rc1
+
+* Fri Dec 18 2009 Christophe Fergeau <cfergeau@mandriva.com> 0:3.6-0.b5.1mdv2010.1
++ Revision: 479897
+- firefox 3.6b5
+- fix ctrlTab pref in prefs.js
+
+* Wed Dec 16 2009 Christophe Fergeau <cfergeau@mandriva.com> 0:3.6-0.b4.2mdv2010.1
++ Revision: 479429
+- push 3.6b4 to cooker main/release
+- switch to firefox 3.6beta4
+
+* Wed Dec 16 2009 Funda Wang <fwang@mandriva.org> 0:3.5.6-2mdv2010.1
++ Revision: 479174
+- bump rel, previous package was eaten by bs
+
+* Wed Dec 16 2009 Funda Wang <fwang@mandriva.org> 0:3.5.6-1mdv2010.1
++ Revision: 479148
+- New version 3.5.6
+
+* Fri Nov 06 2009 Funda Wang <fwang@mandriva.org> 0:3.5.5-1mdv2010.1
++ Revision: 460603
+- New version 3.5.5
+
+* Mon Oct 26 2009 Bogdano Arendartchuk <bogdano@mandriva.com> 0:3.5.3-2mdv2010.0
++ Revision: 459403
+- added a patch setting the proper mailto handler (#44151)
+
+* Tue Sep 15 2009 Funda Wang <fwang@mandriva.org> 0:3.5.3-1mdv2010.0
++ Revision: 441777
+- fix wrong use of xulrunner version magic
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - update to new version 3.5.3
+
+* Sun Aug 23 2009 Tomasz Pawel Gajc <tpg@mandriva.org> 0:3.5.2-4mdv2010.0
++ Revision: 420216
+- update StartupWMClass in firefox.desktop file
+- drop firefox.png icon, use shipped within tarball ones
+- move icons to %%_iconsdir/hicolor
+- use %%xulrunner_version macro
+- drop buildrequires on lcms-devel
+- do not overrite default optimization flags in --enable-optimize switch
+
+* Tue Aug 18 2009 Gustavo De Nardin <gustavodn@mandriva.com> 0:3.5.2-3mdv2010.0
++ Revision: 417719
+- fixed custom mdv homepage patch (firefox-3.0b3-homepage)
+
+* Tue Aug 18 2009 Gustavo De Nardin <gustavodn@mandriva.com> 0:3.5.2-2mdv2010.0
++ Revision: 417646
+- put the macros in a -devel package, so extensions don't need to require whole firefox
+
+* Tue Aug 18 2009 Gustavo De Nardin <gustavodn@mandriva.com> 0:3.5.2-1mdv2010.0
++ Revision: 417591
+- added macros for building packages requiring firefox
+- new version 3.5.2, merged from cooker/firefox/branches/current
+
+* Tue Aug 04 2009 Eugeni Dodonov <eugeni@mandriva.com> 0:3.0.13-1mdv2010.0
++ Revision: 408633
+- Updated firefox to 3.0.13.
+
+* Thu Jul 23 2009 Eugeni Dodonov <eugeni@mandriva.com> 0:3.0.12-1mdv2010.0
++ Revision: 399083
+- Updated to FF 3.0.12.
+
+* Wed Jun 17 2009 Tomasz Pawel Gajc <tpg@mandriva.org> 0:3.0.11-2mdv2010.0
++ Revision: 386840
+- use %%mandriva_branch again
+
+  + Eugeni Dodonov <eugeni@mandriva.com>
+    - Updated sqlite3 dependencies for Firefox 3.0.11.
+
+* Fri Jun 12 2009 Funda Wang <fwang@mandriva.org> 0:3.0.11-1mdv2010.0
++ Revision: 385514
+- New version 3.0.11
+- update firefox.desktop with our own translation
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - rebuild for gcc-4.4.0
+
+* Fri May 01 2009 Funda Wang <fwang@mandriva.org> 0:3.0.10-1mdv2010.0
++ Revision: 369503
+- New version 3.0.10
+
+* Sat Mar 28 2009 Gustavo De Nardin <gustavodn@mandriva.com> 0:3.0.8-1mdv2009.1
++ Revision: 361836
+- new version 3.0.8
+
+* Wed Mar 11 2009 Oden Eriksson <oeriksson@mandriva.com> 0:3.0.7-1mdv2009.1
++ Revision: 354017
+- 3.0.7
+
+* Tue Feb 03 2009 Funda Wang <fwang@mandriva.org> 0:3.0.6-1mdv2009.1
++ Revision: 336982
+- New version 3.0.6
+
+  + Gustavo De Nardin <gustavodn@mandriva.com>
+    - obsoletes for upgrades from older distro versions:
+      . obsolete latest Firefox 2 version (2.0.0.19)
+      . obsolete kdeff theme, which only works with Firefox 2
+    - automate subrel definition when building for older distros
+    - prepare firefox 3 to build on older distro versions too
+
+* Mon Dec 22 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 0:3.0.5-2mdv2009.1
++ Revision: 317704
+- build with %%setup_compile_flags
+
+  + Funda Wang <fwang@mandriva.org>
+    - New version 3.0.5
+    - rediff lang.patch, vendor.patch
+
+  + Gustavo De Nardin <gustavodn@mandriva.com>
+    - reduce chance of errors by hardcoding the right values
+
+* Thu Nov 13 2008 Gustavo De Nardin <gustavodn@mandriva.com> 0:3.0.4-1mdv2009.1
++ Revision: 302922
+- Obsolete new old mozilla-firefox 2.x versions
+- adding big banner to the spec, to prevent people from messing it up
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - update to new version 3.0.4
+    - update to firefox 3.1-beta1
+
+* Mon Sep 29 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.3-2mdv2009.0
++ Revision: 289827
+- do not show EULA
+- bump release
+
+* Sat Sep 27 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 0:3.0.3-1mdv2009.0
++ Revision: 288944
+- update to new version 3.0.3
+
+* Fri Sep 26 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.2-2mdv2009.0
++ Revision: 288649
+- add strict version requires to xulrunner (#44255)
+- bump release
+
+* Thu Sep 25 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.2-1mdv2009.0
++ Revision: 288006
+- version 3.0.2
+
+* Thu Sep 04 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-10mdv2009.0
++ Revision: 280885
+- suggest nspluginwrapper
+- bump release
+
+* Tue Sep 02 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-9mdv2009.0
++ Revision: 279062
+- obsolete old libmozilla-firefox by using %%mklibname
+- bump release
+- enable BUILD_OFFICIAL and MOZILLA_OFFICIAL
+
+* Mon Aug 18 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-8mdv2009.0
++ Revision: 273430
+- obsoleting all libmozilla-firefox2.0.0.x manually
+- bump release
+
+* Mon Aug 18 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-7mdv2009.0
++ Revision: 273279
+- disabling auto selection theme patch
+
+* Mon Aug 18 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-6mdv2009.0
++ Revision: 273216
+- removing suggests to firefox-theme-kde4ff.
+- bump release
+- add Obsoletes to the old libmozilla-firefox
+
+* Mon Aug 11 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-5mdv2009.0
++ Revision: 270873
+- fixing i18n for menu entries. (desktop file from fedora)
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - bump tag
+    - drop patches 0,8,9,10,11,13 as these are xulrunner specific
+    - build with system wide nspr and nss libraries
+
+* Wed Aug 06 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-4mdv2009.0
++ Revision: 265033
+- create and own %%_libdir/mozilla/plugins
+- Remove requires for myspell packages as they will be suggested in l10n packages (#42304)
+- add suggests to myspell-en_US
+- bump release
+
+* Fri Aug 01 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-3mdv2009.0
++ Revision: 260092
+- do not conflict with mozilla-firefox-theme-kdeff. firefox-theme-kde4ff will obsolete it.
+- add patch to disable classic theme auto selection.
+- add suggests tag to kde4ff theme
+- bump release
+- moving firefox3.desktop to firefox.desktop
+
+* Wed Jul 30 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-2mdv2009.0
++ Revision: 256402
+- changing ff3 to use xulrunner1.9
+- dropping ff libification
+- obsoleting libfirefox3 and mozilla-firefox 2 package
+- renaming wrapper scripts to firefox and mozilla-firefox
+- add patch to remove update option from help menu
+- bump release
+
+  + Funda Wang <fwang@mandriva.org>
+    - use internal sqlite for previous releases
+
+  + Frederik Himpe <fhimpe@mandriva.org>
+    - Starting from Firefox 3.0.1, at least sqlite 3.5.9 is needed, so on
+      Mandriva older than 2009.0 use the included sqlite library instead
+      of the system wide one
+
+* Mon Jul 21 2008 Tiago Salem <salem@mandriva.com.br> 0:3.0.1-1mdv2009.0
++ Revision: 239495
+- Remove networkmanager and sqlite pacthes as they are upstream now.
+- add Requires to mailcap. Fixes bug #42096
+- add ask.com search engine
+- change search engines menu order
+- bump release
+- Changing old firefox 2 description to a new one.
+- bump release (0.b5.2mdv)
+- fixing libdir for plugins
+- renaming startup script to firefox3
+- adding Requires to libfirefox3 on firefox3 package
+- changing desktop file to point to firefox3
+- fix wrong plugins directory.
+- Disabling broken patches.
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - no more branches, move firefox to its own svn place
+    - update to new version 3.0.1
+    - do not strip debug symbols so the debug package is not empty
+    - Patch13: use the correct restart command for session managers (plugins are not being loaded after user login)
+    - try to use jemalloc instead of malloc, as it can help reduce memory fragmentation
+    - enable java build, add buildrequires on java-rpmbuild
+    - provide better description
+    - let's try compile firefox with enabled strict aliasing
+    - don't pass our %%optflags for --enable-optimize
+    - Patch12: ignore NetworkManager status (upstream mozilla bug #424626)
+    - update to new release 3.0
+    - update to new release candidate rc3
+    - update to new release candidate rc2
+    - add missing build requires on gnome stuff (handle mime-types #41201)
+    - add build requires on doxygen
+    - do not install buildrequires for nss-devel and nspr-devel because ff3 uses its own (for now)
+    - hunspell handles now dictionaries, no need to create a symlinks for them
+    - set pref browser.tabs.loadDivertedInBackground (more infos at bug #25009)
+    - disable crashreporter, and drop buildrequires on curl-devel
+    - fix file list
+    - Patch0: try better solution of get the mozilla plugins path (work in progress)
+    - Patch10: do not use firefox's own libIDL
+    - Patch11: hopefully fix compiling against system-wide hunspell
+    - do not build crashreporter tool
+    - enable all image encoders
+    - enable default extensions
+    - enable hunspell support (it is in main now)
+    - use %%serverbuild macro
+    - add cache files
+    - disable hunspell because it is in contrib :(
+    - enable system-wide hunspell support
+    - use system-wide dictionaries
+    - requires desktop-file-utils
+    - drop patch 10, set preferences into spec file
+    - add search engines
+    - add firefox-rebuild-databases.pl tool
+    - enable Mandriva specific bookmarks
+    - add Mandriva specific settings
+    - disable EULA popup
+    - regenerate certificates
+    - disable native uconv (really fixes #40944)
+    - re-enable Xft support
+    - drop requires on icu and buildrequires on icu-devel (useless)
+    - Patch10: various firefox preferences
+      o disable firefox update
+      o enable smooth scroll
+      o use system colors
+      o enable http pipelining
+    - add buildrequires on icu-devel (#40944)
+    - Patch8: completely re-done patch, get the MAXPATHLEN from glibc rather than hardcoding (fixes buffer overflow #41102)
+    - Patch9: remove -WConversion, this silences gcc output
+    - Patch8: fix exePath lenght to prevent firefox crash
+    - disable Xft as it sometimes renders bad fonts (# 40944)
+    - don not ise system-wide nspr and nss libraries, because they were not updated yet
+    - fix file list
+    - fix desktop file
+    - drop the mozilla prefix from the name
+    - enable sqlite support
+    - new version
+    - backport few patches from firefox2
+    - add source and spec file
+
+  + Giuseppe Ghibò <ghibo@mandriva.com>
+    - Versioning sqlite BuildRequires.
+    - Don't force expanded %%{optflags} in CFLAGS.
+
+  + Thierry Vignaud <tv@mandriva.org>
+    - devel package needs the library
+    - fix 'empty-%%post(|un)' error (rpm filetriggers deprecates update_menus &
+      update_desktop_database)
+    - stop packaging useless OS/2 & build doc as well as CVS directories
+    - RC1
+    - patch 7: fix testing for sqlite >= 3.5.4 that fails with sqlite-3.5.7
+
diff --git a/kde.js b/kde.js
new file mode 100644
index 0000000..042c606
--- /dev/null
+++ b/kde.js
@@ -0,0 +1 @@
+pref("browser.preferences.instantApply", false);
diff --git a/mozilla-kde.patch b/mozilla-kde.patch
new file mode 100644
index 0000000..7779d4f
--- /dev/null
+++ b/mozilla-kde.patch
@@ -0,0 +1,3757 @@
+diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
+--- a/modules/libpref/src/Makefile.in
++++ b/modules/libpref/src/Makefile.in
+@@ -90,14 +90,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas
+ # Optimizer bug with GCC 3.2.2 on OS/2
+ ifeq ($(OS_ARCH), OS2)
+ nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
+ 	$(REPORT_BUILD)
+ 	@$(MAKE_DEPS_AUTO_CXX)
+ 	$(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) $^ > $@
+ 
+ libs:: greprefs.js
+ 	$(INSTALL) $^ $(DIST)/bin/
+diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp
+--- a/modules/libpref/src/nsPrefService.cpp
++++ b/modules/libpref/src/nsPrefService.cpp
+@@ -53,16 +53,17 @@
+ #include "nsIStringEnumerator.h"
+ #include "nsIZipReader.h"
+ #include "nsPrefBranch.h"
+ #include "nsXPIDLString.h"
+ #include "nsCRT.h"
+ #include "nsCOMArray.h"
+ #include "nsXPCOMCID.h"
+ #include "nsAutoPtr.h"
++#include "nsKDEUtils.h"
+ 
+ #include "nsQuickSort.h"
+ #include "prmem.h"
+ #include "pldhash.h"
+ 
+ #include "prefapi.h"
+ #include "prefread.h"
+ #include "prefapi_private_data.h"
+@@ -758,30 +759,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+ }
+ 
+ static nsresult pref_LoadPrefsInDirList(const char *listId)
+ {
+   nsresult rv;
+   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),
+               getter_AddRefs(dirList));
+   if (dirList) {
+     PRBool hasMore;
+     while (NS_SUCCEEDED(dirList->HasMoreElements(&hasMore)) && hasMore) {
+       nsCOMPtr<nsISupports> elem;
+       dirList->GetNext(getter_AddRefs(elem));
+       if (elem) {
+         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));
+         }
+       }
+     }
+   }
+   return NS_OK;
+ }
+ 
+ //----------------------------------------------------------------------------------------
+@@ -876,24 +895,36 @@ static nsresult pref_InitInitialObjects(
+   /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
+   static const char* specialFiles[] = {
+ #if defined(XP_MAC) || defined(XP_MACOSX)
+       "macprefs.js"
+ #elif defined(XP_WIN)
+       "winpref.js"
+ #elif defined(XP_UNIX)
+       "unix.js"
++      , "" // placeholder for KDE  (empty is otherwise harmless)
+ #if defined(_AIX)
+       , "aix.js"
+ #endif
+ #elif defined(XP_OS2)
+       "os2pref.js"
+ #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.");
+   }
+ 
+   rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST);
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
+--- a/toolkit/components/downloads/Makefile.in
++++ b/toolkit/components/downloads/Makefile.in
+@@ -79,8 +79,10 @@ endif
+ 
+ ifdef ENABLE_TESTS
+ DIRS += test
+ endif
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
++
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
+--- a/toolkit/components/downloads/nsDownloadManager.cpp
++++ b/toolkit/components/downloads/nsDownloadManager.cpp
+@@ -71,16 +71,20 @@
+ 
+ #if defined(XP_WIN) && !defined(WINCE)
+ #include <shlobj.h>
+ #ifdef DOWNLOAD_SCANNER
+ #include "nsDownloadScanner.h"
+ #endif
+ #endif
+ 
++#if defined(XP_UNIX) && !defined(XP_MACOSX)
++#include "nsKDEUtils.h"
++#endif
++
+ #ifdef XP_MACOSX
+ #include <CoreFoundation/CoreFoundation.h>
+ #endif
+ 
+ #ifdef ANDROID
+ #include "AndroidBridge.h"
+ #endif
+ 
+@@ -2203,16 +2207,25 @@ nsDownload::SetState(DownloadState aStat
+       nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
+ 
+       // Master pref to control this function.
+       PRBool showTaskbarAlert = PR_TRUE;
+       if (pref)
+         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);
+ 
+         PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
+         PRInt64 goat = PR_Now() - mStartTime;
+         showTaskbarAlert = goat > alertIntervalUSec;
+ 
+@@ -2236,18 +2249,19 @@ nsDownload::SetState(DownloadState aStat
+               // If downloads are automatically removed per the user's
+               // retention policy, there's no reason to make the text clickable
+               // because if it is, they'll click open the download manager and
+               // the items they downloaded will have been removed.
+               alerts->ShowAlertNotification(
+                   NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
+                   message, !removeWhenDone, EmptyString(), mDownloadManager,
+                   EmptyString());
+-            }
++          }
+         }
++        } // end non-KDE block
+       }
+ 
+ #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) || defined(ANDROID)
+       nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
+       nsCOMPtr<nsIFile> file;
+       nsAutoString path;
+ 
+       if (fileURL &&
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -40,29 +40,33 @@ toolkit.jar:
+ *+ content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
+ *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
+ *+ content/global/bindings/browser.xml         (widgets/browser.xml)
+ *+ content/global/bindings/button.xml          (widgets/button.xml)
+ *+ content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
+ *+ content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
+ *+ content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
+ *+ 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)
+ *+ content/global/bindings/findbar.xml         (widgets/findbar.xml)
+ *+ content/global/bindings/general.xml         (widgets/general.xml)
+ *+ content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
+ *+ content/global/bindings/listbox.xml         (widgets/listbox.xml)
+ *+ content/global/bindings/menu.xml            (widgets/menu.xml)
+ *+ content/global/bindings/menulist.xml        (widgets/menulist.xml)
+ *+ content/global/bindings/notification.xml    (widgets/notification.xml)
+ *+ content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
+ *+ content/global/bindings/popup.xml           (widgets/popup.xml)
+ *+ content/global/bindings/preferences.xml     (widgets/preferences.xml)
++*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
++% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
+ *+ content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
+ *+ content/global/bindings/radio.xml           (widgets/radio.xml)
+ *+ content/global/bindings/resizer.xml         (widgets/resizer.xml)
+ *+ content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
+ *+ content/global/bindings/scale.xml           (widgets/scale.xml)
+ *+ content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
+ *+ content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
+ *+ content/global/bindings/splitter.xml        (widgets/splitter.xml)
+diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
+new file mode 100644
+--- /dev/null
++++ b/toolkit/content/widgets/dialog-kde.xml
+@@ -0,0 +1,447 @@
++<?xml version="1.0"?>
++
++<bindings id="dialogBindings"
++          xmlns="http://www.mozilla.org/xbl"
++          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
++          xmlns:xbl="http://www.mozilla.org/xbl">
++  
++  <binding id="dialog" extends="chrome://global/content/bindings/general.xml#root-element">
++    <resources>
++      <stylesheet src="chrome://global/skin/dialog.css"/>
++    </resources>
++    <content>
++      <xul:vbox class="box-inherit dialog-content-box" flex="1">
++        <children/>
++      </xul:vbox>
++          
++      <xul:hbox class="dialog-button-box" anonid="buttons"
++                xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient"
++#ifdef XP_UNIX_GNOME
++                >
++        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++        <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"/>
++        <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="help" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
++#endif
++      </xul:hbox>
++    </content>
++
++    <implementation>
++      <field name="_mStrBundle">null</field>
++      <field name="_closeHandler">(function(event) {
++        if (!document.documentElement.cancelDialog())
++          event.preventDefault();
++      })</field>
++
++      <property name="buttons"
++                onget="return this.getAttribute('buttons');"
++                onset="this._configureButtons(val); return val;"/>
++
++      <property name="defaultButton">
++        <getter>
++        <![CDATA[
++          if (this.hasAttribute("defaultButton"))
++            return this.getAttribute("defaultButton");
++          else // default to the accept button
++            return "accept";
++        ]]>
++        </getter>
++        <setter>
++        <![CDATA[
++          this._setDefaultButton(val);
++          return val;
++        ]]>
++        </setter>
++      </property>
++
++      <method name="acceptDialog">
++        <body>
++        <![CDATA[
++          return this._doButtonCommand("accept");
++        ]]>
++        </body>
++      </method>
++      
++      <method name="cancelDialog">
++        <body>
++        <![CDATA[
++          return this._doButtonCommand("cancel");
++        ]]>
++        </body>
++      </method>
++      
++      <method name="getButton">
++        <parameter name="aDlgType"/>
++        <body>
++        <![CDATA[
++          return this._buttons[aDlgType];
++        ]]>
++        </body>
++      </method>
++
++      <method name="moveToAlertPosition">
++        <body>
++        <![CDATA[
++          // hack. we need this so the window has something like its final size
++          if (window.outerWidth == 1) {
++            dump("Trying to position a sizeless window; caller should have called sizeToContent() or sizeTo(). See bug 75649.\n");
++            sizeToContent();
++          }
++
++          var xOffset = (opener.outerWidth - window.outerWidth) / 2;
++          var yOffset = opener.outerHeight / 5;
++
++          var newX = opener.screenX + xOffset;
++          var newY = opener.screenY + yOffset;
++
++          // ensure the window is fully onscreen (if smaller than the screen)
++          if (newX < screen.availLeft)
++            newX = screen.availLeft + 20;
++          if ((newX + window.outerWidth) > (screen.availLeft + screen.availWidth))
++            newX = (screen.availLeft + screen.availWidth) - window.outerWidth - 20;
++
++          if (newY < screen.availTop)
++            newY = screen.availTop + 20;
++          if ((newY + window.outerHeight) > (screen.availTop + screen.availHeight))
++            newY = (screen.availTop + screen.availHeight) - window.outerHeight - 60;
++
++          window.moveTo( newX, newY );
++        ]]>
++        </body>
++      </method>
++
++      <method name="centerWindowOnScreen">
++        <body>
++        <![CDATA[
++          var xOffset = screen.availWidth/2 - window.outerWidth/2;
++          var yOffset = screen.availHeight/2 - window.outerHeight/2; //(opener.outerHeight *2)/10;
++  
++          xOffset = xOffset > 0 ? xOffset : 0;
++          yOffset = yOffset > 0 ? yOffset : 0;
++          window.moveTo(xOffset, yOffset);
++        ]]>
++        </body>
++      </method>
++
++      <constructor>
++      <![CDATA[
++        this._configureButtons(this.buttons);
++
++        // listen for when window is closed via native close buttons
++        window.addEventListener("close", this._closeHandler, false);
++
++        // for things that we need to initialize after onload fires
++        window.addEventListener("load", this.postLoadInit, false);
++
++        window.moveToAlertPosition = this.moveToAlertPosition;
++        window.centerWindowOnScreen = this.centerWindowOnScreen;
++      ]]>
++      </constructor>
++
++      <method name="postLoadInit">
++        <parameter name="aEvent"/>
++        <body>
++        <![CDATA[
++          function focusInit() {
++            const dialog = document.documentElement;
++            const defaultButton = dialog.getButton(dialog.defaultButton);
++            // give focus to the first focusable element in the dialog
++            if (!document.commandDispatcher.focusedElement) {
++              document.commandDispatcher.advanceFocusIntoSubtree(dialog);
++
++              var focusedElt = document.commandDispatcher.focusedElement;
++              if (focusedElt) {
++                var initialFocusedElt = focusedElt;
++                while (focusedElt.localName == "tab" ||
++                       focusedElt.getAttribute("noinitialfocus") == "true") {
++                  document.commandDispatcher.advanceFocusIntoSubtree(focusedElt);
++                  focusedElt = document.commandDispatcher.focusedElement;
++                  if (focusedElt == initialFocusedElt)
++                    break;
++                }
++
++                if (initialFocusedElt.localName == "tab") {
++                  if (focusedElt.hasAttribute("dlgtype")) {
++                    // We don't want to focus on anonymous OK, Cancel, etc. buttons,
++                    // so return focus to the tab itself
++                    initialFocusedElt.focus();
++                  }
++                }
++#ifndef XP_MACOSX
++                else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
++                  defaultButton.focus();
++                }
++#endif
++              }
++            }
++
++            try {
++              if (defaultButton)
++                window.notifyDefaultButtonLoaded(defaultButton);
++            } catch (e) { }
++          }
++
++          // Give focus after onload completes, see bug 103197.
++          setTimeout(focusInit, 0);
++        ]]>
++        </body>
++      </method>                
++
++      <property name="mStrBundle">
++        <getter>
++        <![CDATA[
++          if (!this._mStrBundle) {
++            // need to create string bundle manually instead of using <xul:stringbundle/>
++            // see bug 63370 for details
++            this._mStrBundle = Components.classes["@mozilla.org/intl/stringbundle;1"]
++                                         .getService(Components.interfaces.nsIStringBundleService)
++                                         .createBundle("chrome://global/locale/dialog.properties");
++          }
++          return this._mStrBundle;
++        ]]></getter>
++      </property>
++      
++      <method name="_configureButtons">
++        <parameter name="aButtons"/>
++        <body>
++        <![CDATA[
++          // by default, get all the anonymous button elements
++          var buttons = {};
++          this._buttons = buttons;
++          buttons.accept = document.getAnonymousElementByAttribute(this, "dlgtype", "accept");
++          buttons.cancel = document.getAnonymousElementByAttribute(this, "dlgtype", "cancel");
++          buttons.extra1 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra1");
++          buttons.extra2 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra2");
++          buttons.help = document.getAnonymousElementByAttribute(this, "dlgtype", "help");
++          buttons.disclosure = document.getAnonymousElementByAttribute(this, "dlgtype", "disclosure");
++
++          // look for any overriding explicit button elements
++          var exBtns = this.getElementsByAttribute("dlgtype", "*");
++          var dlgtype;
++          var i;
++          for (i = 0; i < exBtns.length; ++i) {
++            dlgtype = exBtns[i].getAttribute("dlgtype");
++            buttons[dlgtype].hidden = true; // hide the anonymous button
++            buttons[dlgtype] = exBtns[i];
++          }
++
++          // add the label and oncommand handler to each button
++          for (dlgtype in buttons) {
++            var button = buttons[dlgtype];
++            button.addEventListener("command", this._handleButtonCommand, true);
++
++            // don't override custom labels with pre-defined labels on explicit buttons
++            if (!button.hasAttribute("label")) {
++              // dialog attributes override the default labels in dialog.properties
++              if (this.hasAttribute("buttonlabel"+dlgtype)) {
++                button.setAttribute("label", this.getAttribute("buttonlabel"+dlgtype));
++                if (this.hasAttribute("buttonaccesskey"+dlgtype))
++                  button.setAttribute("accesskey", this.getAttribute("buttonaccesskey"+dlgtype));
++              } else if (dlgtype != "extra1" && dlgtype != "extra2") {
++                button.setAttribute("label", this.mStrBundle.GetStringFromName("button-"+dlgtype));
++                var accessKey = this.mStrBundle.GetStringFromName("accesskey-"+dlgtype);
++                if (accessKey)
++                  button.setAttribute("accesskey", accessKey);
++              }
++            }
++            // allow specifying alternate icons in the dialog header
++            if (!button.hasAttribute("icon")) {
++              // if there's an icon specified, use that
++              if (this.hasAttribute("buttonicon"+dlgtype))
++                button.setAttribute("icon", this.getAttribute("buttonicon"+dlgtype));
++              // otherwise set defaults
++              else
++                switch (dlgtype) {
++                  case "accept":
++                    button.setAttribute("icon","accept");
++                    break;
++                  case "cancel":
++                    button.setAttribute("icon","cancel");
++                    break;
++                  case "disclosure":
++                    button.setAttribute("icon","properties");
++                    break;
++                  case "help":
++                    button.setAttribute("icon","help");
++                    break;
++                  default:
++                    break;
++                }
++            }
++          }
++
++          // ensure that hitting enter triggers the default button command
++          this.defaultButton = this.defaultButton;
++          
++          // if there is a special button configuration, use it
++          if (aButtons) {
++            // expect a comma delimited list of dlgtype values
++            var list = aButtons.split(",");
++
++            // mark shown dlgtypes as true
++            var shown = { accept: false, cancel: false, help: false,
++                          disclosure: false, extra1: false, extra2: false };
++            for (i = 0; i < list.length; ++i)
++              shown[list[i].replace(/ /g, "")] = true;
++
++            // hide/show the buttons we want
++            for (dlgtype in buttons) 
++              buttons[dlgtype].hidden = !shown[dlgtype];
++
++#ifdef XP_WIN
++#           show the spacer on Windows only when the extra2 button is present
++            var spacer = document.getAnonymousElementByAttribute(this, "anonid", "spacer");
++            spacer.removeAttribute("hidden");
++            spacer.setAttribute("flex", shown["extra2"]?"1":"0");
++#endif
++
++          }
++        ]]>
++        </body>
++      </method>
++
++      <method name="_setDefaultButton">
++        <parameter name="aNewDefault"/>
++        <body>
++        <![CDATA[
++          // remove the default attribute from the previous default button, if any
++          var oldDefaultButton = this.getButton(this.defaultButton);
++          if (oldDefaultButton)
++            oldDefaultButton.removeAttribute("default");
++
++          var newDefaultButton = this.getButton(aNewDefault);
++          if (newDefaultButton) {
++            this.setAttribute("defaultButton", aNewDefault);
++            newDefaultButton.setAttribute("default", "true");
++          }
++          else {
++            this.setAttribute("defaultButton", "none");
++            if (aNewDefault != "none")
++              dump("invalid new default button: " +  aNewDefault + ", assuming: none\n");
++          }
++        ]]>
++        </body>
++      </method>
++
++      <method name="_handleButtonCommand">
++        <parameter name="aEvent"/>
++        <body>
++        <![CDATA[
++          return document.documentElement._doButtonCommand(
++                                        aEvent.target.getAttribute("dlgtype"));
++        ]]>
++        </body>
++      </method>
++      
++      <method name="_doButtonCommand">
++        <parameter name="aDlgType"/>
++        <body>
++        <![CDATA[
++          var button = this.getButton(aDlgType);
++          if (!button.disabled) {
++            var noCancel = this._fireButtonEvent(aDlgType);
++            if (noCancel) {
++              if (aDlgType == "accept" || aDlgType == "cancel")
++                window.close();
++            }
++            return noCancel;
++          }
++          return true;
++        ]]>
++        </body>
++      </method>
++      
++      <method name="_fireButtonEvent">
++        <parameter name="aDlgType"/>
++        <body>
++        <![CDATA[
++          var event = document.createEvent("Events");
++          event.initEvent("dialog"+aDlgType, true, true);
++          
++          // handle dom event handlers
++          var noCancel = this.dispatchEvent(event);
++          
++          // handle any xml attribute event handlers
++          var handler = this.getAttribute("ondialog"+aDlgType);
++          if (handler != "") {
++            var fn = new Function("event", handler);
++            var returned = fn(event);
++            if (returned == false)
++              noCancel = false;
++          }
++          
++          return noCancel;
++        ]]>
++        </body>
++      </method>
++
++      <method name="_hitEnter">
++        <parameter name="evt"/>
++        <body>
++        <![CDATA[
++          if (evt.getPreventDefault())
++            return;
++
++          var btn = this.getButton(this.defaultButton);
++          if (btn)
++            this._doButtonCommand(this.defaultButton);
++        ]]>
++        </body>
++      </method>
++
++    </implementation>
++    
++    <handlers>
++      <handler event="keypress" keycode="VK_ENTER"
++               group="system" action="this._hitEnter(event);"/>
++      <handler event="keypress" keycode="VK_RETURN"
++               group="system" action="this._hitEnter(event);"/>
++      <handler event="keypress" keycode="VK_ESCAPE" group="system">
++        if (!event.getPreventDefault())
++          this.cancelDialog();
++      </handler>
++#ifdef XP_MACOSX
++      <handler event="keypress" key="." modifiers="meta" phase="capturing" action="this.cancelDialog();"/>
++#else
++      <handler event="focus" phase="capturing">
++        var btn = this.getButton(this.defaultButton);
++        if (btn)
++          btn.setAttribute("default", event.originalTarget == btn || !(event.originalTarget instanceof Components.interfaces.nsIDOMXULButtonElement));
++      </handler>
++#endif
++    </handlers>
++
++  </binding>
++
++  <binding id="dialogheader">
++    <resources>
++      <stylesheet src="chrome://global/skin/dialog.css"/>
++    </resources>
++    <content>
++      <xul:label class="dialogheader-title" xbl:inherits="value=title,crop" crop="right" flex="1"/>
++      <xul:label class="dialogheader-description" xbl:inherits="value=description"/>
++    </content>
++  </binding>
++
++</bindings>
+diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml
+new file mode 100644
+--- /dev/null
++++ b/toolkit/content/widgets/preferences-kde.xml
+@@ -0,0 +1,1371 @@
++<?xml version="1.0"?>
++
++<!DOCTYPE bindings [
++  <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
++  %preferencesDTD;
++  <!ENTITY % globalKeysDTD SYSTEM "chrome://global/locale/globalKeys.dtd">
++  %globalKeysDTD;
++]>
++
++<bindings id="preferencesBindings"
++          xmlns="http://www.mozilla.org/xbl"
++          xmlns:xbl="http://www.mozilla.org/xbl"
++          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
++
++#
++# = Preferences Window Framework
++#
++#   The syntax for use looks something like:
++#
++#   <prefwindow>
++#     <prefpane id="prefPaneA">
++#       <preferences>
++#         <preference id="preference1" name="app.preference1" type="bool" onchange="foo();"/>
++#         <preference id="preference2" name="app.preference2" type="bool" useDefault="true"/>
++#       </preferences>
++#       <checkbox label="Preference" preference="preference1"/>
++#     </prefpane>
++#   </prefwindow>
++#
++
++  <binding id="preferences">
++    <implementation implements="nsIObserver">
++      <method name="observe">
++        <parameter name="aSubject"/>
++        <parameter name="aTopic"/>
++        <parameter name="aData"/>
++        <body>
++        <![CDATA[
++          for (var i = 0; i < this.childNodes.length; ++i) {
++            var preference = this.childNodes[i];
++            if (preference.name == aData) {
++              preference.value = preference.valueFromPreferences;
++            }
++          }
++        ]]>
++        </body>
++      </method>
++      
++      <method name="fireChangedEvent">
++        <parameter name="aPreference"/>
++        <body>
++        <![CDATA[
++          // Value changed, synthesize an event
++          try {
++            var event = document.createEvent("Events");
++            event.initEvent("change", true, true);
++            aPreference.dispatchEvent(event);
++          }
++          catch (e) {
++            Components.utils.reportError(e);
++          }
++        ]]>
++        </body>
++      </method>
++      
++      <field name="service">
++        Components.classes["@mozilla.org/preferences-service;1"]
++                  .getService(Components.interfaces.nsIPrefService);
++      </field>
++      <field name="rootBranch">
++        Components.classes["@mozilla.org/preferences-service;1"]
++                  .getService(Components.interfaces.nsIPrefBranch);
++      </field>
++      <field name="defaultBranch">
++        this.service.getDefaultBranch("");
++      </field>
++      <field name="rootBranchInternal">
++        Components.classes["@mozilla.org/preferences-service;1"]
++                  .getService(Components.interfaces.nsIPrefBranchInternal);
++      </field>
++      <property name="type" readonly="true">
++        <getter>
++          <![CDATA[
++            return document.documentElement.type || "";
++          ]]>
++        </getter>
++      </property>
++      <property name="instantApply" readonly="true">
++        <getter>
++          <![CDATA[
++            var doc = document.documentElement;
++            return this.type == "child" ? doc.instantApply
++                                        : doc.instantApply || this.rootBranch.getBoolPref("browser.preferences.instantApply");
++          ]]>
++        </getter>
++      </property>
++    </implementation>
++  </binding>
++
++  <binding id="preference">
++    <implementation>
++      <constructor>
++      <![CDATA[
++        // if the element has been inserted without the name attribute set,
++        // we have nothing to do here
++        if (!this.name)
++          return;
++
++        this.preferences.rootBranchInternal
++            .addObserver(this.name, this.preferences, false);
++        // In non-instant apply mode, we must try and use the last saved state
++        // from any previous opens of a child dialog instead of the value from
++        // preferences, to pick up any edits a user may have made. 
++        if (this.preferences.type == "child" && 
++            !this.instantApply && window.opener) {
++          var pdoc = window.opener.document;
++
++          // Try to find a preference element for the same preference.
++          var preference = null;
++          var parentPreferences = pdoc.getElementsByTagName("preferences");
++          for (var k = 0; (k < parentPreferences.length && !preference); ++k) {
++            var parentPrefs = parentPreferences[k]
++                                    .getElementsByAttribute("name", this.name);
++            for (var l = 0; (l < parentPrefs.length && !preference); ++l) {
++              if (parentPrefs[l].localName == "preference")
++                preference = parentPrefs[l];
++            }
++          }
++          this._setValue(preference ? preference.value 
++                                    : this.valueFromPreferences, false);
++        }
++        else
++          this._setValue(this.valueFromPreferences, false);
++      ]]>
++      </constructor>
++      <destructor>
++        this.preferences.rootBranchInternal
++            .removeObserver(this.name, this.preferences);
++      </destructor>
++      
++      <property name="instantApply">
++        <getter>
++          return this.getAttribute("instantApply") == "true" || this.preferences.instantApply;
++        </getter>
++      </property>
++
++      <property name="preferences" onget="return this.parentNode"/>
++      <property name="name" onget="return this.getAttribute('name');">
++        <setter>
++          if (val == this.name)
++            return val;
++            
++          this.preferences.rootBranchInternal
++              .removeObserver(this.name, this.preferences);
++          this.setAttribute('name', val);
++          this.preferences.rootBranchInternal
++              .addObserver(val, this.preferences, false);
++              
++          return val;
++        </setter>
++      </property>
++      <property name="type" onget="return this.getAttribute('type');"
++                            onset="this.setAttribute('type', val); return val;"/>
++      <property name="inverted" onget="return this.getAttribute('inverted') == 'true';"
++                                onset="this.setAttribute('inverted', val); return val;"/>
++      <property name="readonly" onget="return this.getAttribute('readonly') == 'true';"
++                                onset="this.setAttribute('readonly', val); return val;"/>
++
++      <field name="_value">null</field>
++      <method name="_setValue">
++        <parameter name="aValue"/>
++        <parameter name="aUpdate"/>
++        <body>
++        <![CDATA[
++          if (aUpdate && this.value !== aValue) {
++            this._value = aValue;
++            if (this.instantApply)
++              this.valueFromPreferences = aValue;
++            this.preferences.fireChangedEvent(this);
++          }
++          else if (!aUpdate) {
++            this._value = aValue;
++            this.updateElements();
++          }
++          return aValue;
++        ]]>
++        </body>
++      </method>
++      <property name="value" onget="return this._value" onset="return this._setValue(val, true);"/>
++      
++      <property name="locked">
++        <getter>
++          return this.preferences.rootBranch.prefIsLocked(this.name);
++        </getter>
++      </property>
++      
++      <property name="disabled">
++        <getter>
++          return this.getAttribute("disabled") == "true";
++        </getter>
++        <setter>
++        <![CDATA[
++          if (val) 
++            this.setAttribute("disabled", "true");
++          else
++            this.removeAttribute("disabled");
++
++          if (!this.id)
++            return val;
++
++          var elements = document.getElementsByAttribute("preference", this.id);
++          for (var i = 0; i < elements.length; ++i) {
++            elements[i].disabled = val;
++            
++            var labels = document.getElementsByAttribute("control", elements[i].id);
++            for (var j = 0; j < labels.length; ++j)
++              labels[j].disabled = val;
++          }
++            
++          return val;
++        ]]>
++        </setter>
++      </property>
++      
++      <property name="tabIndex">
++        <getter>
++          return parseInt(this.getAttribute("tabindex"));
++        </getter>
++        <setter>
++        <![CDATA[
++          if (val) 
++            this.setAttribute("tabindex", val);
++          else
++            this.removeAttribute("tabindex");
++
++          if (!this.id)
++            return val;
++
++          var elements = document.getElementsByAttribute("preference", this.id);
++          for (var i = 0; i < elements.length; ++i) {
++            elements[i].tabIndex = val;
++            
++            var labels = document.getElementsByAttribute("control", elements[i].id);
++            for (var j = 0; j < labels.length; ++j)
++              labels[j].tabIndex = val;
++          }
++            
++          return val;
++        ]]>
++        </setter>
++      </property>
++
++      <property name="hasUserValue">
++        <getter>
++        <![CDATA[
++          return this.preferences.rootBranch.prefHasUserValue(this.name) &&
++                 this.value !== undefined;
++        ]]>
++        </getter>
++      </property>
++      
++      <method name="reset">
++        <body>
++          // defer reset until preference update
++          this.value = undefined;
++        </body>
++      </method>
++
++      <field name="_useDefault">false</field>      
++      <property name="defaultValue">
++        <getter>
++        <![CDATA[
++          this._useDefault = true;
++          var val = this.valueFromPreferences;
++          this._useDefault = false;
++          return val;
++        ]]>
++        </getter>
++      </property>
++      
++      <property name="_branch">
++        <getter>
++          return this._useDefault ? this.preferences.defaultBranch : this.preferences.rootBranch;
++        </getter>
++      </property>
++      
++      <field name="batching">false</field>
++      
++      <method name="_reportUnknownType">
++        <body>
++        <![CDATA[
++          var consoleService = Components.classes["@mozilla.org/consoleservice;1"]
++                                         .getService(Components.interfaces.nsIConsoleService);
++          var msg = "<preference> with id='" + this.id + "' and name='" + 
++                    this.name + "' has unknown type '" + this.type + "'.";
++          consoleService.logStringMessage(msg);
++        ]]>
++        </body>
++      </method>
++      
++      <property name="valueFromPreferences">
++        <getter>
++        <![CDATA[
++          try {
++            // Force a resync of value with preferences.
++            switch (this.type) {
++            case "int":
++              return this._branch.getIntPref(this.name);
++            case "bool":
++              var val = this._branch.getBoolPref(this.name);
++              return this.inverted ? !val : val;
++            case "wstring":
++              return this._branch
++                         .getComplexValue(this.name, Components.interfaces.nsIPrefLocalizedString)
++                         .data;
++            case "string":
++            case "unichar":
++              return this._branch
++                         .getComplexValue(this.name, Components.interfaces.nsISupportsString)
++                         .data;
++            case "fontname":
++              var family = this._branch
++                               .getComplexValue(this.name, Components.interfaces.nsISupportsString)
++                               .data;
++              var fontEnumerator = Components.classes["@mozilla.org/gfx/fontenumerator;1"]
++                                             .createInstance(Components.interfaces.nsIFontEnumerator);
++              return fontEnumerator.getStandardFamilyName(family);
++            case "file":
++              var f = this._branch
++                          .getComplexValue(this.name, Components.interfaces.nsILocalFile);
++              return f;
++            default:
++              this._reportUnknownType();
++            }
++          }
++          catch (e) { }
++          return null;
++        ]]>
++        </getter>
++        <setter>
++        <![CDATA[
++          // Exit early if nothing to do.
++          if (this.readonly || this.valueFromPreferences == val)
++            return val;
++
++          // The special value undefined means 'reset preference to default'.
++          if (val === undefined) {
++            this.preferences.rootBranch.clearUserPref(this.name);
++            return val;
++          }
++
++          // Force a resync of preferences with value.
++          switch (this.type) {
++          case "int":
++            this.preferences.rootBranch.setIntPref(this.name, val);
++            break;
++          case "bool":
++            this.preferences.rootBranch.setBoolPref(this.name, this.inverted ? !val : val);
++            break;
++          case "wstring":
++            var pls = Components.classes["@mozilla.org/pref-localizedstring;1"]
++                                .createInstance(Components.interfaces.nsIPrefLocalizedString);
++            pls.data = val;
++            this.preferences.rootBranch
++                .setComplexValue(this.name, Components.interfaces.nsIPrefLocalizedString, pls);
++            break;
++          case "string":
++          case "unichar":
++          case "fontname":
++            var iss = Components.classes["@mozilla.org/supports-string;1"]
++                                .createInstance(Components.interfaces.nsISupportsString);
++            iss.data = val;
++            this.preferences.rootBranch
++                .setComplexValue(this.name, Components.interfaces.nsISupportsString, iss);
++            break;
++          case "file":
++            var lf;
++            if (typeof(val) == "string") {
++              lf = Components.classes["@mozilla.org/file/local;1"]
++                             .createInstance(Components.interfaces.nsILocalFile);
++              lf.persistentDescriptor = val;
++              if (!lf.exists())
++                lf.initWithPath(val);
++            }
++            else 
++              lf = val.QueryInterface(Components.interfaces.nsILocalFile);
++            this.preferences.rootBranch
++                .setComplexValue(this.name, Components.interfaces.nsILocalFile, lf);
++            break;
++          default:
++            this._reportUnknownType();
++          }
++          if (!this.batching)
++            this.preferences.service.savePrefFile(null);
++          return val;
++        ]]>
++        </setter>
++      </property>
++      
++      <method name="setElementValue">
++        <parameter name="aElement"/>
++        <body>
++        <![CDATA[
++          if (this.locked)
++            aElement.disabled = true;
++
++          if (!this.isElementEditable(aElement))
++            return;
++
++          var rv = undefined;
++          if (aElement.hasAttribute("onsyncfrompreference")) {
++            // Value changed, synthesize an event
++            try {
++              var event = document.createEvent("Events");
++              event.initEvent("syncfrompreference", true, true);
++              var f = new Function ("event", 
++                                    aElement.getAttribute("onsyncfrompreference"));
++              rv = f.call(aElement, event);
++            }
++            catch (e) {
++              Components.utils.reportError(e);
++            }
++          }
++          var val = rv !== undefined ? rv : (this.instantApply ? this.valueFromPreferences : this.value);
++          // if the preference is marked for reset, show default value in UI
++          if (val === undefined)
++            val = this.defaultValue;
++
++          /**
++           * Initialize a UI element property with a value. Handles the case 
++           * where an element has not yet had a XBL binding attached for it and
++           * the property setter does not yet exist by setting the same attribute
++           * on the XUL element using DOM apis and assuming the element's 
++           * constructor or property getters appropriately handle this state. 
++           */
++          function setValue(element, attribute, value) {
++            if (attribute in element) 
++              element[attribute] = value;
++            else
++              element.setAttribute(attribute, value);
++          }
++          if (aElement.localName == "checkbox" ||
++              aElement.localName == "listitem")
++            setValue(aElement, "checked", val);
++          else if (aElement.localName == "colorpicker")
++            setValue(aElement, "color", val);
++          else if (aElement.localName == "textbox") {
++            // XXXmano Bug 303998: Avoid a caret placement issue if either the
++            // preference observer or its setter calls updateElements as a result
++            // of the input event handler.
++            if (aElement.value !== val)
++              setValue(aElement, "value", val);
++          }
++          else
++            setValue(aElement, "value", val);
++        ]]>
++        </body>
++      </method>
++
++      <method name="getElementValue">
++        <parameter name="aElement"/>
++        <body>
++        <![CDATA[
++          if (aElement.hasAttribute("onsynctopreference")) {
++            // Value changed, synthesize an event
++            try {
++              var event = document.createEvent("Events");
++              event.initEvent("synctopreference", true, true);
++              var f = new Function ("event", 
++                                    aElement.getAttribute("onsynctopreference"));
++              var rv = f.call(aElement, event);
++              if (rv !== undefined) 
++                return rv;
++            }
++            catch (e) {
++              Components.utils.reportError(e);
++            }
++          }
++          
++          /**
++           * Read the value of an attribute from an element, assuming the 
++           * attribute is a property on the element's node API. If the property
++           * is not present in the API, then assume its value is contained in
++           * an attribute, as is the case before a binding has been attached.
++           */
++          function getValue(element, attribute) {
++            if (attribute in element)
++              return element[attribute];
++            return element.getAttribute(attribute);
++          }
++          if (aElement.localName == "checkbox" ||
++              aElement.localName == "listitem")
++            var value = getValue(aElement, "checked");
++          else if (aElement.localName == "colorpicker")
++            value = getValue(aElement, "color");
++          else
++            value = getValue(aElement, "value");
++
++          switch (this.type) {
++          case "int":
++            return parseInt(value, 10) || 0;
++          case "bool":
++            return typeof(value) == "boolean" ? value : value == "true";
++          }
++          return value;
++        ]]>
++        </body>
++      </method>
++      
++      <method name="isElementEditable">
++        <parameter name="aElement"/>
++        <body>
++        <![CDATA[
++          switch (aElement.localName) {
++          case "checkbox":
++          case "colorpicker":
++          case "radiogroup":
++          case "textbox":
++          case "listitem":
++          case "listbox":
++          case "menulist":
++            return true;
++          }
++          return aElement.getAttribute("preference-editable") == "true";
++        ]]> 
++        </body>
++      </method>
++      
++      <method name="updateElements">
++        <body>
++        <![CDATA[
++          if (!this.id)
++            return;
++
++          // This "change" event handler tracks changes made to preferences by 
++          // sources other than the user in this window. 
++          var elements = document.getElementsByAttribute("preference", this.id);
++          for (var i = 0; i < elements.length; ++i) 
++            this.setElementValue(elements[i]);
++        ]]>
++        </body>
++      </method>
++    </implementation>
++    
++    <handlers>
++      <handler event="change">
++        this.updateElements();
++      </handler>
++    </handlers>
++  </binding>
++
++  <binding id="prefwindow"
++           extends="chrome://global/content/bindings/dialog.xml#dialog">
++    <resources>
++      <stylesheet src="chrome://global/skin/preferences.css"/>
++    </resources>
++    <content dlgbuttons="accept,cancel" persist="lastSelected screenX screenY"
++             closebuttonlabel="&preferencesCloseButton.label;"
++             closebuttonaccesskey="&preferencesCloseButton.accesskey;"
++             role="dialog"
++#ifdef XP_WIN
++             title="&preferencesDefaultTitleWin.title;">
++#else
++             title="&preferencesDefaultTitleMac.title;">
++#endif
++      <xul:windowdragbox orient="vertical">
++        <xul:radiogroup anonid="selector" orient="horizontal" class="paneSelector chromeclass-toolbar"
++                        role="listbox"/> <!-- Expose to accessibility APIs as a listbox -->
++      </xul:windowdragbox>
++      <xul:hbox flex="1" class="paneDeckContainer">
++        <xul:deck anonid="paneDeck" flex="1">
++          <children includes="prefpane"/>
++        </xul:deck>
++      </xul:hbox>
++      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons"
++#ifdef XP_UNIX_GNOME
++                >
++        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
++        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++        <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"/>
++        <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="help" class="dialog-button" hidden="true" icon="help"/>
++        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
++#endif
++      </xul:hbox>
++      <xul:hbox>
++        <children/>
++      </xul:hbox>
++    </content>
++    <implementation implements="nsITimerCallback">
++      <constructor>
++      <![CDATA[
++        if (this.type != "child") {
++          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
++                               .getService(Components.interfaces.nsIPrefBranch);
++          this.instantApply = psvc.getBoolPref("browser.preferences.instantApply");
++          if (this.instantApply) {
++            var docElt = document.documentElement;
++            var acceptButton = docElt.getButton("accept");
++            acceptButton.hidden = true;
++            var cancelButton  = docElt.getButton("cancel");
++#ifdef XP_MACOSX
++            // no buttons on Mac except Help
++            cancelButton.hidden = true;
++            // Also, don't fire onDialogAccept on enter
++            acceptButton.disabled = true;
++#else
++            // morph the Cancel button into the Close button
++            cancelButton.setAttribute ("icon", "close");
++            cancelButton.label = docElt.getAttribute("closebuttonlabel");
++            cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
++#endif
++          }
++        }
++        this.setAttribute("animated", this._shouldAnimate ? "true" : "false");
++        var panes = this.preferencePanes;
++
++        var lastPane = null;
++        if (this.lastSelected) {
++          lastPane = document.getElementById(this.lastSelected);
++          if (!lastPane) {
++            this.lastSelected = null;
++          }
++        }
++
++        var paneToLoad;
++        if ("arguments" in window && window.arguments[0] && document.getElementById(window.arguments[0]) && document.getElementById(window.arguments[0]).nodeName == "prefpane") {
++          paneToLoad = document.getElementById(window.arguments[0]);
++          this.lastSelected = paneToLoad.id;
++        }
++        else if (lastPane)
++          paneToLoad = lastPane;
++        else
++          paneToLoad = panes[0];
++
++        for (var i = 0; i < panes.length; ++i) {
++          this._makePaneButton(panes[i]);
++          if (panes[i].loaded) {
++            // Inline pane content, fire load event to force initialization.
++            this._fireEvent("paneload", panes[i]);
++          }
++        }
++        this.showPane(paneToLoad);
++
++        if (panes.length == 1)
++          this._selector.setAttribute("collapsed", "true");
++      ]]>
++      </constructor>
++
++      <destructor>
++      <![CDATA[
++        // Release timers to avoid reference cycles.
++        if (this._animateTimer) {
++          this._animateTimer.cancel();
++          this._animateTimer = null;
++        }
++        if (this._fadeTimer) {
++          this._fadeTimer.cancel();
++          this._fadeTimer = null;
++        }
++      ]]>
++      </destructor>
++
++      <field name="instantApply">false</field>
++      
++      <property name="preferencePanes"
++                onget="return this.getElementsByTagName('prefpane');"/>
++
++      <property name="type" onget="return this.getAttribute('type');"/>
++      <property name="_paneDeck"
++                onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'paneDeck');"/>
++      <property name="_paneDeckContainer"
++                onget="return document.getAnonymousElementByAttribute(this, 'class', 'paneDeckContainer');"/>
++      <property name="_selector"
++                onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'selector');"/>
++      <property name="lastSelected" 
++                onget="return this.getAttribute('lastSelected');">
++        <setter>
++          this.setAttribute("lastSelected", val); 
++          document.persist(this.id, "lastSelected");
++          return val;
++        </setter>          
++      </property>
++      <property name="currentPane"
++                onset="return this._currentPane = val;">
++        <getter>
++          if (!this._currentPane)
++            this._currentPane = this.preferencePanes[0];
++          
++          return this._currentPane;
++        </getter> 
++      </property>
++      <field name="_currentPane">null</field>
++      
++      
++      <method name="_makePaneButton">
++        <parameter name="aPaneElement"/>
++        <body>
++        <![CDATA[
++          var radio = document.createElement("radio");
++          radio.setAttribute("pane", aPaneElement.id);
++          radio.setAttribute("label", aPaneElement.label);
++          // Expose preference group choice to accessibility APIs as an unchecked list item
++          // The parent group is exposed to accessibility APIs as a list
++          if (aPaneElement.image)
++            radio.setAttribute("src", aPaneElement.image);
++          radio.style.listStyleImage = aPaneElement.style.listStyleImage;
++          this._selector.appendChild(radio);
++          return radio;
++        ]]>
++        </body>
++      </method>
++
++      <method name="showPane">
++        <parameter name="aPaneElement"/>
++        <body>
++        <![CDATA[
++          if (!aPaneElement)
++            return;
++
++          this._selector.selectedItem = document.getAnonymousElementByAttribute(this, "pane", aPaneElement.id);
++          if (!aPaneElement.loaded) {
++            function OverlayLoadObserver(aPane)
++            {
++              this._pane = aPane;
++            }
++            OverlayLoadObserver.prototype = { 
++              _outer: this,
++              observe: function (aSubject, aTopic, aData) 
++              {
++                this._pane.loaded = true;
++                this._outer._fireEvent("paneload", this._pane);
++                this._outer._selectPane(this._pane);
++              }
++            };
++            
++            var obs = new OverlayLoadObserver(aPaneElement);
++            document.loadOverlay(aPaneElement.src, obs);
++          }
++          else
++            this._selectPane(aPaneElement);
++        ]]>
++        </body>
++      </method>
++      
++      <method name="_fireEvent">
++        <parameter name="aEventName"/>
++        <parameter name="aTarget"/>
++        <body>
++        <![CDATA[
++          // Panel loaded, synthesize a load event. 
++          try {
++            var event = document.createEvent("Events");
++            event.initEvent(aEventName, true, true);
++            var cancel = !aTarget.dispatchEvent(event);
++            if (aTarget.hasAttribute("on" + aEventName)) {
++              var fn = new Function ("event", aTarget.getAttribute("on" + aEventName));
++              var rv = fn.call(aTarget, event);
++              if (rv == false)
++                cancel = true;
++            }
++            return !cancel;  
++          }
++          catch (e) { 
++            Components.utils.reportError(e);
++          }
++          return false;
++        ]]>
++        </body>
++      </method>
++      
++      <field name="_initialized">false</field>
++      <method name="_selectPane">
++        <parameter name="aPaneElement"/>
++        <body>
++        <![CDATA[
++#ifdef XP_MACOSX
++          var paneTitle = aPaneElement.label;
++          if (paneTitle != "")
++            document.title = paneTitle;
++#endif
++          var helpButton = document.documentElement.getButton("help");
++          if (aPaneElement.helpTopic)
++            helpButton.hidden = false;
++          else
++            helpButton.hidden = true;
++
++          // Find this pane's index in the deck and set the deck's 
++          // selectedIndex to that value to switch to it.
++          var prefpanes = this.preferencePanes;
++          for (var i = 0; i < prefpanes.length; ++i) {
++            if (prefpanes[i] == aPaneElement) {
++              this._paneDeck.selectedIndex = i;
++              
++              if (this.type != "child") {
++                if (aPaneElement.hasAttribute("flex") && this._shouldAnimate &&
++                    prefpanes.length > 1)
++                  aPaneElement.removeAttribute("flex");
++                // Calling sizeToContent after the first prefpane is loaded
++                // will size the windows contents so style information is
++                // available to calculate correct sizing.
++                if (!this._initialized && prefpanes.length > 1) {
++                  if (this._shouldAnimate)
++                    this.style.minHeight = 0;
++                  window.sizeToContent();
++                }
++
++                var oldPane = this.lastSelected ? document.getElementById(this.lastSelected) : this.preferencePanes[0];
++                oldPane.selected = !(aPaneElement.selected = true);
++                this.lastSelected = aPaneElement.id;
++                this.currentPane = aPaneElement;
++                this._initialized = true;
++
++                // Only animate if we've switched between prefpanes
++                if (this._shouldAnimate && oldPane.id != aPaneElement.id) {
++                  aPaneElement.style.opacity = 0.0;
++                  this.animate(oldPane, aPaneElement);
++                }
++                else if (!this._shouldAnimate && prefpanes.length > 1) {
++                  var targetHeight = parseInt(window.getComputedStyle(this._paneDeckContainer, "").height);
++                  var verticalPadding = parseInt(window.getComputedStyle(aPaneElement, "").paddingTop);
++                  verticalPadding += parseInt(window.getComputedStyle(aPaneElement, "").paddingBottom);
++                  if (aPaneElement.contentHeight > targetHeight - verticalPadding) {
++                    // To workaround the bottom border of a groupbox from being
++                    // cutoff an hbox with a class of bottomBox may enclose it.
++                    // This needs to include its padding to resize properly.
++                    // See bug 394433
++                    var bottomPadding = 0;
++                    var bottomBox = aPaneElement.getElementsByAttribute("class", "bottomBox")[0];
++                    if (bottomBox)
++                      bottomPadding = parseInt(window.getComputedStyle(bottomBox, "").paddingBottom);
++                    window.innerHeight += bottomPadding + verticalPadding + aPaneElement.contentHeight - targetHeight;
++                  }
++
++                  // XXX rstrong - extend the contents of the prefpane to
++                  // prevent elements from being cutoff (see bug 349098).
++                  if (aPaneElement.contentHeight + verticalPadding < targetHeight)
++                    aPaneElement._content.style.height = targetHeight - verticalPadding + "px";
++                }
++              }
++              break;
++            }
++          }
++        ]]>
++        </body>
++      </method>
++      
++      <property name="_shouldAnimate">
++        <getter>
++        <![CDATA[
++          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
++                               .getService(Components.interfaces.nsIPrefBranch);
++#ifdef XP_MACOSX
++          var animate = true;
++#else
++          var animate = false;
++#endif
++          try {
++            animate = psvc.getBoolPref("browser.preferences.animateFadeIn");
++          }
++          catch (e) { }
++          return animate;
++        ]]>
++        </getter>
++      </property>
++      
++      <method name="animate">
++        <parameter name="aOldPane"/>
++        <parameter name="aNewPane"/>
++        <body>
++        <![CDATA[
++          // if we are already resizing, use currentHeight
++          var oldHeight = this._currentHeight ? this._currentHeight : aOldPane.contentHeight;
++          
++          this._multiplier = aNewPane.contentHeight > oldHeight ? 1 : -1;
++          var sizeDelta = Math.abs(oldHeight - aNewPane.contentHeight);
++          this._animateRemainder = sizeDelta % this._animateIncrement;
++
++          this._setUpAnimationTimer(oldHeight);
++        ]]>
++        </body>
++      </method>
++      
++      <property name="_sizeIncrement">
++        <getter>
++        <![CDATA[
++          var lastSelectedPane = document.getElementById(this.lastSelected);
++          var increment = this._animateIncrement * this._multiplier;
++          var newHeight = this._currentHeight + increment;
++          if ((this._multiplier > 0 && this._currentHeight >= lastSelectedPane.contentHeight) ||
++              (this._multiplier < 0 && this._currentHeight <= lastSelectedPane.contentHeight))
++            return 0;
++          
++          if ((this._multiplier > 0 && newHeight > lastSelectedPane.contentHeight) ||
++              (this._multiplier < 0 && newHeight < lastSelectedPane.contentHeight))
++            increment = this._animateRemainder * this._multiplier;
++          return increment;
++        ]]>
++        </getter>
++      </property>
++      
++      <method name="notify">
++        <parameter name="aTimer"/>
++        <body>
++        <![CDATA[
++          if (!document)
++            aTimer.cancel();
++          
++          if (aTimer == this._animateTimer) {
++            var increment = this._sizeIncrement;
++            if (increment != 0) {
++              window.innerHeight += increment;
++              this._currentHeight += increment;
++            }
++            else {
++              aTimer.cancel();
++              this._setUpFadeTimer();
++            }
++          } else if (aTimer == this._fadeTimer) {
++            var elt = document.getElementById(this.lastSelected);
++            var newOpacity = parseFloat(window.getComputedStyle(elt, "").opacity) + this._fadeIncrement;
++            if (newOpacity < 1.0)
++              elt.style.opacity = newOpacity;
++            else {
++              aTimer.cancel();
++              elt.style.opacity = 1.0;
++            }
++          }
++        ]]>
++        </body>
++      </method>
++      
++      <method name="_setUpAnimationTimer">
++        <parameter name="aStartHeight"/>
++        <body>
++        <![CDATA[
++          if (!this._animateTimer) 
++            this._animateTimer = Components.classes["@mozilla.org/timer;1"]
++                                           .createInstance(Components.interfaces.nsITimer);
++          else
++            this._animateTimer.cancel();
++          this._currentHeight = aStartHeight;
++          
++          this._animateTimer.initWithCallback(this, this._animateDelay, 
++                                              Components.interfaces.nsITimer.TYPE_REPEATING_SLACK);
++        ]]>
++        </body>
++      </method>
++      
++      <method name="_setUpFadeTimer">
++        <body>
++        <![CDATA[
++          if (!this._fadeTimer) 
++            this._fadeTimer = Components.classes["@mozilla.org/timer;1"]
++                                        .createInstance(Components.interfaces.nsITimer);
++          else
++            this._fadeTimer.cancel();
++          
++          this._fadeTimer.initWithCallback(this, this._fadeDelay, 
++                                           Components.interfaces.nsITimer.TYPE_REPEATING_SLACK);
++        ]]>
++        </body>
++      </method>
++      
++      <field name="_animateTimer">null</field>
++      <field name="_fadeTimer">null</field>
++      <field name="_animateDelay">15</field>
++      <field name="_animateIncrement">40</field>
++      <field name="_fadeDelay">5</field>
++      <field name="_fadeIncrement">0.40</field>
++      <field name="_animateRemainder">0</field>
++      <field name="_currentHeight">0</field>
++      <field name="_multiplier">0</field>
++
++      <method name="addPane">
++        <parameter name="aPaneElement"/>
++        <body>
++        <![CDATA[
++          this.appendChild(aPaneElement);
++          
++          // Set up pane button
++          this._makePaneButton(aPaneElement);
++        ]]>
++        </body>
++      </method>
++      
++      <method name="openSubDialog">
++        <parameter name="aURL"/>
++        <parameter name="aFeatures"/>
++        <parameter name="aParams"/>
++        <body>
++          return openDialog(aURL, "", "modal,centerscreen,resizable=no" + (aFeatures != "" ? ("," + aFeatures) : ""), aParams);
++        </body>
++      </method>
++      
++      <method name="openWindow">
++        <parameter name="aWindowType"/>
++        <parameter name="aURL"/>
++        <parameter name="aFeatures"/>
++        <parameter name="aParams"/>
++        <body>
++        <![CDATA[
++          var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
++                             .getService(Components.interfaces.nsIWindowMediator);
++          var win = aWindowType ? wm.getMostRecentWindow(aWindowType) : null;
++          if (win) {
++            if ("initWithParams" in win)
++              win.initWithParams(aParams);
++            win.focus();
++          }
++          else {
++            var features = "resizable,dialog=no,centerscreen" + (aFeatures != "" ? ("," + aFeatures) : "");
++            var parentWindow = (this.instantApply || !window.opener || window.opener.closed) ? window : window.opener;
++            win = parentWindow.openDialog(aURL, "_blank", features, aParams);
++          }
++          return win;
++        ]]>
++        </body>
++      </method>
++    </implementation>
++    <handlers>
++      <handler event="dialogaccept">
++      <![CDATA[
++        if (!this._fireEvent("beforeaccept", this)) 
++          return;
++        
++        if (this.type == "child" && window.opener) {
++          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
++                               .getService(Components.interfaces.nsIPrefBranch);
++          var instantApply = psvc.getBoolPref("browser.preferences.instantApply");
++          if (instantApply) {
++            var panes = this.preferencePanes;
++            for (var i = 0; i < panes.length; ++i)
++              panes[i].writePreferences(true);
++          }
++          else {
++            // Clone all the preferences elements from the child document and
++            // insert them into the pane collection of the parent. 
++            var pdoc = window.opener.document;
++            if (pdoc.documentElement.localName == "prefwindow") {
++              var currentPane = pdoc.documentElement.currentPane;
++              var id = window.location.href + "#childprefs";
++              var childPrefs = pdoc.getElementById(id);
++              if (!childPrefs) {
++                var childPrefs = pdoc.createElement("preferences");
++                currentPane.appendChild(childPrefs);
++                childPrefs.id = id;
++              }
++              var panes = this.preferencePanes;
++              for (var i = 0; i < panes.length; ++i) {
++                var preferences = panes[i].preferences;
++                for (var j = 0; j < preferences.length; ++j) {
++                  // Try to find a preference element for the same preference.
++                  var preference = null;
++                  var parentPreferences = pdoc.getElementsByTagName("preferences");
++                  for (var k = 0; (k < parentPreferences.length && !preference); ++k) {
++                    var parentPrefs = parentPreferences[k]
++                                         .getElementsByAttribute("name", preferences[j].name);
++                    for (var l = 0; (l < parentPrefs.length && !preference); ++l) {
++                      if (parentPrefs[l].localName == "preference")
++                        preference = parentPrefs[l];
++                    }
++                  }
++                  if (!preference) {
++                    // No matching preference in the parent window.
++                    preference = pdoc.createElement("preference");
++                    childPrefs.appendChild(preference);
++                    preference.name     = preferences[j].name;
++                    preference.type     = preferences[j].type;
++                    preference.inverted = preferences[j].inverted;
++                    preference.readonly = preferences[j].readonly;
++                    preference.disabled = preferences[j].disabled;
++                  }
++                  preference.value = preferences[j].value;
++                }
++              }
++            }
++          }
++        }
++        else {
++          var panes = this.preferencePanes;
++          for (var i = 0; i < panes.length; ++i)
++            panes[i].writePreferences(false);
++
++          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
++                               .getService(Components.interfaces.nsIPrefService);
++          psvc.savePrefFile(null);
++        }
++      ]]>
++      </handler>
++      <handler event="command">
++        if (event.originalTarget.hasAttribute("pane")) {
++          var pane = document.getElementById(event.originalTarget.getAttribute("pane"));
++          this.showPane(pane);
++        }
++      </handler>
++
++      <handler event="keypress" key="&windowClose.key;" modifiers="accel" phase="capturing">
++      <![CDATA[
++        if (this.instantApply)
++          window.close();
++        event.stopPropagation();
++        event.preventDefault();
++      ]]>
++      </handler>
++
++      <handler event="keypress"
++#ifdef XP_MACOSX
++               key="&openHelpMac.commandkey;" modifiers="accel"
++#else
++               keycode="&openHelp.commandkey;"
++#endif
++               phase="capturing">
++      <![CDATA[
++        var helpButton = this.getButton("help");
++        if (helpButton.disabled || helpButton.hidden)
++          return;
++        this._fireEvent("dialoghelp", this);
++        event.stopPropagation();
++        event.preventDefault();
++      ]]>
++      </handler>
++    </handlers>
++  </binding>
++  
++  <binding id="prefpane">
++    <resources>
++      <stylesheet src="chrome://global/skin/preferences.css"/>
++    </resources>
++    <content>
++      <xul:vbox class="content-box" xbl:inherits="flex">
++        <children/>
++      </xul:vbox>
++    </content>
++    <implementation>
++      <method name="writePreferences">
++        <parameter name="aFlushToDisk"/>
++        <body>
++        <![CDATA[
++          // Write all values to preferences.
++          var preferences = this.preferences;
++          for (var i = 0; i < preferences.length; ++i) {
++            var preference = preferences[i];
++            preference.batching = true;
++            preference.valueFromPreferences = preference.value;
++            preference.batching = false;
++          }
++          if (aFlushToDisk) {
++            var psvc = Components.classes["@mozilla.org/preferences-service;1"]
++                                 .getService(Components.interfaces.nsIPrefService);
++            psvc.savePrefFile(null);
++          }
++        ]]>
++        </body>
++      </method>
++      
++      <property name="src" 
++                onget="return this.getAttribute('src');"
++                onset="this.setAttribute('src', val); return val;"/>
++      <property name="selected" 
++                onget="return this.getAttribute('selected') == 'true';"
++                onset="this.setAttribute('selected', val); return val;"/>
++      <property name="image" 
++                onget="return this.getAttribute('image');"
++                onset="this.setAttribute('image', val); return val;"/>
++      <property name="label" 
++                onget="return this.getAttribute('label');"
++                onset="this.setAttribute('label', val); return val;"/>
++      
++      <property name="preferenceElements"
++                onget="return this.getElementsByAttribute('preference', '*');"/>
++      <property name="preferences"
++                onget="return this.getElementsByTagName('preference');"/>
++
++      <property name="helpTopic">
++        <getter>
++        <![CDATA[
++          // if there are tabs, and the selected tab provides a helpTopic, return that
++          var box = this.getElementsByTagName("tabbox");
++          if (box[0]) {
++            var tab = box[0].selectedTab;
++            if (tab && tab.hasAttribute("helpTopic"))
++              return tab.getAttribute("helpTopic");
++          }
++
++          // otherwise, return the helpTopic of the current panel
++          return this.getAttribute("helpTopic");
++        ]]>
++        </getter>
++      </property>
++
++      <field name="_loaded">false</field>
++      <property name="loaded" 
++                onget="return !this.src ? true : this._loaded;"
++                onset="this._loaded = val; return val;"/>
++      
++      <method name="preferenceForElement">
++        <parameter name="aElement"/>
++        <body>
++          return document.getElementById(aElement.getAttribute("preference"));
++        </body>
++      </method>
++      
++      <method name="getPreferenceElement">
++        <parameter name="aStartElement"/>
++        <body>
++        <![CDATA[
++          var temp = aStartElement;
++          while (temp && temp.nodeType == Node.ELEMENT_NODE && 
++                 !temp.hasAttribute("preference"))
++            temp = temp.parentNode;
++          return temp.nodeType == Node.ELEMENT_NODE ? temp : aStartElement;
++        ]]>
++        </body>
++      </method>
++      
++      <method name="userChangedValue">
++        <parameter name="aElement"/>
++        <body>
++        <![CDATA[
++          var element = this.getPreferenceElement(aElement);
++          if (element.hasAttribute("preference")) {
++            var preference = document.getElementById(element.getAttribute("preference"));
++            var prefVal = preference.getElementValue(element);
++            preference.value = prefVal;
++          }
++        ]]>
++        </body>
++      </method>
++      
++      <property name="contentHeight">
++        <getter>
++          var targetHeight = parseInt(window.getComputedStyle(this._content, "").height);
++          targetHeight += parseInt(window.getComputedStyle(this._content, "").marginTop);
++          targetHeight += parseInt(window.getComputedStyle(this._content, "").marginBottom);
++          return targetHeight;
++        </getter>
++      </property>
++      <field name="_content">
++        document.getAnonymousElementByAttribute(this, "class", "content-box");
++      </field>
++    </implementation>
++    <handlers>
++      <handler event="command">
++        // This "command" event handler tracks changes made to preferences by 
++        // the user in this window. 
++        this.userChangedValue(event.target);
++      </handler>
++      <handler event="select">
++        // This "select" event handler tracks changes made to colorpicker 
++        // preferences by the user in this window.
++        if (event.target.localName == "colorpicker") 
++          this.userChangedValue(event.target);
++      </handler>
++      <handler event="change">
++        // This "change" event handler tracks changes made to preferences by 
++        // the user in this window. 
++        this.userChangedValue(event.target);
++      </handler>
++      <handler event="input">
++        // This "input" event handler tracks changes made to preferences by 
++        // the user in this window.
++        this.userChangedValue(event.target);
++      </handler>
++      <handler event="paneload">
++      <![CDATA[
++        // Initialize all values from preferences.
++        var elements = this.preferenceElements;
++        for (var i = 0; i < elements.length; ++i) {
++          try {
++            var preference = this.preferenceForElement(elements[i]);
++            preference.setElementValue(elements[i]);
++          }
++          catch (e) {
++            dump("*** No preference found for " + elements[i].getAttribute("preference") + "\n");
++          }
++        }
++      ]]>      
++      </handler>
++    </handlers>
++  </binding>
++          
++  <binding id="panebutton" extends="chrome://global/content/bindings/radio.xml#radio">
++    <resources>
++      <stylesheet src="chrome://global/skin/preferences.css"/>
++    </resources>
++    <content>
++      <xul:image class="paneButtonIcon" xbl:inherits="src"/>
++      <xul:label class="paneButtonLabel" xbl:inherits="value=label"/>
++    </content>
++    <implementation implements="nsIAccessible">
++      <property name="accessibleType" readonly="true">
++        <getter>
++          <![CDATA[
++            return Components.interfaces.nsIAccessibleProvider.XULListitem;
++          ]]>
++        </getter>
++      </property>
++    </implementation>
++  </binding>
++
++</bindings>
++
++# -*- Mode: Java; 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 the Preferences System.
++#
++# The Initial Developer of the Original Code is
++# Ben Goodger.
++# Portions created by the Initial Developer are Copyright (C) 2005
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#   Ben Goodger <ben@mozilla.org>
++#   Josh Aas <josh@mozilla.com>
++#
++# 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 *****
++
++#
++# This is PrefWindow 6. The Code Could Well Be Ready, Are You?
++#
++#    Historical References:
++#    PrefWindow V   (February 1, 2003)
++#    PrefWindow IV  (April 24, 2000)
++#    PrefWindow III (January 6, 2000)
++#    PrefWindow II  (???)
++#    PrefWindow I   (June 4, 1999)
++#
+diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
++++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+@@ -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 @@ private:
+   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)
+@@ -407,16 +410,19 @@ nsUnixSystemProxySettings::GetProxyForUR
+   nsCAutoString host;
+   rv = aURI->GetHost(host);
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   PRInt32 port;
+   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);
+ }
+ 
+ #define NS_UNIXSYSTEMPROXYSERVICE_CID  /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\
+      { 0x0fa3158c, 0xd5a7, 0x43de, \
+diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
+--- a/toolkit/xre/Makefile.in
++++ b/toolkit/xre/Makefile.in
+@@ -94,17 +94,18 @@ EXPORTS = nsWindowsDllInterceptor.h
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+ CMMSRCS = nsNativeAppSupportCocoa.mm
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ CPPSRCS += nsNativeAppSupportOS2.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
+ CPPSRCS += nsQAppInstance.cpp
+ EXPORTS += nsQAppInstance.h
+ else
+ CPPSRCS += nsNativeAppSupportDefault.cpp
+ endif
+diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
+new file mode 100644
+--- /dev/null
++++ b/toolkit/xre/nsKDEUtils.cpp
+@@ -0,0 +1,328 @@
++/* -*- 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;
++    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 --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h
+new file mode 100644
+--- /dev/null
++++ b/toolkit/xre/nsKDEUtils.h
+@@ -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 --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
+--- a/uriloader/exthandler/Makefile.in
++++ b/uriloader/exthandler/Makefile.in
+@@ -88,18 +88,19 @@ LOCAL_INCLUDES = -I$(srcdir)
+ LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
+             -I$(topsrcdir)/dom/ipc \
+             -I$(topsrcdir)/content/base/src \
+             -I$(topsrcdir)/content/events/src \
+             -I$(topsrcdir)/netwerk/base/src \
+             -I$(topsrcdir)/netwerk/protocol/http
+ 
+ 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)
+ OSHELPER += nsMIMEInfoAndroid.cpp
+ OSHELPER += nsAndroidHandlerApp.cpp
+ OSHELPER += nsExternalSharingAppService.cpp
+ EXPORTS += nsExternalSharingAppService.h
+ OSHELPER += nsExternalURLHandlerService.cpp
+diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
+new file mode 100644
+--- /dev/null
++++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp
+@@ -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 <bryner@brianryner.com>  (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 --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h
+new file mode 100644
+--- /dev/null
++++ b/uriloader/exthandler/unix/nsCommonRegistry.h
+@@ -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 <bryner@brianryner.com>  (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 --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
+new file mode 100644
+--- /dev/null
++++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
+@@ -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 <bryner@brianryner.com>  (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 --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
+new file mode 100644
+--- /dev/null
++++ b/uriloader/exthandler/unix/nsKDERegistry.h
+@@ -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 <bryner@brianryner.com>  (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 --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
++++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+@@ -50,30 +50,33 @@
+ #include <QString>
+ #if (MOZ_ENABLE_CONTENTACTION)
+ #include <contentaction/contentaction.h>
+ #include "nsContentHandlerApp.h"
+ #endif
+ #endif
+ 
+ #include "nsMIMEInfoUnix.h"
+-#include "nsGNOMERegistry.h"
++#include "nsCommonRegistry.h"
+ #include "nsIGIOService.h"
+ #include "nsNetCID.h"
+ #include "nsIIOService.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)){
+     HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nsnull);
+     if (action) {
+       nsCAutoString spec;
+       aURI->GetAsciiSpec(spec);
+       if (hildon_uri_open(spec.get(), action, nsnull))
+@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
+ 
+   return rv;
+ }
+ 
+ NS_IMETHODIMP
+ 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)
+     *_retval = PR_TRUE;
+ 
+   if (*_retval)
+     return NS_OK;
+ 
+@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+     ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
+   if (action.isValid()) {
+     action.trigger();
+     return NS_OK;
+   }
+   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);
+   nsCAutoString uriSpec;
+   if (giovfs) {
+     // nsGIOMimeApp->Launch wants a URI string instead of local file
+     nsresult rv;
+     nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
+     NS_ENSURE_SUCCESS(rv, rv);
+     nsCOMPtr<nsIURI> uri;
+@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+     /* Fallback to GnomeVFS */
+     nsCOMPtr<nsIGnomeVFSMimeApp> app;
+     if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
+       return app->Launch(nativePath);
+   }
+ 
+   // 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);
+     if (giovfs) {
+       nsCOMPtr<nsIGIOMimeApp> app;
+       if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
+         return app->Launch(uriSpec);
+     } else if (gnomevfs) {
+diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
++++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+@@ -44,17 +44,17 @@
+ #if defined(MOZ_ENABLE_CONTENTACTION)
+ #include <contentaction/contentaction.h>
+ #include <QString>
+ #endif
+ 
+ #include "nsOSHelperAppService.h"
+ #include "nsMIMEInfoUnix.h"
+ #ifdef MOZ_WIDGET_GTK2
+-#include "nsGNOMERegistry.h"
++#include "nsCommonRegistry.h"
+ #endif
+ #include "nsISupports.h"
+ #include "nsString.h"
+ #include "nsReadableUtils.h"
+ #include "nsUnicharUtils.h"
+ #include "nsXPIDLString.h"
+ #include "nsIURL.h"
+ #include "nsIFileStreams.h"
+@@ -1219,29 +1219,29 @@ nsresult nsOSHelperAppService::OSProtoco
+     ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
+ 
+   if (action.isValid())
+     *aHandlerExists = PR_TRUE;
+ #endif
+ 
+ #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
+ #endif
+ 
+   return NS_OK;
+ }
+ 
+ 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;
+ #endif
+ }
+ 
+ nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
+ {
+@@ -1327,17 +1327,17 @@ nsOSHelperAppService::GetFromExtension(c
+                                          minorType,
+                                          mime_types_description,
+                                          PR_TRUE);
+ 
+   if (NS_FAILED(rv) || majorType.IsEmpty()) {
+     
+ #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;
+     }
+ #endif
+ 
+     rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
+                                   majorType,
+@@ -1453,17 +1453,17 @@ nsOSHelperAppService::GetFromType(const 
+ #ifdef MOZ_WIDGET_GTK2
+   nsMIMEInfoBase *gnomeInfo = nsnull;
+   if (handler.IsEmpty()) {
+     // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
+     // GNOME versions no longer have type-to-extension mappings, so we might
+     // 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;
+     }
+   }
+ #endif
+ 
+   // Now look up our extensions
+diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
+--- a/widget/src/gtk2/Makefile.in
++++ b/widget/src/gtk2/Makefile.in
+@@ -157,11 +157,14 @@ endif
+ 
+ DEFINES		+= -DCAIRO_GFX
+ 
+ INCLUDES	+= \
+ 		-I$(srcdir)/../xpwidgets \
+ 		-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 --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
+--- a/widget/src/gtk2/nsFilePicker.cpp
++++ b/widget/src/gtk2/nsFilePicker.cpp
+@@ -31,16 +31,17 @@
+  * 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 <gtk/gtk.h>
++#include <gdk/gdkx.h>
+ 
+ #include "nsIFileURL.h"
+ #include "nsIURI.h"
+ #include "nsIWidget.h"
+ #include "nsILocalFile.h"
+ #include "nsIStringBundle.h"
+ 
+ #include "nsArrayEnumerator.h"
+@@ -50,16 +51,17 @@
+ #include "nsReadableUtils.h"
+ #include "mozcontainer.h"
+ 
+ #include "prmem.h"
+ #include "prlink.h"
+ 
+ #include "nsFilePicker.h"
+ #include "nsAccessibilityHelper.h"
++#include "nsKDEUtils.h"
+ 
+ #if (MOZ_PLATFORM_MAEMO == 5)
+ #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
+ #endif
+ 
+ #define MAX_PREVIEW_SIZE 180
+ 
+ nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull;
+@@ -271,17 +273,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+   return nsBaseFilePicker::AppendFilters(aFilterMask);
+ }
+ 
+ NS_IMETHODIMP
+ nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter)
+ {
+   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;
+   CopyUTF16toUTF8(aFilter, filter);
+   CopyUTF16toUTF8(aTitle, name);
+ 
+   mFilters.AppendElement(filter);
+   mFilterNames.AppendElement(name);
+@@ -419,16 +423,19 @@ confirm_overwrite_file(GtkWidget *parent
+   gtk_widget_destroy(dialog);
+ 
+   return result;
+ }
+ 
+ NS_IMETHODIMP
+ nsFilePicker::Show(PRInt16 *aReturn)
+ {
++  if( nsKDEUtils::kdeSupport())
++      return kdeFileDialog( aReturn );
++
+   NS_ENSURE_ARG_POINTER(aReturn);
+ 
+   nsXPIDLCString title;
+   title.Adopt(ToNewUTF8String(mTitle));
+ 
+   GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
+ 
+   GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
+@@ -569,8 +576,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+     *aReturn = nsIFilePicker::returnCancel;
+     break;
+   }
+ 
+   gtk_widget_destroy(file_chooser);
+ 
+   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 --git a/widget/src/gtk2/nsFilePicker.h b/widget/src/gtk2/nsFilePicker.h
+--- a/widget/src/gtk2/nsFilePicker.h
++++ b/widget/src/gtk2/nsFilePicker.h
+@@ -89,11 +89,17 @@ protected:
+   nsString  mDefault;
+   nsString  mDefaultExtension;
+ 
+   nsTArray<nsCString> mFilters;
+   nsTArray<nsCString> mFilterNames;
+ 
+ private:
+   static nsILocalFile *mPrevDisplayDirectory;
++
++  bool kdeRunning();
++  bool getKdeRunning();
++  NS_IMETHODIMP kdeFileDialog(PRInt16 *aReturn);
++  NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn);
++  nsCString kdeMakeFilter( int index );
+ };
+ 
+ #endif
+diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
+--- a/xpcom/components/Makefile.in
++++ b/xpcom/components/Makefile.in
+@@ -94,10 +94,11 @@ FORCE_STATIC_LIB = 1
+ 
+ # Force use of PIC
+ FORCE_USE_PIC	= 1
+ include $(topsrcdir)/config/rules.mk
+ 
+ DEFINES	+= -D_IMPL_NS_COM
+ 
+ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+ CXXFLAGS += $(MOZ_GTK2_CFLAGS)
+ endif
+diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
+--- a/xpcom/components/ManifestParser.cpp
++++ b/xpcom/components/ManifestParser.cpp
+@@ -55,16 +55,17 @@
+ #include "nsTextFormatter.h"
+ #include "nsVersionComparator.h"
+ #include "nsXPCOMCIDInternal.h"
+ 
+ #include "nsIConsoleService.h"
+ #include "nsIScriptError.h"
+ #include "nsIXULAppInfo.h"
+ #include "nsIXULRuntime.h"
++#include "nsKDEUtils.h"
+ 
+ struct ManifestDirective
+ {
+   const char* directive;
+   int argc;
+ 
+   // Some directives should only be delivered for NS_COMPONENT_LOCATION
+   // manifests.
+@@ -422,16 +423,17 @@ ParseManifestCommon(NSLocationType aType
+ 
+   NS_NAMED_LITERAL_STRING(kPlatform, "platform");
+   NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
+   NS_NAMED_LITERAL_STRING(kApplication, "application");
+   NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
+   NS_NAMED_LITERAL_STRING(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");
+ 
+   nsAutoString appID;
+   nsAutoString appVersion;
+   nsAutoString osTarget;
+   nsAutoString abi;
+@@ -461,35 +463,39 @@ ParseManifestCommon(NSLocationType aType
+         CopyUTF8toUTF16(s, abi);
+         abi.Insert(PRUnichar('_'), 0);
+         abi.Insert(osTarget, 0);
+       }
+     }
+   }
+ 
+   nsAutoString osVersion;
++  nsAutoString desktop;
+ #if defined(XP_WIN)
+   OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
+   if (GetVersionEx(&info)) {
+     nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+                                          info.dwMajorVersion,
+                                          info.dwMinorVersion);
+   }
++  desktop = NS_LITERAL_STRING("win");
+ #elif defined(XP_MACOSX)
+   SInt32 majorVersion, minorVersion;
+   if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) &&
+       (Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) {
+     nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+                                          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
+   // at the end.
+   nsTArray<CachedDirective> contracts;
+ 
+   char *token;
+   char *newline = buf;
+@@ -558,24 +564,26 @@ ParseManifestCommon(NSLocationType aType
+     bool ok = true;
+     TriState stAppVersion = eUnspecified;
+     TriState stApp = eUnspecified;
+     TriState stOsVersion = eUnspecified;
+     TriState stOs = eUnspecified;
+     TriState stABI = eUnspecified;
+     bool platform = false;
+     bool contentAccessible = false;
++    TriState stDesktop = eUnspecified;
+ 
+     while (NULL != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
+       ToLowerCase(token);
+       NS_ConvertASCIItoUTF16 wtoken(token);
+ 
+       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;
+ 
+       if (directive->contentflags &&
+           (CheckFlag(kPlatform, wtoken, platform) ||
+            CheckFlag(kContentAccessible, wtoken, contentAccessible)))
+         continue;
+@@ -594,16 +602,17 @@ ParseManifestCommon(NSLocationType aType
+       ok = false;
+     }
+ 
+     if (!ok ||
+         stApp == eBad ||
+         stAppVersion == eBad ||
+         stOs == eBad ||
+         stOsVersion == eBad ||
++        stDesktop == eBad ||
+         stABI == eBad)
+       continue;
+ 
+     if (directive->regfunc) {
+       if (GeckoProcessType_Default != XRE_GetProcessType())
+         continue;
+ 
+       if (!nsChromeRegistry::gChromeRegistry) {
+diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
+--- a/xpcom/io/Makefile.in
++++ b/xpcom/io/Makefile.in
+@@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+ DEFINES		+= -D_IMPL_NS_COM
+ 
+ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(findstring lib64,$(libdir)))
+ DEFINES     += -DHAVE_USR_LIB64_DIR
+ endif
+ endif
+ 
+-LOCAL_INCLUDES	+= -I..
++LOCAL_INCLUDES	+= -I.. -I$(topsrcdir)/toolkit/xre
+ 
+ ifeq ($(MOZ_PLATFORM_MAEMO),5)
+ CFLAGS          += $(MOZ_DBUS_CFLAGS)
+ CXXFLAGS        += $(MOZ_DBUS_CFLAGS)
+ endif
+ 
+ ifdef MOZ_PLATFORM_MAEMO
+ CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS)
+diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+--- a/xpcom/io/nsLocalFileUnix.cpp
++++ b/xpcom/io/nsLocalFileUnix.cpp
+@@ -88,16 +88,17 @@
+ #include "prproces.h"
+ #include "nsIDirectoryEnumerator.h"
+ #include "nsISimpleEnumerator.h"
+ #include "nsITimelineService.h"
+ 
+ #ifdef MOZ_WIDGET_GTK2
+ #include "nsIGIOService.h"
+ #include "nsIGnomeVFSService.h"
++#include "nsKDEUtils.h"
+ #endif
+ 
+ #ifdef XP_MACOSX
+ #include <Carbon/Carbon.h>
+ #include "CocoaFileUtils.h"
+ #include "prmem.h"
+ #include "plbase64.h"
+ 
+@@ -1730,44 +1731,50 @@ nsLocalFile::SetPersistentDescriptor(con
+     return InitWithNativePath(aPersistentDescriptor);
+ #endif
+ }
+ 
+ NS_IMETHODIMP
+ 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;
+         if (NS_FAILED(GetParent(getter_AddRefs(parentDir))))
+             return NS_ERROR_FAILURE;
+         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))) {
+       nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
+       ::CFRelease(url);
+       return rv;
+     }
+     return NS_ERROR_FAILURE;
+@@ -1793,16 +1800,23 @@ nsLocalFile::Launch()
+ 
+     if (nsnull == connection)
+       return NS_ERROR_FAILURE;
+ 
+     if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)
+       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) {
+       return giovfs->ShowURIForInput(mPath);
+     } else if (gnomevfs) {
+       /* GnomeVFS fallback */
+       return gnomevfs->ShowURIForInput(mPath);
+     }