Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 415081 Get rid of lightning-wcap.xpi; r=philipp

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@244959 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
daniel.boelzle%sun.com 2008-02-05 22:55:11 +00:00
parent 0146579336
commit b2c37cd95d
17 changed files with 86 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/calendar/lightning/content/lightning-scripts.inc
View File

@ -46,6 +46,7 @@
<script type="application/x-javascript" src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
<script type="application/x-javascript" src="chrome://lightning/content/messenger-overlay-toolbar.js"/>
<script type="application/x-javascript" src="chrome://lightning/content/lightning-common-sets.js"/>
<script type="application/x-javascript" src="chrome://calendar/content/calendar-invitations-manager.js"/>
<script type="application/x-javascript">
var calendarmenulabel = "&lightning.calendar.label;";
var calendarmenuaccesskey = "&lightning.calendar.accesskey;";
@ -53,5 +54,5 @@
var messagemenuaccesskey = "&msgMenu.accesskey;";
var tasksmenulabel = "&lightning.tasks.label;";
var tasksmenuaccesskey = "&lightning.tasks.accesskey;";
var invitationsLabel = "&lightning.sidebar.invitations.label;";
</script>

81
mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
View File

@ -252,11 +252,8 @@ function ltnOnLoad(event)
// Make sure we update ourselves if the program stays open over midnight
scheduleMidnightUpdate(refreshUIBits);
if (getPrefSafe("calendar.prototypes.wcap", false)) {
document.loadOverlay(
"chrome://lightning/content/sun-messenger-overlay-sidebar.xul",
null);
}
scheduleInvitationsUpdate(FIRST_DELAY_STARTUP, REPEAT_DELAY);
getCalendarManager().addObserver(gInvitationsCalendarManagerObserver);
// Set up the command controller from calendar-common-sets.js
injectCalendarCommandController();
@ -448,6 +445,7 @@ function LtnObserveDisplayDeckChange(event) {
}
function ltnFinish() {
getCalendarManager().removeObserver(gInvitationsCalendarManagerObserver);
getCompositeCalendar().removeObserver(agendaTreeView.calendarObserver);
unloadCalendarManager();
@ -747,6 +745,79 @@ function removeMenuElements(aRoot, aModeValue) {
}
}
// == invitations link
const FIRST_DELAY_STARTUP = 100;
const FIRST_DELAY_RESCHEDULE = 100;
const FIRST_DELAY_REGISTER = 10000;
const FIRST_DELAY_UNREGISTER = 0;
const REPEAT_DELAY = 180000;
var gInvitationsOperationListener = {
onOperationComplete: function sBOL_onOperationComplete(aCalendar,
aStatus,
aOperationType,
aId,
aDetail) {
if (!Components.isSuccessCode(aStatus)) {
var invitationsBox = document.getElementById("invitations");
invitationsBox.setAttribute("hidden", "true");
}
},
onGetResult: function sBOL_onGetResult(aCalendar,
aStatus,
aItemType,
aDetail,
aCount,
aItems) {
if (!Components.isSuccessCode(aStatus)) {
return;
}
var invitationsBox = document.getElementById("invitations");
var value = invitationsLabel + " (" + aCount + ")";
invitationsBox.setAttribute("value", value);
invitationsBox.removeAttribute("hidden");
}
};
var gInvitationsCalendarManagerObserver = {
mSideBar: this,
onCalendarRegistered: function cMO_onCalendarRegistered(aCalendar) {
this.mSideBar.rescheduleInvitationsUpdate(FIRST_DELAY_REGISTER,
REPEAT_DELAY);
},
onCalendarUnregistering: function cMO_onCalendarUnregistering(aCalendar) {
this.mSideBar.rescheduleInvitationsUpdate(FIRST_DELAY_UNREGISTER,
REPEAT_DELAY);
},
onCalendarDeleting: function cMO_onCalendarDeleting(aCalendar) {
}
};
function scheduleInvitationsUpdate(firstDelay, repeatDelay) {
getInvitationsManager().scheduleInvitationsUpdate(firstDelay,
repeatDelay,
gInvitationsOperationListener);
}
function rescheduleInvitationsUpdate(firstDelay, repeatDelay) {
getInvitationsManager().cancelInvitationsUpdate();
scheduleInvitationsUpdate(firstDelay, repeatDelay);
}
function openInvitationsDialog() {
getInvitationsManager().cancelInvitationsUpdate();
getInvitationsManager().openInvitationsDialog(
gInvitationsOperationListener,
function oiD_callback() {
scheduleInvitationsUpdate(FIRST_DELAY_RESCHEDULE,
REPEAT_DELAY);
});
}
SelectMessage = function(messageUri) {
document.getElementById("switch2mail").doCommand();
gSelectMessage(messageUri);

5
mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
View File

@ -50,6 +50,7 @@
<!ENTITY % dtd1 SYSTEM "chrome://lightning/locale/lightning.dtd" > %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %dtd2;
<!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd3;
<!ENTITY % dtd4 SYSTEM "chrome://lightning/locale/sun-lightning.dtd" > %dtd4;
<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd"> %messengerDTD;
]>
@ -481,6 +482,10 @@
collapsable="true"
persist="collapsed"/>
</vbox>
<label id="invitations"
class="text-link calendar-invitations-sidebar-label"
value="&lightning.sidebar.invitations.label;"
onclick="openInvitationsDialog();"/>
</vbox>
</deck>

