diff --git a/mozilla/mailnews/base/Makefile.in b/mozilla/mailnews/base/Makefile.in index 46c7ca8fdbd..fa0172c301f 100644 --- a/mozilla/mailnews/base/Makefile.in +++ b/mozilla/mailnews/base/Makefile.in @@ -43,15 +43,11 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = msgbase -DIRS = public src util search ispdata +DIRS = public src util search ispdata resources ifndef MOZ_STATIC_MAIL_BUILD DIRS += build endif -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -DIRS += resources/content/mac -endif - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/resources/content/Makefile.in b/mozilla/mailnews/base/resources/content/Makefile.in index 859f9f4c7fb..1903b24afa9 100644 --- a/mozilla/mailnews/base/resources/content/Makefile.in +++ b/mozilla/mailnews/base/resources/content/Makefile.in @@ -42,7 +42,15 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) +DIRS = win +else +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +DIRS = mac +else DIRS = unix +endif +endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/resources/content/mac/jar.mn b/mozilla/mailnews/base/resources/content/mac/jar.mn index d4efb607fec..1dec9e86282 100644 --- a/mozilla/mailnews/base/resources/content/mac/jar.mn +++ b/mozilla/mailnews/base/resources/content/mac/jar.mn @@ -1,2 +1,2 @@ messenger.jar: -+ content/messenger/platformMailnewsOverlay.xul + content/messenger/platformMailnewsOverlay.xul diff --git a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul index f53ec1d314e..20860f03f5c 100644 --- a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul +++ b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul @@ -39,7 +39,6 @@ - diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul index 2240ed1a2b5..77f0fdb7e58 100644 --- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul +++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul @@ -43,6 +43,7 @@ + diff --git a/mozilla/mailnews/base/resources/content/messageWindow.xul b/mozilla/mailnews/base/resources/content/messageWindow.xul index 36c0fd18e70..2f0439d4fc0 100644 --- a/mozilla/mailnews/base/resources/content/messageWindow.xul +++ b/mozilla/mailnews/base/resources/content/messageWindow.xul @@ -40,7 +40,6 @@ - diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul index 5015f8d42cb..a4d0fc1767e 100644 --- a/mozilla/mailnews/base/resources/content/messenger.xul +++ b/mozilla/mailnews/base/resources/content/messenger.xul @@ -39,7 +39,6 @@ - diff --git a/mozilla/mailnews/base/resources/content/unix/jar.mn b/mozilla/mailnews/base/resources/content/unix/jar.mn new file mode 100644 index 00000000000..1dec9e86282 --- /dev/null +++ b/mozilla/mailnews/base/resources/content/unix/jar.mn @@ -0,0 +1,2 @@ +messenger.jar: + content/messenger/platformMailnewsOverlay.xul diff --git a/mozilla/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul b/mozilla/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul index 48089fef375..968fed26c92 100644 --- a/mozilla/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul +++ b/mozilla/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul @@ -7,5 +7,8 @@ - + + + + diff --git a/mozilla/mailnews/base/resources/content/win/Makefile.in b/mozilla/mailnews/base/resources/content/win/Makefile.in new file mode 100644 index 00000000000..bfe65664595 --- /dev/null +++ b/mozilla/mailnews/base/resources/content/win/Makefile.in @@ -0,0 +1,47 @@ +# +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is +# IBM Corporation. +# Portions created by the Initial Developer are Copyright (C) 2004 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either of the GNU General Public License Version 2 or later (the "GPL"), +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +include $(topsrcdir)/config/rules.mk + + diff --git a/mozilla/mailnews/base/resources/content/win/jar.mn b/mozilla/mailnews/base/resources/content/win/jar.mn new file mode 100644 index 00000000000..1dec9e86282 --- /dev/null +++ b/mozilla/mailnews/base/resources/content/win/jar.mn @@ -0,0 +1,2 @@ +messenger.jar: + content/messenger/platformMailnewsOverlay.xul diff --git a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd index a6833207b15..f5eaf93fbc3 100644 --- a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd +++ b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd @@ -285,7 +285,7 @@ - + @@ -411,7 +411,7 @@ - + diff --git a/mozilla/mailnews/jar.mn b/mozilla/mailnews/jar.mn index 702f21e8b0d..30e0af9242c 100644 --- a/mozilla/mailnews/jar.mn +++ b/mozilla/mailnews/jar.mn @@ -136,7 +136,6 @@ messenger.jar: content/messenger/mailMessengerComposeOverlay.xul (base/resources/content/mailMessengerComposeOverlay.xul) content/messenger/mailOverlay.xul (base/resources/content/mailOverlay.xul) content/messenger/mailWidgets.xml (base/resources/content/mailWidgets.xml) - content/messenger/platformMailnewsOverlay.xul (base/resources/content/win/platformMailnewsOverlay.xul) content/messenger/junkMail.xul (base/resources/content/junkMail.xul) content/messenger/junkMail.js (base/resources/content/junkMail.js) content/messenger/junkMailInfo.xul (base/resources/content/junkMailInfo.xul) diff --git a/mozilla/xpfe/browser/resources/content/mac/platformNavigationBindings.xul b/mozilla/xpfe/browser/resources/content/mac/platformNavigationBindings.xul index c419023644b..86b3f68f1a7 100644 --- a/mozilla/xpfe/browser/resources/content/mac/platformNavigationBindings.xul +++ b/mozilla/xpfe/browser/resources/content/mac/platformNavigationBindings.xul @@ -14,6 +14,9 @@ + + + diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul index fa9190fb52e..25641ae030b 100644 --- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul +++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul @@ -107,8 +107,7 @@ - - + diff --git a/mozilla/xpfe/browser/resources/content/win/platformNavigationBindings.xul b/mozilla/xpfe/browser/resources/content/win/platformNavigationBindings.xul index 916100718b2..38d442f0b6c 100644 --- a/mozilla/xpfe/browser/resources/content/win/platformNavigationBindings.xul +++ b/mozilla/xpfe/browser/resources/content/win/platformNavigationBindings.xul @@ -26,7 +26,10 @@ - + + + +