firefox-kde.patch
branchfirefox38
changeset 865 646495e9e721
parent 854 74b775d6b911
child 873 b8713c1e2156
--- a/firefox-kde.patch	Fri Jun 19 08:22:26 2015 +0200
+++ b/firefox-kde.patch	Sun Jun 28 09:17:38 2015 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  14be97741eabce611c291418a4c1774cae8b29ff
+# Parent  37dd974224e6c52f4bccc1ea6cef65b0e0add838
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
@@ -1339,7 +1339,7 @@
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1234,17 +1234,17 @@
+@@ -1228,17 +1228,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1372,14 +1372,14 @@
  *       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-pocket-en-US.properties (content/browser-pocket-en-US.properties)
-         content/browser/browser-pocket.dtd            (content/browser-pocket.dtd)
-         content/browser/browser-pocket-de.properties  (content/browser-pocket-de.properties)
-         content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties)
-         content/browser/browser-pocket-ja.properties  (content/browser-pocket-ja.properties)
-         content/browser/browser-pocket-ru.properties  (content/browser-pocket-ru.properties)
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/chatWindow.xul                (content/chatWindow.xul)
+         content/browser/content.js                    (content/content.js)
+         content/browser/defaultthemes/1.footer.jpg    (content/defaultthemes/1.footer.jpg)
+         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