From 8099d6f1f80dea0622de1a7fe6e246d96750c3e0 Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Fri, 23 Nov 2012 12:00:56 +1100
Subject: [PATCH] LOG Properly update KDE integration patches, do minor spec
 cosmetic updates

---
 firefox-17.0-kde.patch | 452 +++++++++++++++++++++++++---------------
 firefox.spec           |  24 +--
 mozilla-17.0-kde.patch | 458 +++++++++++++----------------------------
 3 files changed, 444 insertions(+), 490 deletions(-)

diff --git a/firefox-17.0-kde.patch b/firefox-17.0-kde.patch
index beef666..528cc19 100644
--- a/firefox-17.0-kde.patch
+++ b/firefox-17.0-kde.patch
@@ -1,6 +1,8 @@
---- mozilla-release/browser/base/content/browser-kde.xul.kdepatch	2012-11-21 20:32:50.498345565 +0400
-+++ mozilla-release/browser/base/content/browser-kde.xul	2012-11-21 20:32:50.498345565 +0400
-@@ -0,0 +1,1210 @@
+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,1272 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -12,7 +14,6 @@
 +<?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://browser/skin/devtools/common.css" type="text/css"?>
-+<?xml-stylesheet href="chrome://browser/skin/devtools/webconsole.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 +
 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
@@ -58,9 +59,6 @@
 +#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"/>
@@ -185,7 +183,45 @@
 +      </hbox>
 +    </panel>
 +
-+    <panel id="editSharePopup"
++    <panel id="socialActivatedNotification"
++           type="arrow"
++           hidden="true"
++           consumeoutsideclicks="true"
++           align="start"
++           role="alert">
++      <hbox flex="1">
++        <image src="chrome://browser/content/social-icon.png" class="popup-notification-icon"/>
++        <vbox flex="1">
++          <description id="social-activation-message" class="popup-notification-description"/>
++          <spacer flex="1"/>
++          <hbox pack="end" align="center" class="popup-notification-button-container">
++#ifndef XP_UNIX
++        <button id="social-undoactivation-button"
++                label="&social.activated.undobutton.label;"
++                accesskey="&social.activated.undobutton.accesskey;"
++                onclick="SocialUI.undoActivation();"/>
++        <button default="true"
++                autofocus="autofocus"
++                label="&social.ok.label;"
++                accesskey="&social.ok.accesskey;"
++                oncommand="SocialUI.notificationPanel.hidePopup();"/>
++#else
++        <button default="true"
++                autofocus="autofocus"
++                label="&social.ok.label;"
++                accesskey="&social.ok.accesskey;"
++                oncommand="SocialUI.notificationPanel.hidePopup();"/>
++        <button id="social-undoactivation-button"
++                label="&social.activated.undobutton.label;"
++                accesskey="&social.activated.undobutton.accesskey;"
++                onclick="SocialUI.undoActivation();"/>
++#endif
++          </hbox>
++        </vbox>
++      </hbox>
++    </panel>
++
++    <panel id="unsharePopup"
 +           type="arrow"
 +           orient="vertical"
 +           ignorekeys="true"
@@ -193,40 +229,59 @@
 +           onpopupshown="SocialShareButton.panelShown(event);"
 +           consumeoutsideclicks="true"
 +           level="top">
-+      <hbox id="editSharePopupBottomButtons" pack="end">
-+#ifdef XP_UNIX
-+        <button id="editSharePopupUndoButton"
-+                class="editSharePopupBottomButton"
-+                label="&social.sharePopup.undo.label;"
-+                accesskey="&social.sharePopup.undo.accesskey;"
++      <!-- Note that 'label', 'accesskey', 'value' and 'aria-label' attributes
++           for many of these elements are supplied by the provider and filled
++           in at runtime
++      -->
++      <row id="unsharePopupHeader" align="center">
++        <vbox align="center">
++          <image id="socialUserPortrait" onclick="SocialUI.showProfile();"/>
++        </vbox>
++        <vbox id="unsharePopupText">
++          <button id="socialUserDisplayName" pack="start"
++                  oncommand="SocialUI.showProfile();"/>
++          <spacer flex="1"/>
++          <label id="socialUserRecommendedText"/>
++        </vbox>
++      </row>
++      <hbox id="unsharePopupBottomButtons" pack="end">
++#ifndef XP_UNIX
++        <button id="unsharePopupStopSharingButton"
++                class="unsharePopupBottomButton"
 +                command="Social:UnsharePage"/>
-+        <button id="editSharePopupOkButton"
-+                class="editSharePopupBottomButton"
++        <button id="unsharePopupContinueSharingButton"
++                class="unsharePopupBottomButton"
 +                default="true"
 +                autofocus="autofocus"
-+                label="&social.sharePopup.ok.label;"
-+                accesskey="&social.sharePopup.ok.accesskey;"
-+                oncommand="SocialShareButton.dismissSharePopup();"/>
++                oncommand="SocialShareButton.dismissUnsharePopup();"/>
 +#else
-+        <button id="editSharePopupOkButton"
-+                class="editSharePopupBottomButton"
++        <button id="unsharePopupContinueSharingButton"
++                class="unsharePopupBottomButton"
 +                default="true"
 +                autofocus="autofocus"
-+                label="&social.sharePopup.ok.label;"
-+                accesskey="&social.sharePopup.ok.accesskey;"
-+                oncommand="SocialShareButton.dismissSharePopup();"/>
-+        <button id="editSharePopupUndoButton"
-+                class="editSharePopupBottomButton"
-+                label="&social.sharePopup.undo.label;"
-+                accesskey="&social.sharePopup.undo.accesskey;"
++                oncommand="SocialShareButton.dismissUnsharePopup();"/>
++        <button id="unsharePopupStopSharingButton"
++                class="unsharePopupBottomButton"
 +                command="Social:UnsharePage"/>
 +#endif
 +      </hbox>
 +    </panel>
 +
-+    <panel id="social-notification-panel" type="arrow" hidden="true" noautofocus="true">
-+      <browser id="social-notification-browser" type="content" flex="1"/>
-+    </panel>
++    <panel id="social-notification-panel"
++           class="social-panel"
++           type="arrow"
++           hidden="true"
++           consumeoutsideclicks="true"
++           noautofocus="true"/>
++    <panel id="social-flyout-panel"
++           class="social-panel"
++           onpopupshown="SocialFlyout.onShown()"
++           onpopuphidden="SocialFlyout.onHidden()"
++           side="right"
++           type="arrow"
++           hidden="true"
++           noautofocus="true"
++           position="topcenter topright"/>
 +
 +    <menupopup id="inspector-node-popup">
 +      <menuitem id="inspectorHTMLCopyInner"
@@ -520,6 +575,7 @@
 +                 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="identity-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"/>
@@ -611,43 +667,44 @@
 +                     onclick="BrowserGoHome(event);"
 +                     aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 +
-+      <toolbaritem id="social-toolbar-button"
-+                   class="toolbarbutton-1 chromeclass-toolbar-additional"
++      <toolbaritem id="social-toolbar-item"
++                   class="chromeclass-toolbar-additional"
 +                   removable="false"
 +                   title="&socialToolbar.title;"
 +                   hidden="true">
