From eea50673203f185a2721b62c24276270cd7950c2412181a553df27c97cd5da44 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Wed, 12 Jan 2011 22:56:24 +0000
Subject: [PATCH] fix browser-kde.xul

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=180
---
 firefox-kde.patch | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/firefox-kde.patch b/firefox-kde.patch
index 062969ec..f591bfb7 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -23,7 +23,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1042 @@
+@@ -0,0 +1,1058 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -329,7 +329,8 @@ new file mode 100644
 +    </menupopup>
 +
 +    <menupopup id="blockedPopupOptions"
-+               onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
++               onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"
++               onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);">
 +      <menuitem observes="blockedPopupAllowSite"/>
 +      <menuitem observes="blockedPopupEditSettings"/>
 +      <menuitem observes="blockedPopupDontShowMessage"/>
@@ -398,7 +399,7 @@ new file mode 100644
 +                         class="identity-popup-description"/>
 +          </hbox>
 +          <!-- Footer button to open security page info -->
-+          <hbox pack="end">
++          <hbox id="identity-popup-button-container" pack="end">
 +            <button id="identity-popup-more-info-button"
 +                    label="&identity.moreInfoLinkText;"
 +                    onblur="gIdentityHandler.hideIdentityPopup();"
@@ -510,6 +511,11 @@ new file mode 100644
 +# 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"
@@ -592,6 +598,12 @@ new file mode 100644
 +          </box>
 +          <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
 +          <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);"/>
@@ -869,6 +881,10 @@ new file mode 100644
 +                     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">
@@ -1543,7 +1559,7 @@ new file mode 100644
 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
-@@ -441,16 +441,17 @@
+@@ -442,16 +442,17 @@
  #endif
  #endif