firefox-kde.patch
changeset 680 be770d3cbc02
parent 662 775530ba0729
child 686 ab25aac2aa83
--- a/firefox-kde.patch	Sat Oct 05 22:39:27 2013 +0200
+++ b/firefox-kde.patch	Thu Oct 24 20:13:14 2013 +0200
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1097 @@
+@@ -0,0 +1,1161 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -292,6 +292,63 @@
 +
 +    <menupopup id="placesContext"/>
 +
++    <!-- Popup for site identity information -->
++    <panel id="identity-popup"
++           type="arrow"
++           hidden="true"
++           noautofocus="true"
++           consumeoutsideclicks="true"
++           onpopupshown="if (event.target == this)
++                           gIdentityHandler.onPopupShown(event);"
++           orient="vertical"
++           level="top">
++      <hbox id="identity-popup-container" align="top">
++        <image id="identity-popup-icon"/>
++        <vbox id="identity-popup-content-box">
++          <label id="identity-popup-brandName"
++                 class="identity-popup-label"
++                 value="&brandFullName;"/>
++          <label id="identity-popup-chromeLabel"
++                 class="identity-popup-label"/>
++          <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>
++          <vbox id="identity-popup-permissions">
++            <separator class="thin"/>
++            <label class="identity-popup-label header"
++                   value="&identity.permissions;"/>
++            <vbox id="identity-popup-permission-list" class="indent"/>
++          </vbox>
++        </vbox>
++      </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;"
++                oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
++      </hbox>
++    </panel>
 +
 +    <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
 +      <hbox>
@@ -974,7 +1031,6 @@
 +                  contentcontextmenu="contentAreaContextMenu"
 +                  autocompletepopup="PopupAutoComplete"/>
 +      <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
-+      <statuspanel id="statusbar-display" inactive="true"/>
 +    </vbox>
 +    <splitter id="social-sidebar-splitter"
 +              class="chromeclass-extrachrome sidebar-splitter"
@@ -999,16 +1055,24 @@
 +    <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
 +      <vbox id="full-screen-warning-message" align="center">
 +        <description id="full-screen-domain-text"/>
-+        <description class="full-screen-description" value="&fullscreenExitHint.value;"/>
++        <description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
 +        <vbox id="full-screen-approval-pane" align="center">
-+          <description class="full-screen-description" value="&fullscreenApproval.value;"/>
 +          <hbox>
++#ifndef XP_UNIX
++            <button label="&fullscreenExitButton.label;"
++                    oncommand="FullScreen.setFullscreenAllowed(false);"
++                    class="full-screen-approval-button"/>
++            <button label="&fullscreenAllowButton.label;"
++                    oncommand="FullScreen.setFullscreenAllowed(true);"
++                    class="full-screen-approval-button"/>
++#else
 +            <button label="&fullscreenAllowButton.label;"
 +                    oncommand="FullScreen.setFullscreenAllowed(true);"
 +                    class="full-screen-approval-button"/>
 +            <button label="&fullscreenExitButton.label;"
 +                    oncommand="FullScreen.setFullscreenAllowed(false);"
 +                    class="full-screen-approval-button"/>
++#endif
 +          </hbox>
 +          <checkbox id="full-screen-remember-decision"/>
 +        </vbox>
@@ -1103,7 +1167,7 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -53,16 +53,18 @@ browser.jar:
+@@ -52,16 +52,18 @@ browser.jar:
          content/browser/abouthealthreport/abouthealth.css     (content/abouthealthreport/abouthealth.css)
  #endif
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
@@ -1208,7 +1272,7 @@
      // 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.
-@@ -857,14 +863,25 @@ var gAdvancedPane = {
+@@ -860,14 +866,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1237,7 +1301,7 @@
 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,10 +17,12 @@ DISABLED_EXTRA_COMPONENTS = nsSetDefault
+@@ -16,10 +16,12 @@ USE_STATIC_LIBS = 1
  
  include $(topsrcdir)/config/rules.mk
  
@@ -1686,7 +1750,7 @@
 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
-@@ -601,19 +601,21 @@
+@@ -606,19 +606,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js