-+        <hbox id="social-toolbar-button-box" class="social-statusarea-container">
-+          <button id="social-provider-image" type="menu">
-+            <menupopup id="social-statusarea-popup">
-+              <hbox id="social-statusarea-user" pack="left" align="center">
-+                <image id="social-statusarea-user-portrait"/>
-+                <vbox>
-+                  <label id="social-statusarea-notloggedin"
-+                         value="&social.notLoggedIn.label;"/>
-+                  <button id="social-statusarea-username"
-+                          oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"/>
-+                </vbox>
-+              </hbox>
-+            </menupopup>
-+          </button>
-+          <hbox id="social-status-iconbox" flex="1">
-+            <box class="social-notification-icon-container" collapsed="true"
-+                     onclick="SocialToolbar.showAmbientPopup(this);">
-+              <image class="social-notification-icon-image"/>
-+              <box class="social-notification-icon-counter" collapsed="true"/>
-+            </box>
-+            <box class="social-notification-icon-container" collapsed="true"
-+                     onclick="SocialToolbar.showAmbientPopup(this);">
-+              <image class="social-notification-icon-image"/>
-+              <box class="social-notification-icon-counter" collapsed="true"/>
-+            </box>
-+            <box class="social-notification-icon-container" collapsed="true"
-+                     onclick="SocialToolbar.showAmbientPopup(this);">
-+              <image class="social-notification-icon-image"/>
-+              <box class="social-notification-icon-counter" collapsed="true"/>
-+            </box>
-+          </hbox>
-+        </hbox>
++        <toolbarbutton id="social-provider-button"
++                       class="toolbarbutton-1"
++                       type="menu">
++          <menupopup id="social-statusarea-popup">
++            <menuitem id="social-statusarea-user" pack="start" align="center" class="menuitem-iconic"
++                  onclick="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
++              <image id="social-statusarea-user-portrait"/>
++              <vbox>
++                <label id="social-statusarea-notloggedin"
++                       value="&social.notLoggedIn.label;"/>
++                <label id="social-statusarea-username"/>
++              </vbox>
++            </menuitem>
++#ifndef XP_WIN
++            <menuseparator/>
++#endif
++            <menuitem id="social-toggle-sidebar-menuitem"
++                      type="checkbox"
++                      autocheck="false"
++                      command="Social:ToggleSidebar"
++                      label="&social.toggleSidebar.label;"
++                      accesskey="&social.toggleSidebar.accesskey;"/>
++            <menuitem id="social-toggle-notifications-menuitem"
++                      type="checkbox"
++                      autocheck="false"
++                      command="Social:ToggleNotifications"
++                      label="&social.toggleNotifications.label;"
++                      accesskey="&social.toggleNotifications.accesskey;"/>
++            <menuseparator/>
++            <menuitem id="social-remove-menuitem"
++                      oncommand="SocialUI.disableWithConfirmation();"/>
++          </menupopup>
++        </toolbarbutton>
 +      </toolbaritem>
 +
 +      <toolbaritem id="bookmarks-menu-button-container"
@@ -735,7 +792,7 @@
 +        </toolbarbutton>
 +      </toolbaritem>
 +
-+      <hbox id="window-controls" hidden="true" fullscreencontrol="true" pack="end">
++      <hbox id="window-controls" hidden="true" pack="end">
 +        <toolbarbutton id="minimize-button"
 +                       tooltiptext="&fullScreenMinimize.tooltip;"
 +                       oncommand="window.minimize();"/>
@@ -893,14 +950,14 @@
 +                     tooltiptext="&printButton.tooltip;"/>
 +
 +      <!-- This is a placeholder for the Downloads Indicator.  It is visible
-+           only during the customization of the toolbar or in the palette, and
-+           is replaced when customization is done. -->
++           during the customization of the toolbar, in the palette, and before
++           the Downloads Indicator overlay is loaded. -->
 +      <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)"
++                     oncommand="DownloadsIndicatorView.onCommand(event);"
++                     ondrop="DownloadsIndicatorView.onDrop(event);"
++                     ondragover="DownloadsIndicatorView.onDragOver(event);"
++                     ondragenter="DownloadsIndicatorView.onDragOver(event);"
++                     ondragleave="DownloadsIndicatorView.onDragLeave(event);"
 +                     label="&downloads.label;"
 +                     tooltiptext="&downloads.tooltip;"/>
 +
@@ -1004,7 +1061,7 @@
 +                style="min-width: 14em; width: 18em; max-width: 36em;"/>
 +    </vbox>
 +
-+    <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/>
++    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
 +    <vbox id="appcontent" flex="1">
 +      <tabbrowser id="content" disablehistory="true"
 +                  flex="1" contenttooltip="aHTMLTooltip"
@@ -1012,6 +1069,7 @@
 +                  contentcontextmenu="contentAreaContextMenu"
 +                  autocompletepopup="PopupAutoComplete"
 +                  onclick="contentAreaClick(event, false);"/>
++      <chatbar id="pinnedchats" layer="true" mousethrough="always"/>
 +      <statuspanel id="statusbar-display" inactive="true"/>
 +    </vbox>
 +    <splitter id="devtools-side-splitter" hidden="true"/>
@@ -1022,6 +1080,19 @@
 +               nowindowdrag="true"/>
 +      <deck id="devtools-sidebar-deck" flex="1"/>
 +    </vbox>
++    <splitter id="social-sidebar-splitter"
++              class="chromeclass-extrachrome sidebar-splitter"
++              observes="socialSidebarBroadcaster"/>
++    <vbox id="social-sidebar-box"
++          class="chromeclass-extrachrome"
++          observes="socialSidebarBroadcaster"
++          persist="width">
++      <browser id="social-sidebar-browser"
++               type="content"
++               disableglobalhistory="true"
++               flex="1"
++               style="min-width: 14em; width: 18em; max-width: 36em;"/>
++    </vbox>
 +    <vbox id="browser-border-end" hidden="true" layer="true"/>
 +  </hbox>
 +
@@ -1057,24 +1128,6 @@
 +                     oncommand="InspectorUI.closeInspectorUI(false);"
 +                     tooltiptext="&inspectCloseButton.tooltiptext;"/>
 +#endif
-+      <toolbarbutton id="inspector-option-toolbarbutton"
-+                     type="menu"
-+                     tabindex="0"
-+                     tooltiptext="&inspectOptionButton.tooltiptext;">
-+        <menupopup id="inspector-option-popup"
-+                   position="before_start">
-+          <menuitem id="inspectorToggleVeil"
-+                    type="checkbox"
-+                    label="&inspectorToggleVeil.label;"
-+                    accesskey="&inspectorToggleVeil.accesskey;"
-+                    command="Inspector:ToggleVeil"/>
-+          <menuitem id="inspectorToggleInfobar"
-+                    type="checkbox"
-+                    label="&inspectorToggleInfobar.label;"
-+                    accesskey="&inspectorToggleInfobar.accesskey;"
-+                    command="Inspector:ToggleInfobar"/>
-+        </menupopup>
-+      </toolbarbutton>
 +      <toolbarbutton id="inspector-inspect-toolbutton"
 +                     class="devtools-toolbarbutton"
 +                     command="Inspector:Inspect"/>
@@ -1128,24 +1181,35 @@
 +            <textbox class="gclitoolbar-input-node" rows="1"/>
 +          </stack>
 +          <toolbarbutton id="developer-toolbar-webconsole"
-+                         label="&webConsoleButton.label;"
 +                         class="developer-toolbar-button"
-+                         command="Tools:WebConsole"/>
++                         observes="devtoolsMenuBroadcaster_WebConsole"/>
 +          <toolbarbutton id="developer-toolbar-inspector"
-+                         label="&inspectorButton.label;"
 +                         class="developer-toolbar-button"
-+                         hidden="true"
-+                         command="Tools:Inspect"/>
++                         observes="devtoolsMenuBroadcaster_Inspect"/>
 +          <toolbarbutton id="developer-toolbar-styleeditor"
-+                         label="&styleeditor.label;"
 +                         class="developer-toolbar-button"
-+                         hidden="true"
-+                         command="Tools:StyleEditor"/>
++                         observes="devtoolsMenuBroadcaster_StyleEditor"/>
 +          <toolbarbutton id="developer-toolbar-debugger"
