--- a/firefox-kde.patch Wed Jun 12 21:15:08 2013 +0200
+++ b/firefox-kde.patch Mon Jun 17 22:57:16 2013 +0200
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1225 @@
+@@ -0,0 +1,1196 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -187,83 +187,40 @@
+ hidden="true"
+ consumeoutsideclicks="true"
+ align="start"
++ orient="horizontal"
+ role="alert">
-+ <hbox flex="1">
-+ <image id="social-activation-icon" class="popup-notification-icon"/>
-+ <vbox flex="1">
-+ <description id="social-activation-message" class="popup-notification-description"/>
++ <image id="social-activation-icon" class="popup-notification-icon"/>
++ <vbox flex="1">
++ <description id="social-activation-message" class="popup-notification-description">&social.activated.description;</description>
++ <spacer flex="1"/>
++ <hbox pack="start" align="center" class="popup-notification-button-container">
++ <label id="social-undoactivation-button"
++ class="text-link"
++ value="&social.activated.undo.label;"
++ accesskey="&social.activated.undo.accesskey;"
++ onclick="SocialUI.undoActivation(this);"/>
+ <spacer flex="1"/>
-+ <hbox pack="end" align="center" class="popup-notification-button-container">
-+#ifndef XP_UNIX
-+ <button id="social-undoactivation-button"
-+ label="&social.activated.undobutton.label;"
-+ accesskey="&social.activated.undobutton.accesskey;"
-+ onclick="SocialUI.undoActivation(this);"/>
-+ <button default="true"
-+ autofocus="autofocus"
-+ label="&social.ok.label;"
-+ accesskey="&social.ok.accesskey;"
-+ oncommand="SocialUI.notificationPanel.hidePopup();"/>
-+#else
-+ <button default="true"
-+ autofocus="autofocus"
-+ label="&social.ok.label;"
-+ accesskey="&social.ok.accesskey;"
-+ oncommand="SocialUI.notificationPanel.hidePopup();"/>
-+ <button id="social-undoactivation-button"
-+ label="&social.activated.undobutton.label;"
-+ accesskey="&social.activated.undobutton.accesskey;"
-+ onclick="SocialUI.undoActivation(this);"/>
-+#endif
-+ </hbox>
-+ </vbox>
-+ </hbox>
++ <button id="social-activation-button"
++ default="true"
++ autofocus="autofocus"
++ label="&social.ok.label;"
++ accesskey="&social.ok.accesskey;"
++ oncommand="SocialUI.activationPanel.hidePopup();"/>
++ </hbox>
++ </vbox>
+ </panel>
+
-+ <panel id="unsharePopup"
++ <panel id="social-share-panel"
++ class="social-panel"
+ type="arrow"
-+ orient="vertical"
-+ ignorekeys="true"
-+ hidden="true"
-+ onpopupshown="SocialShareButton.panelShown(event);"
++ orient="horizontal"
++ onpopupshowing="SocialShare.onShowing()"
++ onpopuphidden="SocialShare.onHidden()"
+ consumeoutsideclicks="true"
-+ level="top">
-+ <!-- Note that 'label', 'accesskey', 'value' and 'aria-label' attributes
-+ for many of these elements are supplied by the provider and filled
-+ in at runtime
-+ -->
-+ <row id="unsharePopupHeader" align="center">
-+ <vbox align="center">
-+ <image id="socialUserPortrait" onclick="SocialUI.showProfile();"/>
-+ </vbox>
-+ <vbox id="unsharePopupText">
-+ <button id="socialUserDisplayName" pack="start"
-+ oncommand="SocialUI.showProfile();"/>
-+ <spacer flex="1"/>
-+ <label id="socialUserRecommendedText"/>
-+ </vbox>
-+ </row>
-+ <hbox id="unsharePopupBottomButtons" pack="end">
-+#ifndef XP_UNIX
-+ <button id="unsharePopupStopSharingButton"
-+ class="unsharePopupBottomButton"
-+ command="Social:UnsharePage"/>
-+ <button id="unsharePopupContinueSharingButton"
-+ class="unsharePopupBottomButton"
-+ default="true"
-+ autofocus="autofocus"
-+ oncommand="SocialShareButton.dismissUnsharePopup();"/>
-+#else
-+ <button id="unsharePopupContinueSharingButton"
-+ class="unsharePopupBottomButton"
-+ default="true"
-+ autofocus="autofocus"
-+ oncommand="SocialShareButton.dismissUnsharePopup();"/>
-+ <button id="unsharePopupStopSharingButton"
-+ class="unsharePopupBottomButton"
-+ command="Social:UnsharePage"/>
-+#endif
-+ </hbox>
++ hidden="true">
++ <vbox class="social-share-toolbar">
++ <vbox id="social-share-provider-buttons" flex="1"/>
++ </vbox>
+ </panel>
+
+ <panel id="social-notification-panel"
@@ -455,6 +412,13 @@
+ </popupnotificationcontent>
+ </popupnotification>
+
++ <popupnotification id="servicesInstall-notification" hidden="true">
++ <popupnotificationcontent orient="vertical" align="start">
++ <separator class="thin"/>
++ <label id="servicesInstall-learnmore-link" class="text-link"/>
++ </popupnotificationcontent>
++ </popupnotification>
++
+ <popupnotification id="pointerLock-notification" hidden="true">
+ <popupnotificationcontent orient="vertical" align="start">
+ <separator class="thin"/>
@@ -531,7 +495,7 @@
+ toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+ fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="large"
-+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,downloads-button,home-button,bookmarks-menu-button-container,window-controls"
++ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls"
+ context="toolbar-context-menu">
+
+ <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
@@ -589,10 +553,12 @@
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
++ <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
++ <image id="servicesInstall-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.
@@ -620,16 +586,9 @@
+ hidden="true"
+ tooltiptext="&pageReportIcon.tooltip;"
+ onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
-+
-+ <label id="share-button-status" collapsed="true" role="status"/>
-+ <image id="share-button"
-+ class="urlbar-icon"
-+ hidden="true"
-+ onclick="SocialShareButton.onClick(event);"/>
-+
+ <image id="star-button"
+ class="urlbar-icon"
-+ onclick="PlacesStarButton.onClick(event);"/>
++ onclick="BookmarkingUI.onCommand(event);"/>
+ <image id="go-button"
+ class="urlbar-icon"
+ tooltiptext="&goEndCap.tooltip;"
@@ -680,6 +639,88 @@
+ oncommand="WebrtcIndicator.menuCommand(event.target);"/>
+ </toolbarbutton>
+
++ <toolbarbutton id="bookmarks-menu-button"
++ class="toolbarbutton-1 chromeclass-toolbar-additional"
++ persist="class"
++ removable="true"
++ type="menu"
++ label="&bookmarksMenuButton.label;"
++ tooltiptext="&bookmarksMenuButton.tooltip;"
++ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
++ ondragover="PlacesMenuDNDHandler.onDragOver(event);"
++ ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
++ ondrop="PlacesMenuDNDHandler.onDrop(event);">
++ <menupopup id="BMB_bookmarksPopup"
++ placespopup="true"
++ context="placesContext"
++ openInTabs="children"
++ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
++ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
++ onpopupshowing="BookmarkingUI.onPopupShowing(event);
++ if (!this.parentNode._placesView)
++ new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
++ tooltip="bhTooltip" popupsinherittooltip="true">
++ <menuitem id="BMB_viewBookmarksToolbar"
++ placesanonid="view-toolbar"
++ toolbarId="PersonalToolbar"
++ type="checkbox"
++ oncommand="onViewToolbarCommand(event)"
++ label="&viewBookmarksToolbar.label;"/>
++ <menuseparator/>
++ <menuitem id="BMB_bookmarksShowAll"
++ label="&showAllBookmarks2.label;"
++ command="Browser:ShowAllBookmarks"
++ key="manBookmarkKb"/>
++ <menuseparator/>
++ <menuitem id="BMB_bookmarkThisPage"
++#ifndef XP_MACOSX
++ class="menuitem-iconic"
++#endif
++ label="&bookmarkThisPageCmd.label;"
++ command="Browser:AddBookmarkAs"
++ key="addBookmarkAsKb"/>
++ <menuitem id="BMB_subscribeToPageMenuitem"
++#ifndef XP_MACOSX
++ class="menuitem-iconic"
++#endif
++ label="&subscribeToPageMenuitem.label;"
++ oncommand="return FeedHandler.subscribeToFeed(null, event);"
++ onclick="checkForMiddleClick(this, event);"
++ observes="singleFeedMenuitemState"/>
++ <menu id="BMB_subscribeToPageMenupopup"
++#ifndef XP_MACOSX
++ class="menu-iconic"
++#endif
++ label="&subscribeToPageMenupopup.label;"
++ observes="multipleFeedsMenuState">
++ <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
++ onpopupshowing="return FeedHandler.buildFeedList(event.target);"
++ oncommand="return FeedHandler.subscribeToFeed(null, event);"
++ onclick="checkForMiddleClick(this, event);"/>
++ </menu>
++ <menuseparator/>
++ <menu id="BMB_bookmarksToolbar"
++ placesanonid="toolbar-autohide"
++ class="menu-iconic bookmark-item"
++ label="&personalbarCmd.label;"
++ container="true">
++ <menupopup id="BMB_bookmarksToolbarPopup"
++ placespopup="true"
++ context="placesContext"
++ onpopupshowing="if (!this.parentNode._placesView)
++ new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
++ </menu>
++ <menuseparator/>
++ <!-- Bookmarks menu items -->
++ <menuseparator builder="end"
++ class="hide-if-empty-places-result"/>
++ <menuitem id="BMB_unsortedBookmarks"
++ label="&bookmarksMenuButton.unsorted.label;"
++ oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
++ class="menuitem-iconic"/>
++ </menupopup>
++ </toolbarbutton>
++
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class" removable="true"
+ label="&homeButton.label;"
@@ -690,6 +731,13 @@
+ onclick="BrowserGoHome(event);"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+
++ <toolbarbutton id="social-share-button"
++ class="toolbarbutton-1 chromeclass-toolbar-additional"
++ hidden="true"
++ label="&sharePageCmd.label;"
++ tooltiptext="&sharePageCmd.label;"
++ command="Social:SharePage"/>
++
+ <toolbaritem id="social-toolbar-item"
+ class="chromeclass-toolbar-additional"
+ removable="false"
@@ -727,97 +775,20 @@
+ label="&social.toggleNotifications.label;"
+ accesskey="&social.toggleNotifications.accesskey;"/>
+ <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
-+ <menuseparator class="social-statusarea-separator"/>
++ <menuseparator/>
+ <menuseparator class="social-provider-menu" hidden="true"/>
+ <menuitem class="social-addons-menuitem" command="Social:Addons"
+ label="&social.addons.label;"/>
++ <menuitem label="&social.learnMore.label;"
++ accesskey="&social.learnMore.accesskey;"
++ oncommand="SocialUI.showLearnMore();"/>
+ </menupopup>
+ </toolbarbutton>
-+ </toolbaritem>
-+
-+ <toolbaritem id="bookmarks-menu-button-container"
-+ class="chromeclass-toolbar-additional"
-+ removable="true"
-+ title="&bookmarksMenuButton.label;">
-+ <toolbarbutton id="bookmarks-menu-button"
-+ type="menu"
++ <toolbarbutton id="social-mark-button"
+ class="toolbarbutton-1"
-+ label="&bookmarksMenuButton.label;"
-+ tooltiptext="&bookmarksMenuButton.tooltip;"
-+ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
-+ ondragover="PlacesMenuDNDHandler.onDragOver(event);"
-+ ondragexit="PlacesMenuDNDHandler.onDragExit(event);"
-+ ondrop="PlacesMenuDNDHandler.onDrop(event);">
-+ <menupopup id="BMB_bookmarksPopup"
-+ placespopup="true"
-+ context="placesContext"
-+ openInTabs="children"
-+ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
-+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
-+ onpopupshowing="BookmarksMenuButton.onPopupShowing(event);
-+ if (!this.parentNode._placesView)
-+ new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
-+ tooltip="bhTooltip" popupsinherittooltip="true">
-+ <menuitem id="BMB_viewBookmarksToolbar"
-+ placesanonid="view-toolbar"
-+ toolbarId="PersonalToolbar"
-+ type="checkbox"
-+ oncommand="onViewToolbarCommand(event)"
-+ label="&viewBookmarksToolbar.label;"/>
-+ <menuseparator/>
-+ <menuitem id="BMB_bookmarksShowAll"
-+ label="&showAllBookmarks2.label;"
-+ command="Browser:ShowAllBookmarks"
-+ key="manBookmarkKb"/>
-+ <menuseparator/>
-+ <menuitem id="BMB_bookmarkThisPage"
-+#ifndef XP_MACOSX
-+ class="menuitem-iconic"
-+#endif
-+ label="&bookmarkThisPageCmd.label;"
-+ command="Browser:AddBookmarkAs"
-+ key="addBookmarkAsKb"/>
-+ <menuitem id="BMB_subscribeToPageMenuitem"
-+#ifndef XP_MACOSX
-+ class="menuitem-iconic"
-+#endif
-+ label="&subscribeToPageMenuitem.label;"
-+ oncommand="return FeedHandler.subscribeToFeed(null, event);"
-+ onclick="checkForMiddleClick(this, event);"
-+ observes="singleFeedMenuitemState"/>
-+ <menu id="BMB_subscribeToPageMenupopup"
-+#ifndef XP_MACOSX
-+ class="menu-iconic"
-+#endif
-+ label="&subscribeToPageMenupopup.label;"
-+ observes="multipleFeedsMenuState">
-+ <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
-+ onpopupshowing="return FeedHandler.buildFeedList(event.target);"
-+ oncommand="return FeedHandler.subscribeToFeed(null, event);"
-+ onclick="checkForMiddleClick(this, event);"/>
-+ </menu>
-+ <menuseparator/>
-+ <menu id="BMB_bookmarksToolbar"
-+ placesanonid="toolbar-autohide"
-+ class="menu-iconic bookmark-item"
-+ label="&personalbarCmd.label;"
-+ container="true">
-+ <menupopup id="BMB_bookmarksToolbarPopup"
-+ placespopup="true"
-+ context="placesContext"
-+ onpopupshowing="if (!this.parentNode._placesView)
-+ new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
-+ </menu>
-+ <menuseparator/>
-+ <!-- Bookmarks menu items -->
-+ <menuseparator builder="end"
-+ class="hide-if-empty-places-result"/>
-+ <menuitem id="BMB_unsortedBookmarks"
-+ label="&bookmarksMenuButton.unsorted.label;"
-+ oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
-+ class="menuitem-iconic"/>
-+ </menupopup>
-+ </toolbarbutton>
++ hidden="true"
++ disabled="true"
++ command="Social:TogglePageMark"/>
+ </toolbaritem>
+
+ <hbox id="window-controls" hidden="true" pack="end">
@@ -1231,7 +1202,7 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -55,16 +55,18 @@ browser.jar:
+@@ -53,16 +53,18 @@ browser.jar:
content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css)
#endif
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
@@ -1249,7 +1220,7 @@
content/browser/newtab/newTab.css (content/newtab/newTab.css)
content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
- * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js)
+ content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js)
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
@@ -1336,7 +1307,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.
-@@ -792,14 +798,25 @@ var gAdvancedPane = {
+@@ -797,14 +803,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser.
*/
setDefaultBrowser: function()
@@ -1798,7 +1769,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
-@@ -602,19 +602,21 @@
+@@ -604,19 +604,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js