2
mozilla/calendar/lightning/jar.mn
View File

@ -18,8 +18,6 @@ lightning.jar:
content/lightning/messenger-overlay-toolbar.js (content/messenger-overlay-toolbar.js)
* content/lightning/messenger-overlay-toolbar.xul (content/messenger-overlay-toolbar.xul)
content/lightning/toolkit-overlay-custombar.xul (content/toolkit-overlay-custombar.xul)
content/lightning/sun-messenger-overlay-sidebar.xul (/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.xul)
content/lightning/sun-messenger-overlay-sidebar.js (/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.js)
#expand skin/classic/lightning/imip.css (themes/__THEME__/imip.css)
#expand skin/classic/lightning/lightning.css (themes/__THEME__/lightning.css)
#expand skin/classic/lightning/sun-messenger-overlay-sidebar.css (/calendar/prototypes/themes/__THEME__/sun-messenger-overlay-sidebar.css)

69
mozilla/calendar/prototypes/wcap/lightning-wcap/Makefile.in
View File

@ -1,69 +0,0 @@
# ***** 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 the Mozilla Lightning + WCAP code
#
# The Initial Developer of the Original Code is the Mozilla Corporation.
# Portions created by the Initial Developer are Copyright (C) 2006
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Matthew Willis <lilmatt@mozilla.com>
# Daniel Boelzle <daniel.boelzle@sun.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@
include $(DEPTH)/config/autoconf.mk
DIRS = \
../../../lightning \
../wcap-enabler \
$(NULL)
MODULE = lightning-wcap
export XPI_NAME = lightning-wcap
DIST_FILES = install.rdf
XPI_PKGNAME = lightning-wcap
DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION)
DEFINES += -DFIREFOX_VERSION=$(FIREFOX_VERSION)
DEFINES += -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI)
LIGHTNING_VERSION := $(shell cat $(srcdir)/../../../sunbird/config/version.txt)
DEFINES += -DLIGHTNING_VERSION=$(LIGHTNING_VERSION)
CHROME_DEPS += $(FINAL_TARGET)/lightning.xpi $(FINAL_TARGET)/wcap-enabler.xpi
include $(topsrcdir)/config/rules.mk
$(FINAL_TARGET)/%.xpi: $(FINAL_TARGET)/../%.xpi
$(INSTALL) $< $(FINAL_TARGET)

31
mozilla/calendar/prototypes/wcap/lightning-wcap/install.rdf
View File

@ -1,31 +0,0 @@
<?xml version="1.0"?>
#filter substitution
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:NC="http://home.netscape.com/NC-rdf#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<!-- nsIUpdateItem type for a Multiple Item Package -->
<em:type NC:parseType="Integer">32</em:type>
<em:id>lightning-wcap@calendar.mozilla.org</em:id>
<em:version>@LIGHTNING_VERSION@</em:version>
<em:targetApplication>
<Description>
<!-- Thunderbird -->
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
#ifdef MOZILLA_1_8_BRANCH
<em:minVersion>2.0</em:minVersion>
<em:maxVersion>2.0.0.*</em:maxVersion>
#else
<em:minVersion>@THUNDERBIRD_VERSION@</em:minVersion>
<em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
#endif
</Description>
</em:targetApplication>
<em:name>Lightning with WCAP</em:name>
<em:description>A calendar for Thunderbird with support for the Sun Java System Calendar Server (WCAP).</em:description>
<em:targetPlatform>@TARGET_PLATFORM@</em:targetPlatform>
<em:creator>Mozilla Calendar Project</em:creator>
<em:homepageURL>http://www.mozilla.org/projects/calendar/</em:homepageURL>
<em:iconURL>chrome://calendar/skin/cal-icon32.png</em:iconURL>
</Description>
</RDF>

121
mozilla/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.js vendored
View File