-+                         label="&debuggerMenu.label2;"
 +                         class="developer-toolbar-button"
-+                         hidden="true"
-+                         command="Tools:Debugger"/>
++                         observes="devtoolsMenuBroadcaster_Debugger"/>
++          <toolbarbutton id="developer-toolbar-other-tools"
++                         type="menu"
++                         class="developer-toolbar-button"
++                         label="&devToolbarOtherToolsButton.label;">
++            <menupopup position="before_end">
++               <menuitem observes="devtoolsMenuBroadcaster_DevToolbar"/>
++               <menuitem observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
++               <menuitem observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
++               <menuitem observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
++               <menuitem observes="devtoolsMenuBroadcaster_Scratchpad"/>
++               <menuitem observes="devtoolsMenuBroadcaster_StyleEditor"/>
++               <menuitem observes="devtoolsMenuBroadcaster_PageSource"/>
++               <menuitem observes="devtoolsMenuBroadcaster_ErrorConsole"/>
++               <menuseparator/>
++               <menuitem observes="devtoolsMenuBroadcaster_GetMoreTools"/>
++            </menupopup>
++          </toolbarbutton>
++
 +#ifndef XP_MACOSX
 +          <toolbarbutton id="developer-toolbar-closebutton"
 +                         class="devtools-closebutton"
@@ -1211,9 +1275,15 @@
 +</deck>
 +
 +</window>
---- mozilla-release/browser/base/jar.mn.kdepatch	2012-11-20 06:45:49.000000000 +0400
-+++ mozilla-release/browser/base/jar.mn	2012-11-21 20:41:13.886429419 +0400
-@@ -41,6 +41,8 @@ browser.jar:
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -36,16 +36,18 @@ browser.jar:
+         content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
+         content/browser/abouthome/noise.png           (content/abouthome/noise.png)
+         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
+         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
+         content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
  *       content/browser/browser.css                   (content/browser.css)
  *       content/browser/browser.js                    (content/browser.js)
  *       content/browser/browser.xul                   (content/browser.xul)
@@ -1222,9 +1292,20 @@
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
          content/browser/content.js                    (content/content.js)
          content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
---- mozilla-release/browser/components/build/nsModule.cpp.kdepatch	2012-11-20 06:45:49.000000000 +0400
-+++ mozilla-release/browser/components/build/nsModule.cpp	2012-11-21 20:32:50.499335644 +0400
-@@ -13,7 +13,7 @@
+ *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
+         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
+ *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
+ *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
+         content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
+diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
+--- a/browser/components/build/nsModule.cpp
++++ b/browser/components/build/nsModule.cpp
+@@ -8,17 +8,17 @@
+ #include "nsBrowserCompsCID.h"
+ #include "DirectoryProvider.h"
+ 
+ #if defined(XP_WIN)
+ #include "nsWindowsShellService.h"
  #elif defined(XP_MACOSX)
  #include "nsMacShellService.h"
  #elif defined(MOZ_WIDGET_GTK2)
@@ -1233,7 +1314,17 @@
  #endif
  
  #if defined(XP_WIN)
