From cbfd5886fb8cb63fa76b9baf04f93b3e2d153b2d Mon Sep 17 00:00:00 2001
From: "mvl%exedo.nl" <mvl%exedo.nl@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 3 May 2005 12:47:00 +0000
Subject: [PATCH] port the fix for bug 285014 to sunbird, to have calendar
 management there too.

git-svn-id: svn://10.0.0.236/trunk@172988 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../sunbird/base/content/calendar-scripts.inc |  2 +-
 .../sunbird/base/content/calendar.xul         | 27 +++----------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/mozilla/calendar/sunbird/base/content/calendar-scripts.inc b/mozilla/calendar/sunbird/base/content/calendar-scripts.inc
index 7ba9f52360d..f61890ad8f7 100644
--- a/mozilla/calendar/sunbird/base/content/calendar-scripts.inc
+++ b/mozilla/calendar/sunbird/base/content/calendar-scripts.inc
@@ -57,7 +57,7 @@
   <script type="application/x-javascript" src="chrome://calendar/content/dragDrop.js"/>
 
   <!-- NEEDED FOR MULTIPLE CALENDAR SUPPORT -->
-  <script type="application/x-javascript" src="chrome://calendar/content/calendarManager.js"/>
+  <script type="application/x-javascript" src="chrome://calendar/content/calendarManagement.js"/>
 
   <!-- NEEDED FOR CLIPBOARD SUPPORT -->
   <script type="application/x-javascript" src="chrome://calendar/content/clipboard.js"/>
diff --git a/mozilla/calendar/sunbird/base/content/calendar.xul b/mozilla/calendar/sunbird/base/content/calendar.xul
index 7bb56c3018a..5e7bde5a54a 100644
--- a/mozilla/calendar/sunbird/base/content/calendar.xul
+++ b/mozilla/calendar/sunbird/base/content/calendar.xul
@@ -451,33 +451,12 @@
           <tabpanel>
             <!--<vbox id="left-hand-above-splitter" flex="1">-->
             <listbox id="list-calendars-listbox" class="unifinder-tree-class" flex="1" 
-                     contextmenu="calendarlist-context-menu" datasources="rdf:null" ref="urn:calendarcontainer">
-              <listhead>
-                <listheader flex="1" crop="end" label="&calendar.calendarlistbox.label;"/>
-                <listheader/>
-              </listhead>
+                     contextmenu="calendarlist-context-menu">
               <listcols>
-                <listcol flex="1"/>
                 <listcol/>
+                <listcol/>
+                <listcol flex="1"/>
               </listcols>
-              <template>
-                <rule>   
-                  <listitem uri="rdf:*" 
-                            calendarPath="rdf:http://home.netscape.com/NC-rdf#path"
-                            onclick="switchCalendar( event );">
-                    <listcell class="calendar-list-item-class"
-                              label="rdf:http://home.netscape.com/NC-rdf#name"
-                              flex="1"
-                              type="checkbox"
-                              checked="rdf:http://home.netscape.com/NC-rdf#active"/>
-                    <!-- If you add something between the above listcell and this listcell,
-                         or between the next listcell and the image tag, you have to modify calendarManager.js -->
-                    <listcell>
-                      <image class="calendar-list-item-class"/>
-                    </listcell>
-                  </listitem>
-                </rule>
-              </template>
             </listbox>
             <!--</vbox>-->
           </tabpanel>