@ -1,121 +0,0 @@
/* ***** 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 Sun Microsystems code.
*
* The Initial Developer of the Original Code is Sun Microsystems.
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Thomas Benisch <thomas.benisch@sun.com>
* Philipp Kewisch <mozilla@kewis.ch>
*
* 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 ***** */
const FIRST_DELAY_STARTUP = 100;
const FIRST_DELAY_RESCHEDULE = 100;
const FIRST_DELAY_REGISTER = 10000;
const FIRST_DELAY_UNREGISTER = 0;
const REPEAT_DELAY = 180000;
var sideBarOperationListener = {
onOperationComplete: function sBOL_onOperationComplete(aCalendar,
aStatus,
aOperationType,
aId,
aDetail) {
if (!Components.isSuccessCode(aStatus)) {
var invitationsBox = document.getElementById("invitations");
invitationsBox.setAttribute("hidden", "true");
}
},
onGetResult: function sBOL_onGetResult(aCalendar,
aStatus,
aItemType,
aDetail,
aCount,
aItems) {
if (!Components.isSuccessCode(aStatus)) {
return;
}
var invitationsBox = document.getElementById("invitations");
var value = invitationsLabel + " (" + aCount + ")";
invitationsBox.setAttribute("value", value);
invitationsBox.removeAttribute("hidden");
}
};
var sideBarCalendarManagerObserver = {
mSideBar: this,
onCalendarRegistered: function cMO_onCalendarRegistered(aCalendar) {
this.mSideBar.rescheduleInvitationsUpdate(FIRST_DELAY_REGISTER,
REPEAT_DELAY);
},
onCalendarUnregistering: function cMO_onCalendarUnregistering(aCalendar) {
this.mSideBar.rescheduleInvitationsUpdate(FIRST_DELAY_UNREGISTER,
REPEAT_DELAY);
},
onCalendarDeleting: function cMO_onCalendarDeleting(aCalendar) {
}
};
function onLoad() {
scheduleInvitationsUpdate(FIRST_DELAY_STARTUP, REPEAT_DELAY);
getCalendarManager().addObserver(sideBarCalendarManagerObserver);
document.addEventListener("unload", onUnload, true);
}
function onUnload() {
document.removeEventListener("unload", onUnload, true);
getCalendarManager().removeObserver(sideBarCalendarManagerObserver);
}
function scheduleInvitationsUpdate(firstDelay, repeatDelay) {
getInvitationsManager().scheduleInvitationsUpdate(firstDelay,
repeatDelay,
sideBarOperationListener);
}
function rescheduleInvitationsUpdate(firstDelay, repeatDelay) {
getInvitationsManager().cancelInvitationsUpdate();
scheduleInvitationsUpdate(firstDelay, repeatDelay);
}
function openInvitationsDialog() {
getInvitationsManager().cancelInvitationsUpdate();
getInvitationsManager().openInvitationsDialog(
sideBarOperationListener,
function oiD_callback() {
scheduleInvitationsUpdate(FIRST_DELAY_RESCHEDULE,
REPEAT_DELAY);
});
}
onLoad();

57
mozilla/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.xul
View File

@ -1,57 +0,0 @@
<?xml version="1.0"?>
<!-- ***** 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 Sun Microsystems code.
-
- The Initial Developer of the Original Code is Sun Microsystems.
- Portions created by the Initial Developer are Copyright (C) 2006
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Thomas Benisch <thomas.benisch@sun.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 ***** -->
<!DOCTYPE overlay SYSTEM "chrome://lightning/locale/sun-lightning.dtd">
<?xml-stylesheet href="chrome://lightning/skin/sun-messenger-overlay-sidebar.css" type="text/css"?>
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://calendar/content/calendar-invitations-manager.js"/>
<script type="application/x-javascript" src="chrome://lightning/content/sun-messenger-overlay-sidebar.js"/>
<script type="application/x-javascript">
var invitationsLabel = "&lightning.sidebar.invitations.label;";
</script>
<vbox id="ltnSidebar">
<label id="invitations"
class="text-link calendar-invitations-sidebar-label"
value="&lightning.sidebar.invitations.label;"
onclick="openInvitationsDialog();"
hidden="true"/>
</vbox>
</overlay>

60
mozilla/calendar/prototypes/wcap/wcap-enabler/Makefile.in
View File

@ -1,60 +0,0 @@
# ***** 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 the Mozilla Lightning + WCAP code
#
# The Initial Developer of the Original Code is the Mozilla Corporation.
# Portions created by the Initial Developer are Copyright (C) 2006
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Matthew Willis <lilmatt@mozilla.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@
include $(DEPTH)/config/autoconf.mk
MODULE = wcap-enabler
export XPI_NAME = wcap-enabler
DIST_FILES = install.rdf
XPI_PKGNAME = wcap-enabler
DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION)
DEFINES += -DFIREFOX_VERSION=$(FIREFOX_VERSION)
DEFINES += -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI)
LIGHTNING_VERSION := $(shell cat $(srcdir)/../../../sunbird/config/version.txt)
DEFINES += -DLIGHTNING_VERSION=$(LIGHTNING_VERSION)
PREF_JS_EXPORTS = $(srcdir)/wcap-enabler.js
include $(topsrcdir)/config/rules.mk