-@@ -37,8 +37,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(Directory
+ #include "nsIEHistoryEnumerator.h"
+ #endif
+ 
+ #include "rdf.h"
+ #include "nsFeedSniffer.h"
+@@ -32,18 +32,16 @@ using namespace mozilla::browser;
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ 
+ NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
+ #if defined(XP_WIN)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
  #elif defined(XP_MACOSX)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
@@ -1242,7 +1333,17 @@
  #endif
  
  #if defined(XP_WIN)
-@@ -69,7 +67,7 @@ static const mozilla::Module::CIDEntry k
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
+ #endif
+ 
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
+ 
+@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
+ #endif
+ NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
+ 
+ static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
+     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
  #if defined(XP_WIN)
      { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
  #elif defined(MOZ_WIDGET_GTK2)
@@ -1251,9 +1352,20 @@
  #endif
      { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
      { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
---- mozilla-release/browser/components/preferences/advanced.js.kdepatch	2012-11-20 06:45:49.000000000 +0400
-+++ mozilla-release/browser/components/preferences/advanced.js	2012-11-21 20:45:20.726667535 +0400
-@@ -28,6 +28,12 @@ var gAdvancedPane = {
+ #if defined(XP_WIN)
+     { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
+ #elif defined(XP_MACOSX)
+     { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
+ #endif
+diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
+--- a/browser/components/preferences/advanced.js
++++ b/browser/components/preferences/advanced.js
+@@ -23,16 +23,22 @@ var gAdvancedPane = {
+     if (extraArgs && extraArgs["advancedTab"]){
+       advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
+     } else {
+       var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
+       if (preference.value !== null)
          advancedPrefs.selectedIndex = preference.value;
      }
  
@@ -1266,7 +1378,17 @@
  #ifdef HAVE_SHELL_SERVICE
      this.updateSetDefaultBrowser();
  #ifdef XP_WIN
-@@ -730,6 +736,17 @@ var gAdvancedPane = {
+     // In Windows 8 we launch the control panel since it's the only
+     // way to get all file type association prefs. So we don't know
+     // when the user will select the default.  We refresh here periodically
+     // in case the default changes.  On other Windows OS's defaults can also
+     // be set while the prefs are open.
+@@ -725,14 +731,25 @@ var gAdvancedPane = {
+    * Set browser as the operating system default browser.
+    */
+   setDefaultBrowser: function()
+   {
+     let shellSvc = getShellService();
      if (!shellSvc)
        return;
      shellSvc.setDefaultBrowser(true, false);
@@ -1284,9 +1406,18 @@
      let selectedIndex =
        shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
      document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
---- mozilla-release/browser/components/shell/src/Makefile.in.kdepatch	2012-11-20 06:45:49.000000000 +0400
-+++ mozilla-release/browser/components/shell/src/Makefile.in	2012-11-21 20:32:50.500335609 +0400
-@@ -22,7 +22,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+   }
+ #endif
+ };
+diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
+--- a/browser/components/shell/src/Makefile.in
++++ b/browser/components/shell/src/Makefile.in
+@@ -17,17 +17,18 @@ USE_STATIC_LIBS = 1
+ 
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS = nsWindowsShellService.cpp
+ else
+ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
  CPPSRCS = nsMacShellService.cpp
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
@@ -1296,44 +1427,20 @@
  endif
  endif
  endif
---- mozilla-release/browser/components/shell/src/nsKDEShellService.cpp.kdepatch	2012-11-21 20:32:50.501335636 +0400
-+++ mozilla-release/browser/components/shell/src/nsKDEShellService.cpp	2012-11-21 20:32:50.501335636 +0400
-@@ -0,0 +1,265 @@
+ 
+ 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,234 @@
 +/* -*- 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 ***** */
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "nsKDEShellService.h"
 +#include "nsShellService.h"
@@ -1564,8 +1671,10 @@
 +    NS_ADDREF(*_retval = defaultReader);
 +    return NS_OK;
 +    }
---- mozilla-release/browser/components/shell/src/nsKDEShellService.h.kdepatch	2012-11-21 20:32:50.501335636 +0400
-+++ mozilla-release/browser/components/shell/src/nsKDEShellService.h	2012-11-21 20:32:50.501335636 +0400
+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 *****
@@ -1626,8 +1735,10 @@
 +};
 +
 +#endif // nskdeshellservice_h____
---- mozilla-release/browser/components/shell/src/nsUnixShellService.cpp.kdepatch	2012-11-21 20:32:50.501335636 +0400
-+++ mozilla-release/browser/components/shell/src/nsUnixShellService.cpp	2012-11-21 20:32:50.501335636 +0400
+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 *****
@@ -1681,8 +1792,10 @@
 +        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
 +    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
 +}
---- mozilla-release/browser/components/shell/src/nsUnixShellService.h.kdepatch	2012-11-21 20:32:50.502335643 +0400
-+++ mozilla-release/browser/components/shell/src/nsUnixShellService.h	2012-11-21 20:32:50.501335636 +0400
+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 *****
@@ -1729,9 +1842,15 @@
 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 +
 +#endif // nsunixshellservice_h____
---- mozilla-release/browser/installer/package-manifest.in.kdepatch	2012-11-20 06:45:50.000000000 +0400
-+++ mozilla-release/browser/installer/package-manifest.in	2012-11-21 20:32:50.502335643 +0400
-@@ -566,8 +566,10 @@
+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
+@@ -561,18 +561,20 @@
+ @BINPATH@/@PREF_DIR@/services-sync.js
+ #endif
+ @BINPATH@/greprefs.js
+ @BINPATH@/defaults/autoconfig/platform.js
+ @BINPATH@/defaults/autoconfig/prefcalls.js
  #ifndef LIBXUL_SDK
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
  @BINPATH@/defaults/pref/channel-prefs.js
@@ -1742,3 +1861,8 @@
  #endif
  @BINPATH@/defaults/profile/prefs.js
  
+ ; [Layout Engine Resources]
+ ; Style Sheets, Graphics and other Resources used by the layout engine. 
+ @BINPATH@/res/EditorOverride.css
+ @BINPATH@/res/contenteditable.css
+ @BINPATH@/res/designmode.css
diff --git a/firefox.spec b/firefox.spec
index a3e0fed..ed92cb0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -31,7 +31,7 @@
 
 %define _use_syshunspell 0
 
-%define release 1
+%define release 2
 
 %define update_channel  release
 
@@ -55,7 +55,7 @@ Source8:	firefox-searchengines-askcom.xml
 Source9:	kde.js
 Source10:	firefox-searchengines-yandex.xml
 Source11:	firefox-searchengines-google.xml
-Source12:   firefox-searchengines-bing.xml
+Source12:	firefox-searchengines-bing.xml
 Patch1:		firefox-6.0-lang.patch
 Patch2:         firefox-vendor.patch
 Patch3:		mozilla-firefox-1.5.0.6-systemproxy.patch
@@ -69,13 +69,13 @@ Patch8:		firefox-17.0-disable-check-default-browser.patch
 Patch9:         firefox-5.0-asciidel.patch
 Patch10:	firefox-3.5.3-default-mail-handler.patch
 # Patches for kde integration of FF 
-Patch11:        firefox-17.0-kde.patch
-Patch12:        mozilla-17.0-kde.patch
-Patch13:        firefox-13-fix-nspr-include.patch
-Patch14:        firefox-13-fix-cairo-build.patch
+Patch11:	firefox-17.0-kde.patch
+Patch12:	mozilla-17.0-kde.patch
+Patch13:	firefox-13-fix-nspr-include.patch
+Patch14:	firefox-13-fix-cairo-build.patch
 Patch34:	xulrunner_nojit.patch
 # (cjw) use system virtualenv
-Patch36:		firefox-17.0-virtualenv.patch
+Patch36:	firefox-17.0-virtualenv.patch
 BuildRequires:	gtk+2-devel
 BuildRequires:	unzip
 BuildRequires:	zip
@@ -88,16 +88,16 @@ BuildRequires:	glib2-devel
 BuildRequires:	libIDL2-devel
 BuildRequires:	makedepend
 BuildRequires:	nss-devel >= 2:3.12.10
-BuildRequires:  nss-static-devel
+BuildRequires:	nss-static-devel
 BuildRequires:	nspr-devel >= 2:4.8.9
 BuildRequires:	startup-notification-devel
 BuildRequires:	dbus-glib-devel
 BuildRequires:	python
-BuildRequires:  sqlite3-devel >= 3.7.7.1
+BuildRequires:	sqlite3-devel >= 3.7.7.1
 %ifnarch %arm %mips
 BuildRequires:	valgrind
 BuildRequires:	java-rpmbuild
-BuildRequires: yasm >= 1.0.1
+BuildRequires:	yasm >= 1.0.1
 %endif
 %ifarch %arm
 BuildRequires:	libffi-devel
@@ -117,11 +117,11 @@ BuildRequires:	cairo-devel >= 1.10
 BuildRequires:	pkgconfig(gl)
 BuildRequires:	libvpx-devel
 BuildRequires:	autoconf2.1
-BuildRequires:  libiw-devel
+BuildRequires:	libiw-devel
 BuildRequires:	python-virtualenv
 BuildRequires:	gstreamer0.10-devel
 BuildRequires:	libgstreamer0.10-plugins-base-devel
-BuildRequires:  pkgconfig(opus)
+BuildRequires:	pkgconfig(opus)
 
 %if 0%{?prel}
 Provides:	%{name} = %{epoch}:%{realver}-0.%{prel}
diff --git a/mozilla-17.0-kde.patch b/mozilla-17.0-kde.patch
index f755db7..cf24ac5 100644
--- a/mozilla-17.0-kde.patch
+++ b/mozilla-17.0-kde.patch
@@ -1,6 +1,7 @@
---- mozilla-release/modules/libpref/src/Makefile.in.kdemoz	2012-11-20 06:46:16.000000000 +0400
-+++ mozilla-release/modules/libpref/src/Makefile.in	2012-11-21 20:48:44.545356808 +0400
-@@ -50,6 +50,8 @@ nsPrefService.$(OBJ_SUFFIX): nsPrefServi
+diff -urN mozilla-release-orig/modules/libpref/src/Makefile.in mozilla-release-patched/modules/libpref/src/Makefile.in
+--- mozilla-release-orig/modules/libpref/src/Makefile.in	2012-11-20 13:46:16.000000000 +1100
++++ mozilla-release-patched/modules/libpref/src/Makefile.in	2012-11-23 11:02:41.490572780 +1100
+@@ -50,6 +50,8 @@
  	$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS)
  endif
  
@@ -9,8 +10,9 @@
  
  greprefs.js: $(GREPREF_FILES)
  	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@
---- mozilla-release/modules/libpref/src/Preferences.cpp.kdemoz	2012-11-20 06:46:16.000000000 +0400
-+++ mozilla-release/modules/libpref/src/Preferences.cpp	2012-11-22 12:05:24.811386447 +0400
+diff -urN mozilla-release-orig/modules/libpref/src/Preferences.cpp mozilla-release-patched/modules/libpref/src/Preferences.cpp
+--- mozilla-release-orig/modules/libpref/src/Preferences.cpp	2012-11-20 13:46:16.000000000 +1100
++++ mozilla-release-patched/modules/libpref/src/Preferences.cpp	2012-11-23 11:02:41.491072781 +1100
 @@ -28,6 +28,7 @@
  #include "nsCOMArray.h"
  #include "nsXPCOMCID.h"
@@ -19,7 +21,7 @@
  
  #include "nsQuickSort.h"
  #include "prmem.h"
-@@ -901,6 +902,24 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -901,6 +902,24 @@
    if (NS_FAILED(rv))
      return rv;
  
@@ -44,7 +46,7 @@
    nsCOMPtr<nsISimpleEnumerator> list;
    dirSvc->Get(listId,
                NS_GET_IID(nsISimpleEnumerator),
-@@ -926,7 +945,7 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -926,7 +945,7 @@
      if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi")))
        ReadExtensionPrefs(path);
      else
@@ -53,7 +55,7 @@
    }
    return NS_OK;
  }
-@@ -1030,6 +1049,7 @@ static nsresult pref_InitInitialObjects(
+@@ -1030,6 +1049,7 @@
      "winpref.js"
  #elif defined(XP_UNIX)
      "unix.js"
@@ -61,7 +63,7 @@
  #if defined(VMS)
      , "openvms.js"
  #elif defined(_AIX)
-@@ -1042,6 +1062,17 @@ static nsresult pref_InitInitialObjects(
+@@ -1042,6 +1062,17 @@
  #endif
    };
  
@@ -79,9 +81,10 @@
    rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles));
    if (NS_FAILED(rv))
      NS_WARNING("Error parsing application default preferences.");
---- mozilla-release/toolkit/components/downloads/Makefile.in.kdemoz	2012-11-20 06:46:20.000000000 +0400
-+++ mozilla-release/toolkit/components/downloads/Makefile.in	2012-11-21 20:48:44.546356893 +0400
-@@ -46,4 +46,7 @@ TEST_DIRS += test
+diff -urN mozilla-release-orig/toolkit/components/downloads/Makefile.in mozilla-release-patched/toolkit/components/downloads/Makefile.in
+--- mozilla-release-orig/toolkit/components/downloads/Makefile.in	2012-11-20 13:46:20.000000000 +1100
++++ mozilla-release-patched/toolkit/components/downloads/Makefile.in	2012-11-23 11:02:41.491072781 +1100
+@@ -46,4 +46,7 @@
  
  include $(topsrcdir)/config/rules.mk
  
@@ -89,8 +92,9 @@
 +
 +
  CXXFLAGS += $(TK_CFLAGS)
---- mozilla-release/toolkit/components/downloads/nsDownloadManager.cpp.kdemoz	2012-11-20 06:46:20.000000000 +0400
-+++ mozilla-release/toolkit/components/downloads/nsDownloadManager.cpp	2012-11-22 12:10:22.079356852 +0400
+diff -urN mozilla-release-orig/toolkit/components/downloads/nsDownloadManager.cpp mozilla-release-patched/toolkit/components/downloads/nsDownloadManager.cpp
+--- mozilla-release-orig/toolkit/components/downloads/nsDownloadManager.cpp	2012-11-20 13:46:20.000000000 +1100
++++ mozilla-release-patched/toolkit/components/downloads/nsDownloadManager.cpp	2012-11-23 11:02:41.491572782 +1100
 @@ -40,6 +40,10 @@
  #endif
  #endif
@@ -102,7 +106,7 @@
  #ifdef XP_MACOSX
  #include <CoreFoundation/CoreFoundation.h>
  #endif
-@@ -2236,6 +2240,15 @@ nsDownload::SetState(DownloadState aStat
+@@ -2236,6 +2240,15 @@
          pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert);
  
        if (showTaskbarAlert) {
@@ -118,7 +122,7 @@
          int32_t alertInterval = 2000;
          if (pref)
            pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);
-@@ -2269,9 +2282,10 @@ nsDownload::SetState(DownloadState aStat
+@@ -2269,9 +2282,10 @@
                    NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
                    message, !removeWhenDone, EmptyString(), mDownloadManager,
                    EmptyString());
@@ -130,9 +134,10 @@
  
  #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2)
        nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
---- mozilla-release/toolkit/content/jar.mn.kdemoz	2012-11-20 06:46:21.000000000 +0400
-+++ mozilla-release/toolkit/content/jar.mn	2012-11-21 20:48:44.547356805 +0400
-@@ -50,6 +50,8 @@ toolkit.jar:
+diff -urN mozilla-release-orig/toolkit/content/jar.mn mozilla-release-patched/toolkit/content/jar.mn
+--- mozilla-release-orig/toolkit/content/jar.mn	2012-11-20 13:46:21.000000000 +1100
++++ mozilla-release-patched/toolkit/content/jar.mn	2012-11-23 11:02:41.491572782 +1100
+@@ -50,6 +50,8 @@
     content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
     content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
  *+ content/global/bindings/dialog.xml          (widgets/dialog.xml)
@@ -141,7 +146,7 @@
     content/global/bindings/editor.xml          (widgets/editor.xml)
     content/global/bindings/expander.xml        (widgets/expander.xml)
  *  content/global/bindings/filefield.xml       (widgets/filefield.xml)
-@@ -63,6 +65,8 @@ toolkit.jar:
+@@ -63,6 +65,8 @@
     content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
     content/global/bindings/popup.xml           (widgets/popup.xml)
  *+ content/global/bindings/preferences.xml     (widgets/preferences.xml)
@@ -150,8 +155,9 @@
     content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
     content/global/bindings/radio.xml           (widgets/radio.xml)
     content/global/bindings/resizer.xml         (widgets/resizer.xml)
---- mozilla-release/toolkit/content/widgets/dialog-kde.xml.kdemoz	2012-11-21 20:48:44.548356774 +0400
-+++ mozilla-release/toolkit/content/widgets/dialog-kde.xml	2012-11-21 20:48:44.548356774 +0400
+diff -urN mozilla-release-orig/toolkit/content/widgets/dialog-kde.xml mozilla-release-patched/toolkit/content/widgets/dialog-kde.xml
+--- mozilla-release-orig/toolkit/content/widgets/dialog-kde.xml	1970-01-01 10:00:00.000000000 +1000
++++ mozilla-release-patched/toolkit/content/widgets/dialog-kde.xml	2012-11-23 11:02:41.491572782 +1100
 @@ -0,0 +1,451 @@
 +<?xml version="1.0"?>
 +<!-- This Source Code Form is subject to the terms of the Mozilla Public
@@ -604,8 +610,9 @@
 +  </binding>
 +
 +</bindings>
---- mozilla-release/toolkit/content/widgets/preferences-kde.xml.kdemoz	2012-11-21 20:48:44.550356535 +0400
-+++ mozilla-release/toolkit/content/widgets/preferences-kde.xml	2012-11-21 20:48:44.549356863 +0400
+diff -urN mozilla-release-orig/toolkit/content/widgets/preferences-kde.xml mozilla-release-patched/toolkit/content/widgets/preferences-kde.xml
+--- mozilla-release-orig/toolkit/content/widgets/preferences-kde.xml	1970-01-01 10:00:00.000000000 +1000
++++ mozilla-release-patched/toolkit/content/widgets/preferences-kde.xml	2012-11-23 11:02:41.492572784 +1100
 @@ -0,0 +1,1339 @@
 +<?xml version="1.0"?>
 +
@@ -1946,18 +1953,20 @@
 +#    PrefWindow II  (???)
 +#    PrefWindow I   (June 4, 1999)
 +#
---- mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.kdemoz	2012-11-20 06:46:22.000000000 +0400
-+++ mozilla-release/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2012-11-22 12:13:19.911391656 +0400
-@@ -18,6 +18,8 @@
+diff -urN mozilla-release-orig/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp mozilla-release-patched/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+--- mozilla-release-orig/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2012-11-20 13:46:22.000000000 +1100
++++ mozilla-release-patched/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2012-11-23 11:04:03.030215797 +1100
+@@ -18,6 +18,9 @@
  #include "nsIGSettingsService.h"
  #include "nsInterfaceHashtable.h"
  #include "mozilla/Attributes.h"
 +#include "nsVoidArray.h"
 +#include "nsKDEUtils.h"
++
  
  class nsUnixSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
  public:
-@@ -39,6 +41,7 @@ private:
+@@ -39,6 +42,7 @@
    nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
    nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
    nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
@@ -1965,7 +1974,7 @@
  };
  
  NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
-@@ -495,6 +498,9 @@ nsUnixSystemProxySettings::GetProxyForUR
+@@ -495,6 +499,9 @@
    rv = aURI->GetPort(&port);
    NS_ENSURE_SUCCESS(rv, rv);
  
@@ -1975,7 +1984,7 @@
    if (mProxySettings) {
      rv = GetProxyFromGSettings(scheme, host, port, aResult);
      if (rv == NS_OK)
-@@ -530,3 +536,29 @@ static const mozilla::Module kUnixProxyM
+@@ -530,3 +537,29 @@
  };
  
  NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
@@ -2005,9 +2014,10 @@
 +  return NS_OK;
 +}
 +
---- mozilla-release/toolkit/xre/Makefile.in.kdemoz	2012-11-20 06:46:23.000000000 +0400
-+++ mozilla-release/toolkit/xre/Makefile.in	2012-11-21 20:48:44.550356535 +0400
-@@ -74,7 +74,8 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+diff -urN mozilla-release-orig/toolkit/xre/Makefile.in mozilla-release-patched/toolkit/xre/Makefile.in
+--- mozilla-release-orig/toolkit/xre/Makefile.in	2012-11-20 13:46:23.000000000 +1100
++++ mozilla-release-patched/toolkit/xre/Makefile.in	2012-11-23 11:02:41.493072784 +1100
+@@ -74,7 +74,8 @@
  CPPSRCS += nsNativeAppSupportOS2.cpp
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -2017,45 +2027,14 @@
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
  MOCSRCS += moc_nsNativeAppSupportQt.cpp
---- mozilla-release/toolkit/xre/nsKDEUtils.cpp.kdemoz	2012-11-21 20:48:44.551357147 +0400
-+++ mozilla-release/toolkit/xre/nsKDEUtils.cpp	2012-11-21 20:48:44.551357147 +0400
-@@ -0,0 +1,373 @@
+diff -urN mozilla-release-orig/toolkit/xre/nsKDEUtils.cpp mozilla-release-patched/toolkit/xre/nsKDEUtils.cpp
+--- mozilla-release-orig/toolkit/xre/nsKDEUtils.cpp	1970-01-01 10:00:00.000000000 +1000
++++ mozilla-release-patched/toolkit/xre/nsKDEUtils.cpp	2012-11-23 11:02:41.493072784 +1100
+@@ -0,0 +1,341 @@
 +/* -*- 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 ***** */
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "nsKDEUtils.h"
 +#include "nsIWidget.h"
@@ -2393,46 +2372,14 @@
 +    fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data
 +    fflush( commandFile );
 +    }
