mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:52284fd63667
+:c4aab80e472f
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1184 @@
+@@ -0,0 +1,1177 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 +        xmlns:svg="http://www.w3.org/2000/svg"
 +        xmlns:html="http://www.w3.org/1999/xhtml"
 +        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 +        onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
-+        title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
++        title="&mainWindow.title;"
-+        title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
++        title_normal="&mainWindow.title;"
 +#ifdef XP_MACOSX
-+        title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
++        title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
-+        titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
++        titledefault="&mainWindow.title;"
 +        titlemodifier=""
 +        titlemodifier_normal=""
 +        titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
 +#else
-+        title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
++        title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
-+        titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
++        titlemodifier="&mainWindow.titlemodifier;"
-+        titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
++        titlemodifier_normal="&mainWindow.titlemodifier;"
-+        titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
++        titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
 +#endif
 +        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
 +        lightweightthemes="true"
 +        lightweightthemesfooter="browser-bottombox"
 +        windowtype="navigator:browser"
 +    <panel id="editBookmarkPanel"
 +           type="arrow"
 +           footertype="promobox"
 +           orient="vertical"
 +           ignorekeys="true"
-+           consumeoutsideclicks="true"
 +           hidden="true"
 +           onpopupshown="StarUI.panelShown(event);"
 +           aria-labelledby="editBookmarkPanelTitle">
 +      <row id="editBookmarkPanelHeader" align="center" hidden="true">
 +        <vbox align="center">
 +
 +    <!-- UI tour experience -->
 +    <panel id="UITourTooltip"
 +           type="arrow"
 +           hidden="true"
-+           consumeoutsideclicks="false"
 +           noautofocus="true"
 +           align="start"
 +           orient="vertical"
 +           role="alert">
 +      <label id="UITourTooltipTitle" flex="1"/>
 +    </html:div>
 +
 +    <panel id="socialActivatedNotification"
 +           type="arrow"
 +           hidden="true"
-+           consumeoutsideclicks="true"
 +           align="start"
 +           orient="horizontal"
 +           role="alert">
 +      <image id="social-activation-icon" class="popup-notification-icon"/>
 +      <vbox flex="1">
 +           class="social-panel"
 +           type="arrow"
 +           orient="horizontal"
 +           onpopupshowing="SocialShare.onShowing()"
 +           onpopuphidden="SocialShare.onHidden()"
-+           consumeoutsideclicks="true"
 +           hidden="true">
 +      <vbox class="social-share-toolbar">
 +        <vbox id="social-share-provider-buttons" flex="1"/>
 +      </vbox>
 +    </panel>
 +           side="right"
 +           type="arrow"
 +           hidden="true"
 +           flip="slide"
 +           rolluponmousewheel="true"
-+           consumeoutsideclicks="false"
 +           noautofocus="true"
 +           position="topcenter topright"/>
 +
 +    <menupopup id="toolbar-context-menu"
 +               onpopupshowing="onViewToolbarsPopupShowing(event);">
 +    <!-- 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">
 +  </hbox>
 +
 +  <vbox id="browser-bottombox" layer="true">
 +    <notificationbox id="global-notificationbox"/>
 +    <toolbar id="developer-toolbar"
-+             class="devtools-toolbar"
 +             hidden="true">
 +#ifdef XP_MACOSX
 +          <toolbarbutton id="developer-toolbar-closebutton"
 +                         class="devtools-closebutton"
 +                         oncommand="DeveloperToolbar.hide();"
 #endif
 };
 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
-@@ -8,10 +8,12 @@ USE_STATIC_LIBS = 1
+@@ -2,10 +2,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 include $(topsrcdir)/config/rules.mk
-DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
--DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\"
 CXXFLAGS += $(TK_CFLAGS)
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 +
 clobber::
 	rm -f $(DIST)/lib/$(LIBRARY_NAME).lib
 diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
 --- a/browser/components/shell/src/moz.build
 +++ b/browser/components/shell/src/moz.build
-@@ -12,16 +12,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+@@ -10,16 +10,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 SOURCES += [
 'nsMacShellService.cpp',
 ]
 elif CONFIG['MOZ_WIDGET_GTK']:
 SOURCES += [
 'nsGNOMEShellService.cpp',
-+        'nsKDEShellService.cpp',
++	'nsKDEShellService.cpp',
-+        'nsUnixShellService.cpp'
++	'nsUnixShellService.cpp',
 ]
 if SOURCES:
-LIBRARY_NAME = 'shellservice_s'
+FINAL_LIBRARY = 'browsercomps'
 EXTRA_COMPONENTS += [
 'nsSetDefaultBrowser.js',
 'nsSetDefaultBrowser.manifest',
 diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
 +
 +#endif // nsunixshellservice_h____
 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
-@@ -613,19 +613,21 @@
+@@ -640,19 +640,21 @@
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/browser/defaults/profile/prefs.js
 #ifndef LIBXUL_SDK
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)

changeset 703	c4aab80e472f
parent 691	18c2dc922e51
child 716	cef565f1c325