Skip to content

Commit dbfc86b

Browse files
author
Ludovic Marcotte
committed
(fix) added missing XUL from previous commit and dropped old unused XUL file
1 parent f1361e5 commit dbfc86b

File tree

3 files changed

+5
-87
lines changed

3 files changed

+5
-87
lines changed

chrome.manifest

-4
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome:
6868
# Name of current calendar in title in the invitations list
6969
overlay chrome://calendar/content/calendar-invitations-dialog.xul chrome://sogo-connector/content/calendar/calendar-invitations-dialog.xul
7070

71-
# autocomplete in delegation dialog
72-
# REMOVE??
73-
# overlay chrome://lightning/content/imip-delegate-dialog.xul chrome://sogo-connector/content/lightning/imip-delegate-dialog.xul
74-
7571
# Preferences overlay. Display > Contact Catogries and default classifications in Calendar > General
7672
overlay about:preferences chrome://sogo-connector/content/preferences/preferences-overlay.xul
7773

Original file line numberDiff line numberDiff line change
@@ -1,81 +1,9 @@
11
<?xml version="1.0"?>
2-
<!-- ***** BEGIN LICENSE BLOCK *****
3-
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
4-
-
5-
- The contents of this file are subject to the Mozilla Public License Version
6-
- 1.1 (the "License"); you may not use this file except in compliance with
7-
- the License. You may obtain a copy of the License at
8-
- http://www.mozilla.org/MPL/
9-
-
10-
- Software distributed under the License is distributed on an "AS IS" basis,
11-
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
12-
- for the specific language governing rights and limitations under the
13-
- License.
14-
-
15-
- The Original Code is Sun Microsystems code.
16-
-
17-
- The Initial Developer of the Original Code is Sun Microsystems.
18-
- Portions created by the Initial Developer are Copyright (C) 2006
19-
- the Initial Developer. All Rights Reserved.
20-
-
21-
- Contributor(s):
22-
- Thomas Benisch <[email protected]>
23-
-
24-
- Alternatively, the contents of this file may be used under the terms of
25-
- either the GNU General Public License Version 2 or later (the "GPL"), or
26-
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27-
- in which case the provisions of the GPL or the LGPL are applicable instead
28-
- of those above. If you wish to allow use of your version of this file only
29-
- under the terms of either the GPL or the LGPL, and not to allow others to
30-
- use your version of this file under the terms of the MPL, indicate your
31-
- decision by deleting the provisions above and replace them with the notice
32-
- and other provisions required by the GPL or the LGPL. If you do not delete
33-
- the provisions above, a recipient may use your version of this file under
34-
- the terms of any one of the MPL, the GPL or the LGPL.
35-
-
36-
- ***** END LICENSE BLOCK ***** -->
372

38-
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
39-
<?xml-stylesheet href="chrome://sogo-connector/content/calendar/calendar-invitations-dialog.css" type="text/css"?>
40-
<?xml-stylesheet href="chrome://calendar/skin/calendar-invitations-dialog.css" type="text/css"?>
41-
42-
<!DOCTYPE dialog [
43-
<!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar-invitations-dialog.dtd" > %dtd1;
44-
]>
45-
46-
<dialog
47-
id="calendar-invitations-dialog"
48-
title="&calendar.invitations.dialog.invitations.text;"
49-
buttons="accept,cancel"
50-
ondialogaccept="return onAccept();"
51-
ondialogcancel="return onCancel();"
52-
onload="return onLoad();"
53-
onunload="return onUnload();"
54-
persist="screenX screenY width height"
55-
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
3+
<overlay id="SOGoConnectorCalendarInvitationsDialog"
4+
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
565

576
<!-- Javascript includes -->
58-
<script type="application/x-javascript" src="chrome://calendar/content/calendar-invitations-dialog.js"/>
59-
<script type="application/x-javascript" src="chrome://calendar/content/calUtils.js"/>
60-
<script type="application/x-javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
61-
<script type="application/x-javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
62-
63-
<script type="application/x-javascript" >
64-
var invitationsText = "&calendar.invitations.dialog.invitations.text;";
65-
</script>
66-
67-
<vbox id="dialog-box" flex="1">
68-
<stack flex="1">
69-
<calendar-invitations-richlistbox id="invitations-listbox" flex="1"/>
70-
<hbox id="updating-box" align="center" pack="center" hidden="true">
71-
<label value="&calendar.invitations.dialog.statusmessage.updating.text;"
72-
crop="end"/>
73-
<image class="calendar-invitations-updating-icon"/>
74-
</hbox>
75-
<hbox id="noinvitations-box" align="center" pack="center" hidden="true">
76-
<label value="&calendar.invitations.dialog.statusmessage.noinvitations.text;"
77-
crop="end"/>
78-
</hbox>
79-
</stack>
80-
</vbox>
81-
</dialog>
7+
<script type="application/x-javascript" src="chrome://sogo-connector/content/calendar/calendar-invitations-dialog.js"/>
8+
9+
</overlay>

chrome/content/sogo-connector/lightning/imip-delegate-dialog.xul

-6
This file was deleted.

0 commit comments

Comments
 (0)