Commit c567d753 authored by Christoph Goehre's avatar Christoph Goehre
Browse files

Imported Upstream version 3.0.2.source

parent 891469d8
......@@ -229,6 +229,7 @@ ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj
endif
endif
$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
cd $(DIST)/l10n-stage; \
$(MAKE_PACKAGE)
ifdef MOZ_MAKE_COMPLETE_MAR
......@@ -244,17 +245,18 @@ ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
endif
endif
$(MAKE) clobber-zip AB_CD=$(AB_CD)
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
mv -f "$(DIST)/l10n-stage/$(PACKAGE)" "$(DIST)/$(PACKAGE)"
repackage-zip-%: $(ZIP_IN) $(STAGEDIST) libs-%
@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
langpack-%: LANGPACK_FILE=$(_ABS_DIST)/install/sunbird-$(MOZ_APP_VERSION).$(AB_CD).langpack.xpi
langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
langpack-%: AB_CD=$*
langpack-%: XPI_NAME=locale-$*
langpack-%: libs-%
@echo "Making langpack $(LANGPACK_FILE)"
$(NSINSTALL) -D $(DIST)/install
$(NSINSTALL) -D $(_ABS_DIST)/$(PKG_LANGPACK_PATH)
@$(MAKE) -C ../timezones/locales libs AB_CD=$* XPI_NAME=calendar-timezones USE_EXTENSION_MANIFEST=1
$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(call EXPAND_MOZLOCALE_SRCDIR,toolkit/locales)/defines.inc -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > $(FINAL_TARGET)/install.rdf
cd $(DIST)/xpi-stage/calendar-timezones/chrome && \
......
......@@ -46,6 +46,7 @@ if [ "$COMM_BUILD" ]; then
calendar/sunbird/base/Makefile
calendar/sunbird/locales/Makefile
$MOZ_BRANDING_DIRECTORY/Makefile
$MOZ_BRANDING_DIRECTORY/locales/Makefile
"
. ${srcdir}/calendar/shared_makefiles.sh
......
......@@ -41,11 +41,12 @@ DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = calendar/sunbird/branding/sunbird/locales
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD)
DIRS = \
locales \
$(NULL)
include $(topsrcdir)/config/rules.mk
......
#filter substitution
sunbird.jar:
% content branding %content/branding/
content/branding/about.png (content/about.png)
......@@ -7,9 +5,3 @@ sunbird.jar:
content/branding/aboutFooter.png (content/aboutFooter.png)
content/branding/icon64.png (content/icon64.png)
content/branding/icon48.png (content/icon48.png)
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
# Calendar branding only exists in en-US
locale/branding/brand.dtd (locales/en-US/brand.dtd)
* locale/branding/brand.properties (locales/en-US/brand.properties)
# ***** 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 Thunderbird unofficial branding.
#
# The Initial Developer of the Original Code is
# Mozilla Messaging
# Portions created by the Initial Developer are Copyright (C) 2008
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Mark Banner <bugzilla@standard8.plus.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either 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@
relativesrcdir = calendar/sunbird/branding/nightly/locales
include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
include $(topsrcdir)/config/rules.mk
#filter substitution
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
# Calendar branding only exists in en-US
locale/branding/brand.dtd (en-US/brand.dtd)
* locale/branding/brand.properties (en-US/brand.properties)
......@@ -382,4 +382,9 @@ cleansrcdir:
echo-variable-%:
@echo $($*)
# This makefile doesn't support parallel execution. It does pass
# MOZ_MAKE_FLAGS to sub-make processes, so they will correctly execute
# in parallel.
.NOTPARALLEL:
.PHONY: checkout real_checkout depend build export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure preflight_all preflight postflight postflight_all
......@@ -1807,7 +1807,10 @@ endif
endif
ifneq ($(DIST_FILES),)
libs:: $(DIST_FILES)
$(DIST)/bin:
$(NSINSTALL) -D $@
libs:: $(DIST_FILES) $(DIST)/bin
@$(EXIT_ON_ERROR) \
for f in $(DIST_FILES); do \
dest=$(FINAL_TARGET)/`basename $$f`; \
......
This diff is collapsed.
......@@ -128,7 +128,7 @@ dnl Set the minimum version of toolkit libs used by mozilla
dnl ========================================================
GLIB_VERSION=1.2.0
PERL_VERSION=5.006
CAIRO_VERSION=1.6.0
CAIRO_VERSION=1.8.8
PANGO_VERSION=1.14.0
GTK2_VERSION=2.10.0
MAKE_VERSION=3.78
......@@ -140,7 +140,7 @@ GCONF_VERSION=1.2.1
LIBGNOME_VERSION=2.0
STARTUP_NOTIFICATION_VERSION=0.8
DBUS_VERSION=0.60
SQLITE_VERSION=3.6.10
SQLITE_VERSION=3.6.16.1
MSMANIFEST_TOOL=
......@@ -4465,6 +4465,7 @@ MOZ_HELP_VIEWER=
MOZ_SPELLCHECK=1
MOZ_STATIC_MAIL_BUILD=
MOZ_STORAGE=1
MOZ_SVG=1
MOZ_TIMELINE=
MOZ_UI_LOCALE=en-US
MOZ_UNIVERSALCHARDET=1
......@@ -4541,6 +4542,7 @@ basic)
MOZ_PREF_EXTENSIONS=
MOZ_PROFILELOCKING=
MOZ_SPELLCHECK=
MOZ_SVG=
MOZ_UNIVERSALCHARDET=
MOZ_UPDATER=
MOZ_USE_NATIVE_UCONV=
......@@ -4578,6 +4580,7 @@ minimal)
MOZ_SPELLCHECK=
MOZ_STORAGE=1
MOZ_PLACES=
MOZ_SVG=
MOZ_UNIVERSALCHARDET=
MOZ_UPDATER=
MOZ_USE_NATIVE_UCONV=1
......@@ -5423,6 +5426,18 @@ MOZ_ARG_DISABLE_BOOL(universalchardet,
MOZ_UNIVERSALCHARDET=,
MOZ_UNIVERSALCHARDET=1 )
dnl ========================================================
dnl SVG
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(svg,
[ --disable-svg Disable SVG support (NB: unsupported option in comm-central)],
MOZ_SVG=,
MOZ_SVG=1 )
if test -z "$MOZ_SVG"; then
AC_MSG_ERROR([comm-central does not support disabling SVG.])
fi
dnl ========================================================
dnl Build Freetype in the tree
dnl ========================================================
......
......@@ -604,6 +604,13 @@ function EditorSharedStartup()
// Just for convenience
gContentWindow = window.content;
// Disable DNS Prefetching on the docshell - we don't need it for composer
// type windows.
GetCurrentEditorElement()
.docShell
.QueryInterface(Components.interfaces.nsIDocShell_MOZILLA_1_9_1_dns)
.allowDNSPrefetch = false;
// Set up the mime type and register the commands.
if (IsHTMLEditor())
SetupHTMLEditorCommands();
......
......@@ -196,7 +196,7 @@ function InitLanguageMenu(aCurLang)
try
{
langId = dictList[i];
isoStrArray = dictList[i].split("-");
isoStrArray = dictList[i].split(/[-_]/);
if (languageBundle && isoStrArray[0])
langLabel = languageBundle.getString(isoStrArray[0].toLowerCase());
......
......@@ -270,6 +270,12 @@ LDFLAGS += /HEAP:0x40000
endif
endif
ifeq ($(OS_ARCH),AIX)
ifdef BUILD_STATIC_LIBS
LDFLAGS += -bbigtoc
endif
endif
$(PROGRAM): $(MOZDEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
ifneq (,$(filter windows os2,$(MOZ_WIDGET_TOOLKIT)))
......
......@@ -147,7 +147,11 @@ function InitMsgWindow()
Components.classes["@mozilla.org/messenger/services/session;1"]
.getService(Components.interfaces.nsIMsgMailSession)
.AddMsgWindow(msgWindow);
document.getElementById("messagepane").docShell.allowAuth = false;
let messagepane = document.getElementById("messagepane");
messagepane.docShell.allowAuth = false;
messagepane.docShell
.QueryInterface(Components.interfaces.nsIDocShell_MOZILLA_1_9_1_dns)
.allowDNSPrefetch = false;
msgWindow.rootDocShell.allowAuth = true;
msgWindow.rootDocShell.appType = Components.interfaces.nsIDocShell.APP_TYPE_MAIL;
// Ensure we don't load xul error pages into the main window
......
......@@ -867,8 +867,10 @@ function IsReplyAllEnabled()
addresses += currentHeaderData.bcc.headerValue;
// Check to see if my email address is in the list of addresses.
let myEmail = getIdentityForHeader(msgHdr).email.toLowerCase();
let imInAddresses = addresses.toLowerCase().indexOf(myEmail) != -1;
let myEmail = getIdentityForHeader(msgHdr).email;
// We aren't guaranteed to have an email address, so guard against that.
let imInAddresses = myEmail && (addresses.toLowerCase().indexOf(
myEmail.toLowerCase()) != -1);
// Now, let's get the number of unique addresses.
let hdrParser = Components.classes["@mozilla.org/messenger/headerparser;1"]
......@@ -1256,17 +1258,10 @@ function MsgNewMessage(event)
function MsgReplyMessage(event)
{
var loadedFolder = gFolderDisplay.displayedFolder;
if (loadedFolder)
{
var server = loadedFolder.server;
if(server && server.type == "nntp")
{
MsgReplyGroup(event);
return;
}
}
MsgReplySender(event);
if (gFolderDisplay.selectedMessageIsNews)
MsgReplyGroup(event);
else
MsgReplySender(event);
}
function MsgReplySender(event)
......
......@@ -118,6 +118,20 @@ MessageDisplayWidget.prototype = {
*/
//@{
/**
* Unit testing support variable that tracks whether a message load is in
* process. This is set to true when |onDisplayingMessage| is invoked and
* cleared by invoking |clearDisplay| or when the message finishes streaming
* and |messageLoaded| is set to true.
*/
messageLoading: false,
/**
* Unit testing support variable that tracks whether there is currently a
* fully displayed message. This is cleared when |clearDisplay| is invoked
* or we hear that a new message begins streaming via |onDisplayingMessage|.
*/
messageLoaded: false,
clearDisplay: function MessageDisplayWidget_clearDisplay() {
this.displayedMessage = null;
this.messageLoading = false;
......
......@@ -251,8 +251,13 @@ menupopup[type="folder"] {
* area) to become wider than the viewport, which has the bad side-effect of
* causing the _other_ children (i.e. tabmail, which contains important widgetry
* like the message scrollbar) to be rendered out of view.
*
* As it turns out, we only need to override the mail-bar3 (at least of
* the toolbars we create), and we only need to override the overflow-x to
* fix this problem, so let's do that. This does open us up to extension
* toolbars causing the same problem, but we should be able to get the
* authors to change their extensions to prevent this problem.
*/
#mail-toolbox {
overflow: hidden;
#mail-bar3 {
overflow-x: hidden;
}
......@@ -81,10 +81,12 @@
modifiers="accel"/>
#endif
<key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
<key id="key_redo" key="&redoCmd.key;"
<key id="key_redo"
#ifdef XP_MACOSX
key="&undoCmd.key;"
modifiers="shift, accel"/>
#else
key="&redoCmd.key;"
modifiers="accel"/>
#endif
<key id="key_cut" key="&cutCmd.key;" modifiers="accel"/>
......
......@@ -123,12 +123,12 @@ mozmill::
cd $(MOZMILLDIR) && MACOSX_DEPLOYMENT_TARGET= $(PYTHON) \
runtestlist.py --list=mozmilltests.list --binary=$(PROGRAM) \
--dir=$(topsrcdir)/mail/test/mozmill \
--default-profile=$(PROGRAM_LOCATION)/defaults/profile $(MOZMILL_EXTRA)
$(MOZMILL_EXTRA)
mozmill-one::
cd $(MOZMILLDIR) && MACOSX_DEPLOYMENT_TARGET= $(PYTHON) runtest.py \
--test=$(topsrcdir)/mail/test/mozmill/$(SOLO_TEST) --binary=$(PROGRAM) \
--default-profile=$(PROGRAM_LOCATION)/defaults/profile $(MOZMILL_EXTRA)
$(MOZMILL_EXTRA)
endif # ENABLE_TESTS
endif # COMM_BUILD
......@@ -155,7 +155,12 @@
<!-- Edit Menu -->
<key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
<key id="key_redo" key="&redoCmd.key;" modifiers="accel"/>
<key id="key_redo"
#ifdef XP_MACOSX
key="&undoCmd.key;" modifiers="accel,shift"/>
#else
key="&redoCmd.key;" modifiers="accel"/>
#endif
<key id="key_cut" key="&cutCmd.key;" modifiers="accel"/>
<key id="key_copy" key="&copyCmd.key;" modifiers="accel"/>
<key id="key_paste" key="&pasteCmd.key;" modifiers="accel"/>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment