firefox-kde.patch
changeset 606 9d39369e1b4c
parent 596 9124c1a643c5
child 609 d2bfc69375aa
--- a/firefox-kde.patch	Fri Jan 11 15:58:38 2013 +0100
+++ b/firefox-kde.patch	Wed Jan 16 23:09:49 2013 +0100
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1274 @@
+@@ -0,0 +1,1276 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -668,38 +668,40 @@
 +                   class="chromeclass-toolbar-additional"
 +                   removable="false"
 +                   title="&socialToolbar.title;"
-+                   hidden="true">
++                   hidden="true"
++                   observes="socialActiveBroadcaster">
 +        <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"/>
++            <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
++                      observes="socialBroadcaster_userDetails"
++                      oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
++              <image class="social-statusarea-user-portrait"
++                     observes="socialBroadcaster_userDetails"/>
 +              <vbox>
-+                <label id="social-statusarea-notloggedin"
-+                       value="&social.notLoggedIn.label;"/>
-+                <label id="social-statusarea-username"/>
++                <label class="social-statusarea-loggedInStatus"
++                       observes="socialBroadcaster_userDetails"/>
 +              </vbox>
 +            </menuitem>
 +#ifndef XP_WIN
-+            <menuseparator/>
++            <menuseparator class="social-statusarea-separator"/>
 +#endif
-+            <menuitem id="social-toggle-sidebar-menuitem"
++            <menuitem class="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"
++            <menuitem class="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();"/>
++            <menuseparator class="social-statusarea-separator"/>
++            <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
++            <menuitem class="social-remove-menuitem" command="Social:Remove"/>
 +          </menupopup>
 +        </toolbarbutton>
 +      </toolbaritem>
@@ -1847,7 +1849,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
-@@ -579,18 +579,20 @@
+@@ -578,18 +578,20 @@
  @BINPATH@/@PREF_DIR@/healthreport-prefs.js
  #endif
  @BINPATH@/greprefs.js