---- mozilla-release/toolkit/xre/nsKDEUtils.h.kdemoz	2012-11-21 20:48:44.551357147 +0400
-+++ mozilla-release/toolkit/xre/nsKDEUtils.h	2012-11-21 20:48:44.551357147 +0400
-@@ -0,0 +1,81 @@
-+/* -*- 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 ***** */
+diff -urN mozilla-release-orig/toolkit/xre/nsKDEUtils.h mozilla-release-patched/toolkit/xre/nsKDEUtils.h
+--- mozilla-release-orig/toolkit/xre/nsKDEUtils.h	1970-01-01 10:00:00.000000000 +1000
++++ mozilla-release-patched/toolkit/xre/nsKDEUtils.h	2012-11-23 11:02:41.493072784 +1100
+@@ -0,0 +1,48 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#ifndef nsKDEUtils_h__
 +#define nsKDEUtils_h__
@@ -2477,9 +2424,10 @@
 +    };
 +
 +#endif // nsKDEUtils
---- mozilla-release/uriloader/exthandler/Makefile.in.kdemoz	2012-11-20 06:46:23.000000000 +0400
-+++ mozilla-release/uriloader/exthandler/Makefile.in	2012-11-21 20:48:44.552356734 +0400
-@@ -63,8 +63,9 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas
+diff -urN mozilla-release-orig/uriloader/exthandler/Makefile.in mozilla-release-patched/uriloader/exthandler/Makefile.in
+--- mozilla-release-orig/uriloader/exthandler/Makefile.in	2012-11-20 13:46:23.000000000 +1100
++++ mozilla-release-patched/uriloader/exthandler/Makefile.in	2012-11-23 11:02:41.493072784 +1100
+@@ -63,8 +63,9 @@
              -I$(topsrcdir)/netwerk/protocol/http
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -2490,46 +2438,14 @@
  endif
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),android)
---- mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.cpp.kdemoz	2012-11-21 20:48:44.552356734 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.cpp	2012-11-21 20:48:44.552356734 +0400
-@@ -0,0 +1,87 @@
+diff -urN mozilla-release-orig/uriloader/exthandler/unix/nsCommonRegistry.cpp mozilla-release-patched/uriloader/exthandler/unix/nsCommonRegistry.cpp
+--- mozilla-release-orig/uriloader/exthandler/unix/nsCommonRegistry.cpp	1970-01-01 10:00:00.000000000 +1000
++++ mozilla-release-patched/uriloader/exthandler/unix/nsCommonRegistry.cpp	2012-11-23 11:02:41.493072784 +1100
+@@ -0,0 +1,54 @@
 +/* -*- 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 ***** */
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "nsCommonRegistry.h"
 +
