diff --git a/mozilla/calendar/lightning/content/lightning-scripts.inc b/mozilla/calendar/lightning/content/lightning-scripts.inc
index 8a64fd8097b..c1e5efdbfe8 100755
--- a/mozilla/calendar/lightning/content/lightning-scripts.inc
+++ b/mozilla/calendar/lightning/content/lightning-scripts.inc
@@ -46,6 +46,7 @@
+
diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
index 3e3bc30709d..0a34ea52687 100644
--- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
+++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js
@@ -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);
diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
index dff2a7884ef..492a77f4435 100644
--- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -50,6 +50,7 @@
%dtd1;
%dtd2;
%dtd3;
+ %dtd4;
%messengerDTD;
]>
@@ -481,6 +482,10 @@
collapsable="true"
persist="collapsed"/>
+
diff --git a/mozilla/calendar/lightning/jar.mn b/mozilla/calendar/lightning/jar.mn
index 83d1bcd221a..896ad5877d4 100644
--- a/mozilla/calendar/lightning/jar.mn
+++ b/mozilla/calendar/lightning/jar.mn
@@ -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)
diff --git a/mozilla/calendar/prototypes/wcap/lightning-wcap/Makefile.in b/mozilla/calendar/prototypes/wcap/lightning-wcap/Makefile.in
deleted file mode 100644
index 683ec2e5d71..00000000000
--- a/mozilla/calendar/prototypes/wcap/lightning-wcap/Makefile.in
+++ /dev/null
@@ -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
-# Daniel Boelzle
-#
-# 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)
diff --git a/mozilla/calendar/prototypes/wcap/lightning-wcap/install.rdf b/mozilla/calendar/prototypes/wcap/lightning-wcap/install.rdf
deleted file mode 100644
index 744dd2cb4cb..00000000000
--- a/mozilla/calendar/prototypes/wcap/lightning-wcap/install.rdf
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#filter substitution
-
-
-
- 32
- lightning-wcap@calendar.mozilla.org
- @LIGHTNING_VERSION@
-
-
-
- {3550f703-e582-4d05-9a08-453d09bdfdc6}
-#ifdef MOZILLA_1_8_BRANCH
- 2.0
- 2.0.0.*
-#else
- @THUNDERBIRD_VERSION@
- @THUNDERBIRD_VERSION@
-#endif
-
-
- Lightning with WCAP
- A calendar for Thunderbird with support for the Sun Java System Calendar Server (WCAP).
- @TARGET_PLATFORM@
- Mozilla Calendar Project
- http://www.mozilla.org/projects/calendar/
- chrome://calendar/skin/cal-icon32.png
-
-
diff --git a/mozilla/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.js b/mozilla/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.js
deleted file mode 100644
index e390e69ddf5..00000000000
--- a/mozilla/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.js
+++ /dev/null
@@ -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
- * Philipp Kewisch
- *
- * 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();
diff --git a/mozilla/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.xul b/mozilla/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.xul
deleted file mode 100644
index 79c101c9e46..00000000000
--- a/mozilla/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.xul
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mozilla/calendar/prototypes/wcap/wcap-enabler/Makefile.in b/mozilla/calendar/prototypes/wcap/wcap-enabler/Makefile.in
deleted file mode 100644
index 3914c5d844c..00000000000
--- a/mozilla/calendar/prototypes/wcap/wcap-enabler/Makefile.in
+++ /dev/null
@@ -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
-#
-# 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
diff --git a/mozilla/calendar/prototypes/wcap/wcap-enabler/install.rdf b/mozilla/calendar/prototypes/wcap/wcap-enabler/install.rdf
deleted file mode 100644
index bd955012ae8..00000000000
--- a/mozilla/calendar/prototypes/wcap/wcap-enabler/install.rdf
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#filter substitution
-
-
-
-
-
- {3550f703-e582-4d05-9a08-453d09bdfdc6}
-#ifdef MOZILLA_1_8_BRANCH
- 2.0
- 2.0.0.*
-#else
- @THUNDERBIRD_VERSION@
- @THUNDERBIRD_VERSION@
-#endif
-
-
- wcap-enabler@calendar.mozilla.org
- @LIGHTNING_VERSION@
- WCAP Enabler
- Enables support for the Sun Java System Calendar Server (WCAP) in the Lightning calendar extension.
- Mozilla Calendar Project
- http://www.mozilla.org/projects/calendar/
- chrome://calendar/skin/cal-icon32.png
-
-
diff --git a/mozilla/calendar/prototypes/wcap/wcap-enabler/wcap-enabler.js b/mozilla/calendar/prototypes/wcap/wcap-enabler/wcap-enabler.js
deleted file mode 100644
index a75f6f74592..00000000000
--- a/mozilla/calendar/prototypes/wcap/wcap-enabler/wcap-enabler.js
+++ /dev/null
@@ -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
- *
- * 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);
diff --git a/mozilla/calendar/resources/content/calendarCreation.js b/mozilla/calendar/resources/content/calendarCreation.js
index e9bd41ca7cf..758b016af90 100644
--- a/mozilla/calendar/resources/content/calendarCreation.js
+++ b/mozilla/calendar/resources/content/calendarCreation.js
@@ -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();
}
diff --git a/mozilla/calendar/sunbird/app/profile/sunbird.js b/mozilla/calendar/sunbird/app/profile/sunbird.js
index ffd7c71cb11..0bc146e7d60 100644
--- a/mozilla/calendar/sunbird/app/profile/sunbird.js
+++ b/mozilla/calendar/sunbird/app/profile/sunbird.js
@@ -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", "");
diff --git a/mozilla/extensions/lightning/Makefile.in b/mozilla/extensions/lightning/Makefile.in
index 71c6950e236..f08990d742c 100644
--- a/mozilla/extensions/lightning/Makefile.in
+++ b/mozilla/extensions/lightning/Makefile.in
@@ -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
diff --git a/mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl
index f2decdfbfcc..1a42b001fc7 100644
--- a/mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl
@@ -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, -xpi will be used.
diff --git a/mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl b/mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl
index 48bc285370a..1396d89584a 100755
--- a/mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl
@@ -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, -xpi will be used.
$MacUniversalBinary = 1;
diff --git a/mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl b/mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl
index 8ff588205a5..c971a8dcbb3 100644
--- a/mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl
@@ -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, -xpi will be used.