27
mozilla/calendar/prototypes/wcap/wcap-enabler/install.rdf
View File

@ -1,27 +0,0 @@
<?xml version="1.0"?>
#filter substitution
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:targetApplication>
<Description>
<!-- Thunderbird -->
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
#ifdef MOZILLA_1_8_BRANCH
<em:minVersion>2.0</em:minVersion>
<em:maxVersion>2.0.0.*</em:maxVersion>
#else
<em:minVersion>@THUNDERBIRD_VERSION@</em:minVersion>
<em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
#endif
</Description>
</em:targetApplication>
<em:id>wcap-enabler@calendar.mozilla.org</em:id>
<em:version>@LIGHTNING_VERSION@</em:version>
<em:name>WCAP Enabler</em:name>
<em:description>Enables support for the Sun Java System Calendar Server (WCAP) in the Lightning calendar extension.</em:description>
<em:creator>Mozilla Calendar Project</em:creator>
<em:homepageURL>http://www.mozilla.org/projects/calendar/</em:homepageURL>
<em:iconURL>chrome://calendar/skin/cal-icon32.png</em:iconURL>
</Description>
</RDF>

43
mozilla/calendar/prototypes/wcap/wcap-enabler/wcap-enabler.js vendored
View File

@ -1,43 +0,0 @@
/* ***** 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 the Mozilla Lightning + WCAP code
*
* The Initial Developer of the Original Code is the Mozilla Corporation.
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Matthew Willis <lilmatt@mozilla.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 ***** */
// This file contains the preferences to enable WCAP support in Lightning
// enables the prototype WCAP UI:
pref("calendar.prototypes.wcap", true);
// enables the WCAP provider in the new calendar wizard:
pref("calendar.wcap.enabled", true);

8
mozilla/calendar/resources/content/calendarCreation.js
View File

@ -37,14 +37,6 @@
function initLocationPage()
{
var bShowWcap = false;
try {
bShowWcap = getPrefSafe("calendar.prototypes.wcap", false);
}
catch (exc) {} // calendar.prototypes.wcap currently not present in Sunbird
bShowWcap = (bShowWcap || getPrefSafe("calendar.wcap.enabled", false));
document.getElementById("wcap-radio").setAttribute(
"collapsed", bShowWcap ? "false" : "true");
checkRequired();
}

2
mozilla/calendar/sunbird/app/profile/sunbird.js
View File

@ -254,8 +254,6 @@ pref("browser.preferences.animateFadeIn", true);
pref("browser.preferences.animateFadeIn", false);
#endif
pref("calendar.wcap.enabled", false);
// Used by view-source
pref("accessibility.typeaheadfind.flashBar", 1);
pref("view_source.editor.path", "");

2
mozilla/extensions/lightning/Makefile.in
View File

@ -45,8 +45,6 @@ include $(DEPTH)/config/autoconf.mk
MODULE = lightning
DIRS = \
../../calendar/lightning \
../../calendar/prototypes/wcap/wcap-enabler \
../../calendar/prototypes/wcap/lightning-wcap \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl
View File

@ -241,5 +241,5 @@ $push_raw_xpis = 0;
# Any extensions that are built can be uploaded to the stage server using these
# config options. Wildcards can be used. These variables are mainly used by
# post-mozilla-rel.pl
@ReleaseExtensions = ('lightning.xpi', 'lightning-wcap.xpi');
@ReleaseExtensions = ('lightning.xpi');
#$ReleaseExtensionSubdir = "" # set to e.g. "xpi"; if not specified, <os>-xpi will be used.

2
mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl
View File

@ -238,7 +238,7 @@ $push_raw_xpis = 0;
# Any extensions that are built can be uploaded to the stage server using these
# config options. Wildcards can be used. These variables are mainly used by
# post-mozilla-rel.pl
@ReleaseExtensions = ('lightning.xpi', 'lightning-wcap.xpi');
@ReleaseExtensions = ('lightning.xpi');
#$ReleaseExtensionSubdir = "" # set to e.g. "xpi"; if not specified, <os>-xpi will be used.
$MacUniversalBinary = 1;

2
mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl
View File

@ -237,5 +237,5 @@ $push_raw_xpis = 0;
# Any extensions that are built can be uploaded to the stage server using these
# config options. Wildcards can be used. These variables are mainly used by
# post-mozilla-rel.pl
@ReleaseExtensions = ('lightning.xpi', 'lightning-wcap.xpi');
@ReleaseExtensions = ('lightning.xpi');
#$ReleaseExtensionSubdir = "" # set to e.g. "xpi"; if not specified, <os>-xpi will be used.