@@ -2580,45 +2496,13 @@
 +        return nsKDERegistry::GetFromType( aMIMEType );
 +    return nsGNOMERegistry::GetFromType( aMIMEType );
 +}
---- mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.h.kdemoz	2012-11-21 20:48:44.552356734 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsCommonRegistry.h	2012-11-21 20:48:44.552356734 +0400
-@@ -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 ***** */
+diff -urN mozilla-release-orig/uriloader/exthandler/unix/nsCommonRegistry.h mozilla-release-patched/uriloader/exthandler/unix/nsCommonRegistry.h
+--- mozilla-release-orig/uriloader/exthandler/unix/nsCommonRegistry.h	1970-01-01 10:00:00.000000000 +1000
++++ mozilla-release-patched/uriloader/exthandler/unix/nsCommonRegistry.h	2012-11-23 11:02:41.493072784 +1100
+@@ -0,0 +1,23 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "nsIURI.h"
 +#include "nsCOMPtr.h"
@@ -2639,46 +2523,14 @@
 +
 +  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
 +};
---- mozilla-release/uriloader/exthandler/unix/nsKDERegistry.cpp.kdemoz	2012-11-21 20:48:44.553356851 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsKDERegistry.cpp	2012-11-21 20:48:44.553356851 +0400
-@@ -0,0 +1,119 @@
+diff -urN mozilla-release-orig/uriloader/exthandler/unix/nsKDERegistry.cpp mozilla-release-patched/uriloader/exthandler/unix/nsKDERegistry.cpp
+--- mozilla-release-orig/uriloader/exthandler/unix/nsKDERegistry.cpp	1970-01-01 10:00:00.000000000 +1000
++++ mozilla-release-patched/uriloader/exthandler/unix/nsKDERegistry.cpp	2012-11-23 11:02:41.493572784 +1100
+@@ -0,0 +1,86 @@
 +/* -*- 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 ***** */
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "nsKDERegistry.h"
 +#include "prlink.h"
@@ -2761,45 +2613,13 @@
 +        }
 +    return nullptr;
 +}
---- mozilla-release/uriloader/exthandler/unix/nsKDERegistry.h.kdemoz	2012-11-21 20:48:44.553356851 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsKDERegistry.h	2012-11-21 20:48:44.553356851 +0400
-@@ -0,0 +1,62 @@
-+/* ***** 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 ***** */
+diff -urN mozilla-release-orig/uriloader/exthandler/unix/nsKDERegistry.h mozilla-release-patched/uriloader/exthandler/unix/nsKDERegistry.h
+--- mozilla-release-orig/uriloader/exthandler/unix/nsKDERegistry.h	1970-01-01 10:00:00.000000000 +1000
++++ mozilla-release-patched/uriloader/exthandler/unix/nsKDERegistry.h	2012-11-23 11:02:41.493572784 +1100
+@@ -0,0 +1,29 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "nsIURI.h"
 +#include "nsCOMPtr.h"
