From 30d5e5887219c633b5fd5108af4d7fc6ea958da7 Mon Sep 17 00:00:00 2001
From: "mikep%oeone.com" <mikep%oeone.com>
Date: Tue, 5 Mar 2002 14:03:26 +0000
Subject: [PATCH] Fixing bug 128822.

---
 calendar/install.js                            | 18 ++++++++++++++----
 calendar/resources/content/calendar.xul        |  2 ++
 .../resources/content/unifinder/unifinder.js   | 14 ++++++++++++--
 calendar/resources/locale/en-US/calendar.dtd   |  2 ++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/calendar/install.js b/calendar/install.js
index 00c49e770259..0abdb3e43071 100644
--- a/calendar/install.js
+++ b/calendar/install.js
@@ -8,21 +8,31 @@ addDirectory( "resources" );
 
 addDirectory("", "components", getFolder( "Components" ), "" );
 
+addDirectory( "", "bin", getFolder( "Program" ), "" );
+
 var err = getLastError();
   
 if ( err == SUCCESS ) { 
   
-   registerChrome(CONTENT, calendarDir, "content");
-   registerChrome(SKIN,    calendarDir, "skin/modern");
-   registerChrome(LOCALE,  calendarDir, "locale/en-US");
+   var calendarContent = getFolder(calendarDir, "content");
+   var calendarSkin    = getFolder(calendarDir, "skin");
+   var calendarLocale  = getFolder(calendarDir, "locale");
 
+   var returnval = registerChrome(CONTENT | DELAYED_CHROME, calendarContent );
+   var returnval = registerChrome(SKIN | DELAYED_CHROME, calendarSkin, "modern/");
+   var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "en-US/");
+  
    err = performInstall();
   
    if ( err == SUCCESS ) {
-      refreshPlugins();
       alert("The Mozilla Calendar has been succesfully installed. \n"
       +"Please restart your browser to continue.");
    }
+   else if( err == "999" )
+   {
+      alert("The Mozilla Calendar has been installed. \n You must restart your browser to continue.");
+   }
+   
    else { 
     alert("performInstall() failed. \n"
     +"_____________________________\nError code:" + err);
diff --git a/calendar/resources/content/calendar.xul b/calendar/resources/content/calendar.xul
index a9f75b002d0e..55be52f64a23 100644
--- a/calendar/resources/content/calendar.xul
+++ b/calendar/resources/content/calendar.xul
@@ -22,6 +22,7 @@
    - Contributor(s): Garth Smedley <garths@oeone.com> 
    -                 Mike Potter <mikep@oeone.com>
    -                 Colin Phillips <colinp@oeone.com>
+   -                 Chris Charabaruk <coldacid@meldstar.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
@@ -82,6 +83,7 @@
 <!-- Javascript DTD To Variable -->
 <script type="application/x-javascript">
   var confirmDeleteEvent = "&calendar.confirm.deleteevent;";
+  var confirmDeleteUntitledEvent = "&calendar.confirm.deleteuntitledevent;";
 </script>
 
 <!-- Javascript includes -->
diff --git a/calendar/resources/content/unifinder/unifinder.js b/calendar/resources/content/unifinder/unifinder.js
index 0aac724494a8..8626bead0ef7 100644
--- a/calendar/resources/content/unifinder/unifinder.js
+++ b/calendar/resources/content/unifinder/unifinder.js
@@ -20,6 +20,7 @@
  *
  * Contributor(s): Garth Smedley <garths@oeone.com>
  *                 Mike Potter <mikep@oeone.com>
+ *                 Chris Charabaruk <coldacid@meldstar.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
@@ -318,8 +319,17 @@ function unifinderRemoveCommand()
          
             if( calendarEvent != null )
             {
-               if ( confirm( confirmDeleteEvent+" "+calendarEvent.title+"?" ) ) {
-                  gICalLib.deleteEvent( calendarEvent.id );
+               if ( calendarEvent.title != "" )
+               {
+                  if ( confirm( confirmDeleteEvent+" "+calendarEvent.title+"?" ) ) {
+                     gICalLib.deleteEvent( calendarEvent.id );
+                  }
+               }
+               else
+               {
+                  if ( confirm( confirmDeleteUntitledEvent ) ) {
+                     gICalLib.deleteEvent( calendarEvent.id );
+                  }
                }
             }
          }
diff --git a/calendar/resources/locale/en-US/calendar.dtd b/calendar/resources/locale/en-US/calendar.dtd
index bd1f5b124066..2683a70f4c63 100644
--- a/calendar/resources/locale/en-US/calendar.dtd
+++ b/calendar/resources/locale/en-US/calendar.dtd
@@ -20,6 +20,7 @@
    -
    - Contributor(s): Garth Smedley <garths@oeone.com> 
    -                 Mike Potter <mikep@oeone.com>
+   -                 Chris Charabaruk <coldacid@meldstar.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
@@ -79,6 +80,7 @@
 <!ENTITY newevent.starttimeerror.alertmessage "Your event cannot end before it has started. Please fix either the start time or the end time." >        
 <!ENTITY newevent.recurendtimeerror.alertmessage "Your event's repeat time cannot be before the event end time. Please fix this, or disable repeating." >
 <!ENTITY calendar.confirm.deleteevent "Are you sure you want to delete this event titled: " >        
+<!ENTITY calendar.confirm.deleteuntitledevent "Are you sure you want to delete this untitled event?" >
 
 <!ENTITY event.alarm.checkbox.label "Remind me again in " >