firefox-kde.patch
changeset 841 d8a3e976dfba
parent 837 a1f740acf68e
child 850 a2bdff616a0e
--- a/firefox-kde.patch	Sun Mar 01 19:07:16 2015 +0100
+++ b/firefox-kde.patch	Sat Mar 14 15:56:15 2015 +0100
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  1426724b00dc9de228bf0ead1facc1f8fe5d68cf
+# Parent  409c60c5454efb61ebecf0edc8822a0e92f563f3
 
 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,1276 @@
+@@ -0,0 +1,1288 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -585,6 +585,17 @@
 +
 +    <tooltip id="dynamic-shortcut-tooltip"
 +             onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
++
++    <menupopup id="emeNotificationsPopup">
++      <menuitem id="emeNotificationsNotNow"
++                label="Not now"
++                acceskey="N"
++                oncommand="gEMEHandler.onNotNow(this);"/>
++      <menuitem id="emeNotificationsDontAskAgain"
++                label="Don't ask me again"
++                acceskey="D"
++                oncommand="gEMEHandler.onDontAskAgain(this);"/>
++    </menupopup>
 +  </popupset>
 +
 +#ifdef CAN_DRAW_IN_TITLEBAR
@@ -805,6 +816,7 @@
 +                <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="eme-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.
@@ -1304,7 +1316,7 @@
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1202,17 +1202,17 @@
+@@ -1214,17 +1214,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1337,6 +1349,7 @@
  *       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-eme.properties        (content/browser-eme.properties)
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/chatWindow.xul                (content/chatWindow.xul)
          content/browser/content.js                    (content/content.js)
@@ -1344,7 +1357,6 @@
          content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
          content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
          content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
-         content/browser/defaultthemes/2.footer.jpg    (content/defaultthemes/2.footer.jpg)
 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