@@ -2826,8 +2646,9 @@
 +  static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command);
 +
 +};
---- mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp.kdemoz	2012-11-20 06:46:23.000000000 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2012-11-21 20:48:44.553356851 +0400
+diff -urN mozilla-release-orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp mozilla-release-patched/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+--- mozilla-release-orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2012-11-20 13:46:23.000000000 +1100
++++ mozilla-release-patched/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2012-11-23 11:02:41.493572784 +1100
 @@ -21,7 +21,7 @@
  #endif
  
@@ -2853,7 +2674,7 @@
  
  #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
    if (NS_FAILED(rv)){
-@@ -66,12 +69,12 @@ NS_IMETHODIMP
+@@ -66,12 +69,12 @@
  nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval)
  {
    *_retval = false;
@@ -2868,7 +2689,7 @@
      }
    }
    if (mimeInfo)
-@@ -124,6 +127,23 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -124,6 +127,23 @@
    return NS_ERROR_FAILURE;
  #endif
  
@@ -2892,7 +2713,7 @@
    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
    nsCAutoString uriSpec;
    if (giovfs) {
-@@ -151,7 +171,7 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -151,7 +171,7 @@
  
    // If we haven't got an app we try to get a valid one by searching for the
    // extension mapped type
@@ -2901,8 +2722,9 @@
    if (mimeInfo) {
      nsCAutoString type;
      mimeInfo->GetType(type);
---- mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp.kdemoz	2012-11-20 06:46:23.000000000 +0400
-+++ mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2012-11-21 20:48:44.554356746 +0400
+diff -urN mozilla-release-orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp mozilla-release-patched/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+--- mozilla-release-orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2012-11-20 13:46:23.000000000 +1100
++++ mozilla-release-patched/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2012-11-23 11:02:41.494072785 +1100
 @@ -15,7 +15,7 @@
  #include "nsOSHelperAppService.h"
  #include "nsMIMEInfoUnix.h"
@@ -2912,7 +2734,7 @@
  #endif
  #include "nsISupports.h"
  #include "nsString.h"
-@@ -1162,7 +1162,7 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1162,7 +1162,7 @@
  
  #ifdef MOZ_WIDGET_GTK2
    // Check the GConf registry for a protocol handler
@@ -2921,7 +2743,7 @@
  #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
    *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
  #endif
-@@ -1174,7 +1174,7 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1174,7 +1174,7 @@
  NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval)
  {
  #ifdef MOZ_WIDGET_GTK2
@@ -2930,7 +2752,7 @@
    return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK;
  #else
    return NS_ERROR_NOT_AVAILABLE;
-@@ -1270,7 +1270,7 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1270,7 +1270,7 @@
      
  #ifdef MOZ_WIDGET_GTK2
      LOG(("Looking in GNOME registry\n"));
@@ -2939,7 +2761,7 @@
      if (gnomeInfo) {
        LOG(("Got MIMEInfo from GNOME registry\n"));
        return gnomeInfo;
-@@ -1396,7 +1396,7 @@ nsOSHelperAppService::GetFromType(const
+@@ -1396,7 +1396,7 @@
      // get back a MIMEInfo without any extensions set.  In that case we'll have
      // to look in our mime.types files for the extensions.    
      LOG(("Looking in GNOME registry\n"));
@@ -2948,9 +2770,10 @@
      if (gnomeInfo && gnomeInfo->HasExtensions()) {
        LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
        return gnomeInfo;
---- mozilla-release/widget/gtk2/Makefile.in.kdemoz	2012-11-20 06:46:25.000000000 +0400
-+++ mozilla-release/widget/gtk2/Makefile.in	2012-11-21 20:48:44.554356746 +0400
-@@ -109,6 +109,9 @@ INCLUDES	+= \
+diff -urN mozilla-release-orig/widget/gtk2/Makefile.in mozilla-release-patched/widget/gtk2/Makefile.in
+--- mozilla-release-orig/widget/gtk2/Makefile.in	2012-11-20 13:46:25.000000000 +1100
++++ mozilla-release-patched/widget/gtk2/Makefile.in	2012-11-23 11:02:41.494072785 +1100
+@@ -109,6 +109,9 @@
  		-I$(topsrcdir)/layout/xul/base/src \
  		-I$(topsrcdir)/other-licenses/atk-1.0 \
  		$(NULL)
@@ -2960,8 +2783,9 @@
  ifdef MOZ_X11
  INCLUDES   	+= -I$(srcdir)/../shared/x11
  endif
---- mozilla-release/widget/gtk2/nsFilePicker.cpp.kdemoz	2012-11-20 06:46:25.000000000 +0400
-+++ mozilla-release/widget/gtk2/nsFilePicker.cpp	2012-11-22 12:26:59.004410385 +0400
+diff -urN mozilla-release-orig/widget/gtk2/nsFilePicker.cpp mozilla-release-patched/widget/gtk2/nsFilePicker.cpp
+--- mozilla-release-orig/widget/gtk2/nsFilePicker.cpp	2012-11-20 13:46:25.000000000 +1100
++++ mozilla-release-patched/widget/gtk2/nsFilePicker.cpp	2012-11-23 11:02:41.494072785 +1100
 @@ -6,6 +6,7 @@
  #include "mozilla/Util.h"
  
@@ -2978,7 +2802,7 @@
  
  #if (MOZ_PLATFORM_MAEMO == 5)
  #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
-@@ -269,7 +271,9 @@ nsFilePicker::AppendFilter(const nsAStri
+@@ -269,7 +271,9 @@
  {
    if (aFilter.EqualsLiteral("..apps")) {
      // No platform specific thing we can do here, really....
@@ -2989,7 +2813,7 @@
    }
  
    nsCAutoString filter, name;
-@@ -374,6 +378,9 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -374,6 +378,9 @@
  {
    NS_ENSURE_ARG_POINTER(aReturn);
  
@@ -2999,7 +2823,7 @@
    nsresult rv = Open(nullptr);
    if (NS_FAILED(rv))
      return rv;
-@@ -592,3 +599,229 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -592,3 +599,230 @@
    }
    NS_RELEASE_THIS();
  }
@@ -3027,7 +2851,7 @@
 +    return GDK_WINDOW_XID( gdk_window );
 +    }
 +
-+NS_IMETHODIMP nsFilePicker::kdeFileDialog(int16_t *aReturn)
++NS_IMETHODIMP nsFilePicker::kdeFileDialog(PRInt16 *aReturn)
 +    {
 +    NS_ENSURE_ARG_POINTER(aReturn);
 +
@@ -3199,7 +3023,7 @@
 +    }
 +
 +
-+NS_IMETHODIMP nsFilePicker::kdeAppsDialog(int16_t *aReturn)
++NS_IMETHODIMP nsFilePicker::kdeAppsDialog(PRInt16 *aReturn)
 +    {
 +    NS_ENSURE_ARG_POINTER(aReturn);
 +
@@ -3229,9 +3053,11 @@
 +        }
 +    return NS_OK;
 +    }
---- mozilla-release/widget/gtk2/nsFilePicker.h.kdemoz	2012-11-20 06:46:25.000000000 +0400
-+++ mozilla-release/widget/gtk2/nsFilePicker.h	2012-11-21 20:48:44.555357191 +0400
-@@ -72,6 +72,12 @@ protected:
++
+diff -urN mozilla-release-orig/widget/gtk2/nsFilePicker.h mozilla-release-patched/widget/gtk2/nsFilePicker.h
+--- mozilla-release-orig/widget/gtk2/nsFilePicker.h	2012-11-20 13:46:25.000000000 +1100
++++ mozilla-release-patched/widget/gtk2/nsFilePicker.h	2012-11-23 11:02:41.494072785 +1100
+@@ -72,6 +72,12 @@
  
  private:
    static nsIFile *mPrevDisplayDirectory;
@@ -3244,17 +3070,19 @@
  };
  
  #endif
---- mozilla-release/xpcom/components/Makefile.in.kdemoz	2012-11-20 06:46:26.000000000 +0400
-+++ mozilla-release/xpcom/components/Makefile.in	2012-11-21 20:48:44.555357191 +0400
-@@ -64,5 +64,6 @@ include $(topsrcdir)/config/rules.mk
+diff -urN mozilla-release-orig/xpcom/components/Makefile.in mozilla-release-patched/xpcom/components/Makefile.in
+--- mozilla-release-orig/xpcom/components/Makefile.in	2012-11-20 13:46:26.000000000 +1100
++++ mozilla-release-patched/xpcom/components/Makefile.in	2012-11-23 11:02:41.494072785 +1100
+@@ -64,5 +64,6 @@
  DEFINES	+= -D_IMPL_NS_COM
  
  ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
  CXXFLAGS += $(MOZ_GTK2_CFLAGS)
  endif
---- mozilla-release/xpcom/components/ManifestParser.cpp.kdemoz	2012-11-20 06:46:26.000000000 +0400
-+++ mozilla-release/xpcom/components/ManifestParser.cpp	2012-11-21 20:48:44.556357107 +0400
+diff -urN mozilla-release-orig/xpcom/components/ManifestParser.cpp mozilla-release-patched/xpcom/components/ManifestParser.cpp
+--- mozilla-release-orig/xpcom/components/ManifestParser.cpp	2012-11-20 13:46:26.000000000 +1100
++++ mozilla-release-patched/xpcom/components/ManifestParser.cpp	2012-11-23 11:02:41.494572787 +1100
 @@ -35,6 +35,7 @@
  #include "nsIScriptError.h"
  #include "nsIXULAppInfo.h"
@@ -3263,7 +3091,7 @@
  
  using namespace mozilla;
  
-@@ -402,6 +403,7 @@ ParseManifest(NSLocationType type, FileL
+@@ -402,6 +403,7 @@
    NS_NAMED_LITERAL_STRING(kOs, "os");
    NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
    NS_NAMED_LITERAL_STRING(kABI, "abi");
@@ -3271,7 +3099,7 @@
  #if defined(MOZ_WIDGET_ANDROID)
    NS_NAMED_LITERAL_STRING(kTablet, "tablet");
  #endif
-@@ -449,6 +451,7 @@ ParseManifest(NSLocationType type, FileL
+@@ -449,6 +451,7 @@
    }
  
    nsAutoString osVersion;
@@ -3279,7 +3107,7 @@
  #if defined(XP_WIN)
    OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
    if (GetVersionEx(&info)) {
-@@ -456,6 +459,7 @@ ParseManifest(NSLocationType type, FileL
+@@ -456,6 +459,7 @@
                                           info.dwMajorVersion,
                                           info.dwMinorVersion);
    }
@@ -3287,7 +3115,7 @@
  #elif defined(MOZ_WIDGET_COCOA)
    SInt32 majorVersion, minorVersion;
    if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) &&
-@@ -464,16 +468,19 @@ ParseManifest(NSLocationType type, FileL
+@@ -464,16 +468,19 @@
                                           majorVersion,
                                           minorVersion);
    }
@@ -3307,7 +3135,7 @@
  #endif
  
    // Because contracts must be registered after CIDs, we save and process them
-@@ -565,6 +572,7 @@ ParseManifest(NSLocationType type, FileL
+@@ -565,6 +572,7 @@
  #endif
      bool platform = false;
      bool contentAccessible = false;
@@ -3315,7 +3143,7 @@
  
      while (NULL != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
        ToLowerCase(token);
-@@ -573,6 +581,7 @@ ParseManifest(NSLocationType type, FileL
+@@ -573,6 +581,7 @@
        if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||
            CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
            CheckStringFlag(kABI, wtoken, abi, stABI) ||
@@ -3323,7 +3151,7 @@
            CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
            CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
            CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion))
-@@ -611,6 +620,7 @@ ParseManifest(NSLocationType type, FileL
+@@ -611,6 +620,7 @@
          stGeckoVersion == eBad ||
          stOs == eBad ||
          stOsVersion == eBad ||
@@ -3331,9 +3159,10 @@
  #ifdef MOZ_WIDGET_ANDROID
          stTablet == eBad ||
  #endif
---- mozilla-release/xpcom/io/Makefile.in.kdemoz	2012-11-20 06:46:26.000000000 +0400
-+++ mozilla-release/xpcom/io/Makefile.in	2012-11-21 20:48:44.556357107 +0400
-@@ -162,7 +162,7 @@ DEFINES     += -DHAVE_USR_LIB64_DIR
+diff -urN mozilla-release-orig/xpcom/io/Makefile.in mozilla-release-patched/xpcom/io/Makefile.in
+--- mozilla-release-orig/xpcom/io/Makefile.in	2012-11-20 13:46:26.000000000 +1100
++++ mozilla-release-patched/xpcom/io/Makefile.in	2012-11-23 11:02:41.494572787 +1100
+@@ -162,7 +162,7 @@
  endif
  endif
  
@@ -3342,8 +3171,9 @@
  
  ifeq ($(MOZ_PLATFORM_MAEMO),5)
  CFLAGS          += $(MOZ_DBUS_CFLAGS)
---- mozilla-release/xpcom/io/nsLocalFileUnix.cpp.kdemoz	2012-11-20 06:46:26.000000000 +0400
-+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2012-11-21 20:48:44.557356774 +0400
+diff -urN mozilla-release-orig/xpcom/io/nsLocalFileUnix.cpp mozilla-release-patched/xpcom/io/nsLocalFileUnix.cpp
+--- mozilla-release-orig/xpcom/io/nsLocalFileUnix.cpp	2012-11-20 13:46:26.000000000 +1100
++++ mozilla-release-patched/xpcom/io/nsLocalFileUnix.cpp	2012-11-23 11:02:41.495072788 +1100
 @@ -54,6 +54,7 @@
  #ifdef MOZ_WIDGET_GTK
  #include "nsIGIOService.h"
@@ -3352,7 +3182,7 @@
  #endif
  
  #ifdef MOZ_WIDGET_COCOA
-@@ -1765,21 +1766,13 @@ NS_IMETHODIMP
+@@ -1765,21 +1766,13 @@
  nsLocalFile::Reveal()
  {
  #ifdef MOZ_WIDGET_GTK
@@ -3376,7 +3206,7 @@
      } else {
          nsCOMPtr<nsIFile> parentDir;
          nsCAutoString dirPath;
-@@ -1788,11 +1781,26 @@ nsLocalFile::Reveal()
+@@ -1788,11 +1781,26 @@
          if (NS_FAILED(parentDir->GetNativePath(dirPath)))
              return NS_ERROR_FAILURE;
  
@@ -3407,7 +3237,7 @@
  #elif defined(MOZ_WIDGET_COCOA)
      CFURLRef url;
      if (NS_SUCCEEDED(GetCFURL(&url))) {
-@@ -1828,6 +1836,13 @@ nsLocalFile::Launch()
+@@ -1828,6 +1836,13 @@
        return NS_ERROR_FAILURE;
      return NS_OK;
  #else