Fixing bug 166433, calendar has no icon in Linux.

calendar/createXPI.sh

@@ -8,14 +8,14 @@ echo "Building Linux xpi..."
 cd linux/components
 chmod 644 *.*
 cd ..
-find components/ resources/ bin/ install.js \( -name CVS -o -name Makefile -o -name makefile.win -o -name Makefile.in -o -name test -o -name .cvsignore \) -prune -o -print | xargs zip calendar_linux.xpi
+find components/ resources/ icons/ install.js \( -name CVS -o -name Makefile -o -name makefile.win -o -name Makefile.in -o -name test -o -name .cvsignore \) -prune -o -print | xargs zip calendar_linux.xpi
 mv calendar_linux.xpi ../
 echo "Done."
 
 #Windows
 echo "Building Windows xpi..."
 cd ../windows
-find components/ resources/ install.js \( -name CVS -o -name Makefile -o -name makefile.win -o -name Makefile.in -o -name test -o -name .cvsignore \) -prune -o -print | xargs zip calendar_windows.xpi
+find components/ resources/ icons/ install.js \( -name CVS -o -name Makefile -o -name makefile.win -o -name Makefile.in -o -name test -o -name .cvsignore \) -prune -o -print | xargs zip calendar_windows.xpi
 mv calendar_windows.xpi ../
 echo "Done."
 cd ..

calendar/install.js

@@ -8,7 +8,7 @@ addDirectory( "resources" );
 
 addDirectory("", "components", getFolder( "Components" ), "" );
 
-addDirectory( "", "bin", getFolder( "Program" ), "" );
+addDirectory( "", "", "icons", getFolder( "Chrome", "icons" ), "", true );
 
 var err = getLastError();
   

calendar/linux/install.js

@@ -1,4 +1,4 @@
-initInstall("Mozilla Calendar", "Mozilla/Calendar", "0.9");
+initInstall("Mozilla Calendar", "Mozilla/Calendar", "0.7");
 
 calendarDir = getFolder("Chrome","calendar");
 
@@ -8,7 +8,7 @@ addDirectory( "resources" );
 
 addDirectory("", "components", getFolder( "Components" ), "" );
 
-addDirectory( "", "bin", getFolder( "Program" ), "" );
+addDirectory( "", "", "icons", getFolder( "Chrome", "icons" ), "", true );
 
 var err = getLastError();
   
@@ -26,10 +26,14 @@ if ( err == SUCCESS ) {
    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);

calendar/resources/content/about.html

@@ -78,7 +78,7 @@ h1 {
 
 <td id="mozver">
 <h1>
-<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2002112809-cal</a>
+<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2003010710-cal</a>
 </h1>
 <script type="application/x-javascript">
   // using try..catch to handle empty useragents and other cases where the regex fails to apply

calendar/windows/install.js

@@ -1,4 +1,4 @@
-initInstall("Mozilla Calendar", "Mozilla/Calendar", "0.9");
+initInstall("Mozilla Calendar", "Mozilla/Calendar", "0.7");
 
 calendarDir = getFolder("Chrome","calendar");
 
@@ -8,6 +8,8 @@ addDirectory( "resources" );
 
 addDirectory("", "components", getFolder( "Components" ), "" );
 
+addDirectory( "", "", "icons", getFolder( "Chrome", "icons" ), "", true );
+
 var err = getLastError();
   
 if ( err == SUCCESS ) { 
@@ -24,13 +26,12 @@ if ( err == SUCCESS ) {
    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 exit quick launch and restart your browser to continue.");
+      alert("The Mozilla Calendar has been installed. \n You must restart your browser to continue.");
    }
    
    else {