From 73d9a4ed8f145043dc8614bdfb3819aa8c625998 Mon Sep 17 00:00:00 2001
From: "spider%netscape.com" <spider%netscape.com>
Date: Mon, 21 Sep 1998 17:27:21 +0000
Subject: [PATCH] Moving images to subdirectory off of XML ui description files

---
 calendar/modules/core/src/config.mk           |   7 +--
 calendar/modules/network/capi/config.mk       |   7 +--
 .../modules/network/capi/local/src/config.mk  |   7 +--
 calendar/modules/network/config.mk            |   9 +--
 calendar/modules/parser/calxml/res/julian.cal |  18 +++---
 .../parser/calxml/res/julian_cal_html.cal     |  18 +++---
 .../parser/calxml/res/julian_folders.cal      |  18 +++---
 .../modules/parser/calxml/res/julianht.cal    |  18 +++---
 calendar/modules/parser/config.mk             |   7 +--
 calendar/modules/shell/src/config.mk          |   7 +--
 calendar/modules/test/src/config.mk           |   7 +--
 calendar/modules/ui/config.mk                 |   7 +--
 calendar/modules/ui/res/demo/julian3.cal      |  18 +++---
 calendar/modules/ui/res/images/Makefile       |  53 +++++++++++++++++
 .../ui/res/{ => images}/addrbook_full.gif     | Bin
 .../ui/res/{ => images}/agenda_full.gif       | Bin
 .../ui/res/{ => images}/agenda_hover_full.gif | Bin
 .../ui/res/{ => images}/agenda_mini.gif       | Bin
 .../res/{ => images}/agenda_pressed_full.gif  | Bin
 .../ui/res/{ => images}/browser_full.gif      | Bin
 .../modules/ui/res/{ => images}/day_full.gif  | Bin
 .../ui/res/{ => images}/day_hover_full.gif    | Bin
 .../ui/res/{ => images}/day_pressed_full.gif  | Bin
 .../modules/ui/res/{ => images}/image.jpg     | Bin
 .../ui/res/{ => images}/inbox_full.gif        | Bin
 .../ui/res/{ => images}/intray_full.gif       | Bin
 .../ui/res/{ => images}/intray_hover_full.gif | Bin
 .../res/{ => images}/intray_pressed_full.gif  | Bin
 .../modules/ui/res/{ => images}/mail_full.gif | Bin
 calendar/modules/ui/res/images/manifest.mn    |  56 ++++++++++++++++++
 .../ui/res/{ => images}/month_full.gif        | Bin
 .../ui/res/{ => images}/month_hover_full.gif  | Bin
 .../res/{ => images}/month_pressed_full.gif   | Bin
 .../ui/res/{ => images}/newentry_full.gif     | Bin
 .../res/{ => images}/newentry_hover_full.gif  | Bin
 .../{ => images}/newentry_pressed_full.gif    | Bin
 .../ui/res/{ => images}/newtask_full.gif      | Bin
 .../res/{ => images}/newtask_hover_full.gif   | Bin
 .../res/{ => images}/newtask_pressed_full.gif | Bin
 .../ui/res/{ => images}/outbox_full.gif       | Bin
 .../ui/res/{ => images}/portal_full.gif       | Bin
 .../ui/res/{ => images}/print_full.gif        | Bin
 .../ui/res/{ => images}/print_hover_full.gif  | Bin
 .../res/{ => images}/print_pressed_full.gif   | Bin
 .../modules/ui/res/{ => images}/sent_full.gif | Bin
 .../ui/res/{ => images}/tasks_full.gif        | Bin
 .../ui/res/{ => images}/tasks_hover_full.gif  | Bin
 .../res/{ => images}/tasks_pressed_full.gif   | Bin
 .../ui/res/{ => images}/trash_full.gif        | Bin
 .../modules/ui/res/{ => images}/trex_full.gif | Bin
 .../modules/ui/res/{ => images}/week_full.gif | Bin
 .../ui/res/{ => images}/week_hover_full.gif   | Bin
 .../ui/res/{ => images}/week_pressed_full.gif | Bin
 calendar/modules/ui/res/manifest.mn           |  40 +------------
 calendar/modules/ui/res/toolbar.ui            |  18 +++---
 calendar/modules/util/src/config.mk           |   7 +--
 56 files changed, 174 insertions(+), 148 deletions(-)
 create mode 100644 calendar/modules/ui/res/images/Makefile
 rename calendar/modules/ui/res/{ => images}/addrbook_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/agenda_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/agenda_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/agenda_mini.gif (100%)
 rename calendar/modules/ui/res/{ => images}/agenda_pressed_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/browser_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/day_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/day_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/day_pressed_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/image.jpg (100%)
 rename calendar/modules/ui/res/{ => images}/inbox_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/intray_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/intray_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/intray_pressed_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/mail_full.gif (100%)
 create mode 100644 calendar/modules/ui/res/images/manifest.mn
 rename calendar/modules/ui/res/{ => images}/month_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/month_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/month_pressed_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/newentry_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/newentry_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/newentry_pressed_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/newtask_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/newtask_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/newtask_pressed_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/outbox_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/portal_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/print_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/print_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/print_pressed_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/sent_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/tasks_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/tasks_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/tasks_pressed_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/trash_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/trex_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/week_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/week_hover_full.gif (100%)
 rename calendar/modules/ui/res/{ => images}/week_pressed_full.gif (100%)

diff --git a/calendar/modules/core/src/config.mk b/calendar/modules/core/src/config.mk
index 488bb65aa62f..927b6fc756b5 100644
--- a/calendar/modules/core/src/config.mk
+++ b/calendar/modules/core/src/config.mk
@@ -20,12 +20,7 @@ LD_LIBS += \
 	raptorhtmlpars \
 	$(NATIVE_JULIAN_DLL) \
 	xpcom$(MOZ_BITS) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
+    $(NATIVE_LIBNLS_LIBS) \
 	$(NATIVE_RAPTOR_WIDGET) \
 	calcapi10 \
 	util10  \
diff --git a/calendar/modules/network/capi/config.mk b/calendar/modules/network/capi/config.mk
index 49a5b0d632d3..da311865cf6f 100644
--- a/calendar/modules/network/capi/config.mk
+++ b/calendar/modules/network/capi/config.mk
@@ -20,12 +20,7 @@ LD_LIBS += \
 	$(NATIVE_RAPTOR_WIDGET) \
 	$(NATIVE_JULIAN_DLL) \
 	xpcom$(MOZ_BITS) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
+    $(NATIVE_LIBNLS_LIBS) \
     util10	\
 	$(XP_REG_LIB)
 
diff --git a/calendar/modules/network/capi/local/src/config.mk b/calendar/modules/network/capi/local/src/config.mk
index cdd8d0bb4f6a..b372cbf9d184 100644
--- a/calendar/modules/network/capi/local/src/config.mk
+++ b/calendar/modules/network/capi/local/src/config.mk
@@ -19,12 +19,7 @@ INCLUDES       += -I../inc -I$(GDEPTH)/include
 
 LD_LIBS += \
 	$(NATIVE_JULIAN_DLL) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
+    $(NATIVE_LIBNLS_LIBS) \
     util10
 
 EXTRA_LIBS += $(NSPR_LIBS)
diff --git a/calendar/modules/network/config.mk b/calendar/modules/network/config.mk
index 8e976be503ea..75532c2a9888 100644
--- a/calendar/modules/network/config.mk
+++ b/calendar/modules/network/config.mk
@@ -20,13 +20,8 @@ LD_LIBS += \
 	$(NATIVE_RAPTOR_WIDGET) \
 	$(NATIVE_JULIAN_DLL) \
 	xpcom$(MOZ_BITS) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
-        util10	\
+    $(NATIVE_LIBNLS_LIBS) \
+    util10	\
 	$(XP_REG_LIB)
 
 AR_LIBS += \
diff --git a/calendar/modules/parser/calxml/res/julian.cal b/calendar/modules/parser/calxml/res/julian.cal
index 038780505194..1415d92f16ad 100644
--- a/calendar/modules/parser/calxml/res/julian.cal
+++ b/calendar/modules/parser/calxml/res/julian.cal
@@ -13,15 +13,15 @@
 <panel name="FolderViewRule"> 
   <object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
   <foldercanvas >
-	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/trex_full.gif" />
-	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/inbox_full.gif" />
-	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/outbox_full.gif" />
-	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/sent_full.gif" />
-	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/trash_full.gif" />
-	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/portal_full.gif" />
-	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/mail_full.gif" />
-	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/browser_full.gif" />
-	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/addrbook_full.gif" />
+	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
+	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
+	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
+	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
+	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
+	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
+	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
+	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
+	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
   </foldercanvas>
 </panel> 
 
diff --git a/calendar/modules/parser/calxml/res/julian_cal_html.cal b/calendar/modules/parser/calxml/res/julian_cal_html.cal
index 2a43ecfb4097..ee3352567188 100644
--- a/calendar/modules/parser/calxml/res/julian_cal_html.cal
+++ b/calendar/modules/parser/calxml/res/julian_cal_html.cal
@@ -13,15 +13,15 @@
 <panel name="FolderViewRule"> 
   <object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
   <foldercanvas >
-	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/trex_full.gif" />
-	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/inbox_full.gif" />
-	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/outbox_full.gif" />
-	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/sent_full.gif" />
-	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/trash_full.gif" />
-	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/portal_full.gif" />
-	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/mail_full.gif" />
-	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/browser_full.gif" />
-	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/addrbook_full.gif" />
+	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
+	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
+	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
+	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
+	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
+	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
+	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
+	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
+	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
   </foldercanvas>
 </panel> 
 
diff --git a/calendar/modules/parser/calxml/res/julian_folders.cal b/calendar/modules/parser/calxml/res/julian_folders.cal
index c505387f992f..b939db8043d3 100644
--- a/calendar/modules/parser/calxml/res/julian_folders.cal
+++ b/calendar/modules/parser/calxml/res/julian_folders.cal
@@ -13,15 +13,15 @@
 <panel name="FolderViewRule"> 
   <object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
   <foldercanvas >
-	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/trex_full.gif" />
-	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/inbox_full.gif" />
-	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/outbox_full.gif" />
-	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/sent_full.gif" />
-	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/trash_full.gif" />
-	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/portal_full.gif" />
-	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/mail_full.gif" />
-	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/browser_full.gif" />
-	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/addrbook_full.gif" />
+	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
+	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
+	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
+	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
+	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
+	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
+	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
+	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
+	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
   </foldercanvas>
 </panel> 
 
diff --git a/calendar/modules/parser/calxml/res/julianht.cal b/calendar/modules/parser/calxml/res/julianht.cal
index be146cbd6d45..d3fd753bf839 100644
--- a/calendar/modules/parser/calxml/res/julianht.cal
+++ b/calendar/modules/parser/calxml/res/julianht.cal
@@ -17,15 +17,15 @@
 <panel name="FolderViewRule"> 
   <object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
   <foldercanvas >
-	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/trex_full.gif" />
-	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/inbox_full.gif" />
-	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/outbox_full.gif" />
-	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/sent_full.gif" />
-	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/trash_full.gif" />
-	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/portal_full.gif" />
-	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/mail_full.gif" />
-	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/browser_full.gif" />
-	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/addrbook_full.gif" />
+	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
+	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
+	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
+	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
+	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
+	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
+	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
+	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
+	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
   </foldercanvas>
 </panel> 
 
diff --git a/calendar/modules/parser/config.mk b/calendar/modules/parser/config.mk
index 2814471920ba..8a492fb0bbe6 100644
--- a/calendar/modules/parser/config.mk
+++ b/calendar/modules/parser/config.mk
@@ -20,12 +20,7 @@ LD_LIBS += \
 	raptorhtmlpars \
 	$(NATIVE_JULIAN_DLL) \
 	xpcom$(MOZ_BITS) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
+    $(NATIVE_LIBNLS_LIBS) \
 	$(NATIVE_RAPTOR_WIDGET) \
 	xpcom$(MOZ_BITS) \
 	$(XP_REG_LIB)
diff --git a/calendar/modules/shell/src/config.mk b/calendar/modules/shell/src/config.mk
index c98b70c6630c..c2666d8fab98 100644
--- a/calendar/modules/shell/src/config.mk
+++ b/calendar/modules/shell/src/config.mk
@@ -50,12 +50,7 @@ LD_LIBS += \
 	$(NATIVE_ZLIB_DLL) \
 	$(NATIVE_XP_DLL) \
 	$(NATIVE_JULIAN_DLL) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
+    $(NATIVE_LIBNLS_LIBS) \
 	xpcom$(MOZ_BITS) \
 	util10 \
 	calcore10 \
diff --git a/calendar/modules/test/src/config.mk b/calendar/modules/test/src/config.mk
index 160fcfa0ae12..2932e22b835b 100644
--- a/calendar/modules/test/src/config.mk
+++ b/calendar/modules/test/src/config.mk
@@ -43,12 +43,7 @@ LD_LIBS += \
 	xpfc10 \
 	$(NATIVE_RAPTOR_WIDGET) \
 	$(NATIVE_JULIAN_DLL) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
+    $(NATIVE_LIBNLS_LIBS) \
 	$(NATIVE_RAPTOR_GFX) \
 	$(RAPTOR_GFX) \
 	$(NATIVE_JULIAN_DLL) \
diff --git a/calendar/modules/ui/config.mk b/calendar/modules/ui/config.mk
index 169442785097..1a5bb770e422 100644
--- a/calendar/modules/ui/config.mk
+++ b/calendar/modules/ui/config.mk
@@ -21,12 +21,7 @@ LD_LIBS += \
 	$(NATIVE_RAPTOR_WIDGET) \
 	$(NATIVE_JULIAN_DLL) \
 	xpcom$(MOZ_BITS) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
+    $(NATIVE_LIBNLS_LIBS) \
     xpfc10 \
     calcore10 \
 	$(XP_REG_LIB)
diff --git a/calendar/modules/ui/res/demo/julian3.cal b/calendar/modules/ui/res/demo/julian3.cal
index 038780505194..1415d92f16ad 100644
--- a/calendar/modules/ui/res/demo/julian3.cal
+++ b/calendar/modules/ui/res/demo/julian3.cal
@@ -13,15 +13,15 @@
 <panel name="FolderViewRule"> 
   <object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
   <foldercanvas >
-	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/trex_full.gif" />
-	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/inbox_full.gif" />
-	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/outbox_full.gif" />
-	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/sent_full.gif" />
-	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/trash_full.gif" />
-	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/portal_full.gif" />
-	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/mail_full.gif" />
-	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/browser_full.gif" />
-	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/addrbook_full.gif" />
+	<xpitem label="Trex"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
+	<xpitem label="Inbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
+	<xpitem label="Outbox"			halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
+	<xpitem label="Sent"			halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
+	<xpitem label="Trash"			halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
+	<xpitem label="Portal"			halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
+	<xpitem label="Mail"			halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
+	<xpitem label="Browser"			halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
+	<xpitem label="Address Book"	halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
   </foldercanvas>
 </panel> 
 
diff --git a/calendar/modules/ui/res/images/Makefile b/calendar/modules/ui/res/images/Makefile
new file mode 100644
index 000000000000..61267ebf4158
--- /dev/null
+++ b/calendar/modules/ui/res/images/Makefile
@@ -0,0 +1,53 @@
+#! gmake
+#
+#           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+#              NETSCAPE COMMUNICATIONS CORPORATION
+# Copyright © 1996, 1997 Netscape Communications Corporation.  All Rights
+# Reserved.  Use of this Source Code is subject to the terms of the
+# applicable license agreement from Netscape Communications Corporation.
+# The copyright notice(s) in this Source Code does not indicate actual or
+# intended publication of this Source Code.
+#
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY).   #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL)          #
+#######################################################################
+
+include $(GDEPTH)/gconfig/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL)       #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
+
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL)                              #
+#######################################################################
+
+include $(GDEPTH)/gconfig/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL)                           #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL).                              #
+#######################################################################
+
+
+
diff --git a/calendar/modules/ui/res/addrbook_full.gif b/calendar/modules/ui/res/images/addrbook_full.gif
similarity index 100%
rename from calendar/modules/ui/res/addrbook_full.gif
rename to calendar/modules/ui/res/images/addrbook_full.gif
diff --git a/calendar/modules/ui/res/agenda_full.gif b/calendar/modules/ui/res/images/agenda_full.gif
similarity index 100%
rename from calendar/modules/ui/res/agenda_full.gif
rename to calendar/modules/ui/res/images/agenda_full.gif
diff --git a/calendar/modules/ui/res/agenda_hover_full.gif b/calendar/modules/ui/res/images/agenda_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/agenda_hover_full.gif
rename to calendar/modules/ui/res/images/agenda_hover_full.gif
diff --git a/calendar/modules/ui/res/agenda_mini.gif b/calendar/modules/ui/res/images/agenda_mini.gif
similarity index 100%
rename from calendar/modules/ui/res/agenda_mini.gif
rename to calendar/modules/ui/res/images/agenda_mini.gif
diff --git a/calendar/modules/ui/res/agenda_pressed_full.gif b/calendar/modules/ui/res/images/agenda_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/agenda_pressed_full.gif
rename to calendar/modules/ui/res/images/agenda_pressed_full.gif
diff --git a/calendar/modules/ui/res/browser_full.gif b/calendar/modules/ui/res/images/browser_full.gif
similarity index 100%
rename from calendar/modules/ui/res/browser_full.gif
rename to calendar/modules/ui/res/images/browser_full.gif
diff --git a/calendar/modules/ui/res/day_full.gif b/calendar/modules/ui/res/images/day_full.gif
similarity index 100%
rename from calendar/modules/ui/res/day_full.gif
rename to calendar/modules/ui/res/images/day_full.gif
diff --git a/calendar/modules/ui/res/day_hover_full.gif b/calendar/modules/ui/res/images/day_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/day_hover_full.gif
rename to calendar/modules/ui/res/images/day_hover_full.gif
diff --git a/calendar/modules/ui/res/day_pressed_full.gif b/calendar/modules/ui/res/images/day_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/day_pressed_full.gif
rename to calendar/modules/ui/res/images/day_pressed_full.gif
diff --git a/calendar/modules/ui/res/image.jpg b/calendar/modules/ui/res/images/image.jpg
similarity index 100%
rename from calendar/modules/ui/res/image.jpg
rename to calendar/modules/ui/res/images/image.jpg
diff --git a/calendar/modules/ui/res/inbox_full.gif b/calendar/modules/ui/res/images/inbox_full.gif
similarity index 100%
rename from calendar/modules/ui/res/inbox_full.gif
rename to calendar/modules/ui/res/images/inbox_full.gif
diff --git a/calendar/modules/ui/res/intray_full.gif b/calendar/modules/ui/res/images/intray_full.gif
similarity index 100%
rename from calendar/modules/ui/res/intray_full.gif
rename to calendar/modules/ui/res/images/intray_full.gif
diff --git a/calendar/modules/ui/res/intray_hover_full.gif b/calendar/modules/ui/res/images/intray_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/intray_hover_full.gif
rename to calendar/modules/ui/res/images/intray_hover_full.gif
diff --git a/calendar/modules/ui/res/intray_pressed_full.gif b/calendar/modules/ui/res/images/intray_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/intray_pressed_full.gif
rename to calendar/modules/ui/res/images/intray_pressed_full.gif
diff --git a/calendar/modules/ui/res/mail_full.gif b/calendar/modules/ui/res/images/mail_full.gif
similarity index 100%
rename from calendar/modules/ui/res/mail_full.gif
rename to calendar/modules/ui/res/images/mail_full.gif
diff --git a/calendar/modules/ui/res/images/manifest.mn b/calendar/modules/ui/res/images/manifest.mn
new file mode 100644
index 000000000000..9788eaa1fcd1
--- /dev/null
+++ b/calendar/modules/ui/res/images/manifest.mn
@@ -0,0 +1,56 @@
+# 
+#           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+#              NETSCAPE COMMUNICATIONS CORPORATION
+# Copyright (C) 1996 Netscape Communications Corporation.  All Rights
+# Reserved.  Use of this Source Code is subject to the terms of the
+# applicable license agreement from Netscape Communications Corporation.
+# The copyright notice(s) in this Source Code does not indicate actual or
+# intended publication of this Source Code.
+#
+GDEPTH = ../../../../..
+
+DIRS_LIBS = demo
+
+MODULE = trex
+
+REQUIRES = raptor
+
+libs::
+	$(INSTALL) image.jpg $(DIST)/bin/res/ui/images
+	$(INSTALL) agenda_mini.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) agenda_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) agenda_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) agenda_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) intray_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) intray_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) intray_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) tasks_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) tasks_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) tasks_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) day_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) day_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) day_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) week_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) week_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) week_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) month_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) month_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) month_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) newentry_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) newentry_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) newentry_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) newtask_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) newtask_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) newtask_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) print_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) print_hover_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) print_pressed_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) inbox_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) sent_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) outbox_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) trash_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) browser_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) mail_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) addrbook_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) portal_full.gif $(DIST)/bin/res/ui/images
+	$(INSTALL) trex_full.gif $(DIST)/bin/res/ui/images
diff --git a/calendar/modules/ui/res/month_full.gif b/calendar/modules/ui/res/images/month_full.gif
similarity index 100%
rename from calendar/modules/ui/res/month_full.gif
rename to calendar/modules/ui/res/images/month_full.gif
diff --git a/calendar/modules/ui/res/month_hover_full.gif b/calendar/modules/ui/res/images/month_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/month_hover_full.gif
rename to calendar/modules/ui/res/images/month_hover_full.gif
diff --git a/calendar/modules/ui/res/month_pressed_full.gif b/calendar/modules/ui/res/images/month_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/month_pressed_full.gif
rename to calendar/modules/ui/res/images/month_pressed_full.gif
diff --git a/calendar/modules/ui/res/newentry_full.gif b/calendar/modules/ui/res/images/newentry_full.gif
similarity index 100%
rename from calendar/modules/ui/res/newentry_full.gif
rename to calendar/modules/ui/res/images/newentry_full.gif
diff --git a/calendar/modules/ui/res/newentry_hover_full.gif b/calendar/modules/ui/res/images/newentry_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/newentry_hover_full.gif
rename to calendar/modules/ui/res/images/newentry_hover_full.gif
diff --git a/calendar/modules/ui/res/newentry_pressed_full.gif b/calendar/modules/ui/res/images/newentry_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/newentry_pressed_full.gif
rename to calendar/modules/ui/res/images/newentry_pressed_full.gif
diff --git a/calendar/modules/ui/res/newtask_full.gif b/calendar/modules/ui/res/images/newtask_full.gif
similarity index 100%
rename from calendar/modules/ui/res/newtask_full.gif
rename to calendar/modules/ui/res/images/newtask_full.gif
diff --git a/calendar/modules/ui/res/newtask_hover_full.gif b/calendar/modules/ui/res/images/newtask_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/newtask_hover_full.gif
rename to calendar/modules/ui/res/images/newtask_hover_full.gif
diff --git a/calendar/modules/ui/res/newtask_pressed_full.gif b/calendar/modules/ui/res/images/newtask_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/newtask_pressed_full.gif
rename to calendar/modules/ui/res/images/newtask_pressed_full.gif
diff --git a/calendar/modules/ui/res/outbox_full.gif b/calendar/modules/ui/res/images/outbox_full.gif
similarity index 100%
rename from calendar/modules/ui/res/outbox_full.gif
rename to calendar/modules/ui/res/images/outbox_full.gif
diff --git a/calendar/modules/ui/res/portal_full.gif b/calendar/modules/ui/res/images/portal_full.gif
similarity index 100%
rename from calendar/modules/ui/res/portal_full.gif
rename to calendar/modules/ui/res/images/portal_full.gif
diff --git a/calendar/modules/ui/res/print_full.gif b/calendar/modules/ui/res/images/print_full.gif
similarity index 100%
rename from calendar/modules/ui/res/print_full.gif
rename to calendar/modules/ui/res/images/print_full.gif
diff --git a/calendar/modules/ui/res/print_hover_full.gif b/calendar/modules/ui/res/images/print_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/print_hover_full.gif
rename to calendar/modules/ui/res/images/print_hover_full.gif
diff --git a/calendar/modules/ui/res/print_pressed_full.gif b/calendar/modules/ui/res/images/print_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/print_pressed_full.gif
rename to calendar/modules/ui/res/images/print_pressed_full.gif
diff --git a/calendar/modules/ui/res/sent_full.gif b/calendar/modules/ui/res/images/sent_full.gif
similarity index 100%
rename from calendar/modules/ui/res/sent_full.gif
rename to calendar/modules/ui/res/images/sent_full.gif
diff --git a/calendar/modules/ui/res/tasks_full.gif b/calendar/modules/ui/res/images/tasks_full.gif
similarity index 100%
rename from calendar/modules/ui/res/tasks_full.gif
rename to calendar/modules/ui/res/images/tasks_full.gif
diff --git a/calendar/modules/ui/res/tasks_hover_full.gif b/calendar/modules/ui/res/images/tasks_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/tasks_hover_full.gif
rename to calendar/modules/ui/res/images/tasks_hover_full.gif
diff --git a/calendar/modules/ui/res/tasks_pressed_full.gif b/calendar/modules/ui/res/images/tasks_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/tasks_pressed_full.gif
rename to calendar/modules/ui/res/images/tasks_pressed_full.gif
diff --git a/calendar/modules/ui/res/trash_full.gif b/calendar/modules/ui/res/images/trash_full.gif
similarity index 100%
rename from calendar/modules/ui/res/trash_full.gif
rename to calendar/modules/ui/res/images/trash_full.gif
diff --git a/calendar/modules/ui/res/trex_full.gif b/calendar/modules/ui/res/images/trex_full.gif
similarity index 100%
rename from calendar/modules/ui/res/trex_full.gif
rename to calendar/modules/ui/res/images/trex_full.gif
diff --git a/calendar/modules/ui/res/week_full.gif b/calendar/modules/ui/res/images/week_full.gif
similarity index 100%
rename from calendar/modules/ui/res/week_full.gif
rename to calendar/modules/ui/res/images/week_full.gif
diff --git a/calendar/modules/ui/res/week_hover_full.gif b/calendar/modules/ui/res/images/week_hover_full.gif
similarity index 100%
rename from calendar/modules/ui/res/week_hover_full.gif
rename to calendar/modules/ui/res/images/week_hover_full.gif
diff --git a/calendar/modules/ui/res/week_pressed_full.gif b/calendar/modules/ui/res/images/week_pressed_full.gif
similarity index 100%
rename from calendar/modules/ui/res/week_pressed_full.gif
rename to calendar/modules/ui/res/images/week_pressed_full.gif
diff --git a/calendar/modules/ui/res/manifest.mn b/calendar/modules/ui/res/manifest.mn
index 9473777d8bdd..986c6aee6384 100644
--- a/calendar/modules/ui/res/manifest.mn
+++ b/calendar/modules/ui/res/manifest.mn
@@ -9,7 +9,7 @@
 #
 GDEPTH = ../../../..
 
-DIRS_LIBS = demo
+DIRS_LIBS = demo images
 
 MODULE = trex
 
@@ -20,41 +20,3 @@ libs::
 	$(INSTALL) toolbar.ui $(DIST)/bin/res/ui
 	$(INSTALL) test.ui $(DIST)/bin/res/ui
 	$(INSTALL) compose_event.ui $(DIST)/bin/res/ui
-	$(INSTALL) image.jpg $(DIST)/bin/res/ui
-	$(INSTALL) agenda_mini.gif $(DIST)/bin/res/ui
-	$(INSTALL) agenda_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) agenda_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) agenda_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) intray_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) intray_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) intray_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) tasks_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) tasks_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) tasks_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) day_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) day_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) day_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) week_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) week_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) week_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) month_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) month_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) month_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) newentry_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) newentry_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) newentry_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) newtask_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) newtask_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) newtask_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) print_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) print_hover_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) print_pressed_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) inbox_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) sent_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) outbox_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) trash_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) browser_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) mail_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) addrbook_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) portal_full.gif $(DIST)/bin/res/ui
-	$(INSTALL) trex_full.gif $(DIST)/bin/res/ui
diff --git a/calendar/modules/ui/res/toolbar.ui b/calendar/modules/ui/res/toolbar.ui
index 978252371476..fa60f79bf6e0 100644
--- a/calendar/modules/ui/res/toolbar.ui
+++ b/calendar/modules/ui/res/toolbar.ui
@@ -46,18 +46,18 @@
 
 <!-- This is the ToolBar Definition -->
 <toolbar backgroundcolor="#C0C0C0" name="ToolBar" layout="xbox" hgap="3" vgap="3" weightmajor="0" weightminor="0" icons="mini" dockable="true" floatable="true" tooltips="true"> 
-	<xpbutton command="LoadUrl?resource://res/ui/demo/julian4.cal" weightmajor="0" halign="center" valign="bottom" weightminor="0" label="Portal" miniimage="intray_mini.gif" fullimage="resource://res/ui/intray_full.gif" fullhoverimage="resource://res/ui/intray_hover_full.gif" fullpressedimage="resource://res/ui/intray_pressed_full.gif"/>
-	<xpbutton label="Agenda" halign="center" valign="bottom" enable="True" weightmajor="0" weightminor="0" miniimage="resource://res/ui/agenda_mini.gif" fullimage="resource://res/ui/agenda_full.gif" fullhoverimage="resource://res/ui/agenda_hover_full.gif" fullpressedimage="resource://res/ui/agenda_pressed_full.gif"/>
-	<!--<xpbutton halign="center" valign="bottom" weightmajor="0" weightminor="0" label="Tasks" miniimage="tasks_mini.gif" fullimage="resource://res/ui/tasks_full.gif" fullhoverimage="resource://res/ui/tasks_hover_full.gif" fullpressedimage="resource://res/ui/tasks_pressed_full.gif"/>-->
+	<xpbutton command="LoadUrl?resource://res/ui/demo/julian4.cal" weightmajor="0" halign="center" valign="bottom" weightminor="0" label="Portal" miniimage="images/intray_mini.gif" fullimage="resource://res/ui/images/intray_full.gif" fullhoverimage="resource://res/ui/images/intray_hover_full.gif" fullpressedimage="resource://res/ui/images/intray_pressed_full.gif"/>
+	<xpbutton label="Agenda" halign="center" valign="bottom" enable="True" weightmajor="0" weightminor="0" miniimage="resource://res/ui/images/agenda_mini.gif" fullimage="resource://res/ui/images/agenda_full.gif" fullhoverimage="resource://res/ui/images/agenda_hover_full.gif" fullpressedimage="resource://res/ui/images/agenda_pressed_full.gif"/>
+	<!--<xpbutton halign="center" valign="bottom" weightmajor="0" weightminor="0" label="Tasks" miniimage="tasks_mini.gif" fullimage="resource://res/ui/images/tasks_full.gif" fullhoverimage="resource://res/ui/images/tasks_hover_full.gif" fullpressedimage="resource://res/ui/images/tasks_pressed_full.gif"/>-->
 	<object class="separator" weightmajor="0" weightminor="0"/>
-	<xpbutton halign="center" valign="bottom" label="Day" weightmajor="0" weightminor="0" miniimage="day_mini.gif" fullimage="resource://res/ui/day_full.gif" rule="ViewListRule" fullhoverimage="resource://res/ui/day_hover_full.gif" fullpressedimage="resource://res/ui/day_pressed_full.gif"/>
-	<xpbutton halign="center" valign="bottom" label="Week" weightmajor="0" weightminor="0" miniimage="week_mini.gif" fullimage="resource://res/ui/week_full.gif" rule="ViewListRule" fullhoverimage="resource://res/ui/week_hover_full.gif" fullpressedimage="resource://res/ui/week_pressed_full.gif"/>
-	<xpbutton halign="center" valign="bottom" label="Month" weightmajor="0" weightminor="0" miniimage="month_mini.gif" fullimage="resource://res/ui/month_full.gif" rule="ViewListRule" fullhoverimage="resource://res/ui/month_hover_full.gif" fullpressedimage="resource://res/ui/month_pressed_full.gif"/>
+	<xpbutton halign="center" valign="bottom" label="Day" weightmajor="0" weightminor="0" miniimage="images/day_mini.gif" fullimage="resource://res/ui/images/day_full.gif" rule="ViewListRule" fullhoverimage="resource://res/ui/images/day_hover_full.gif" fullpressedimage="resource://res/ui/images/day_pressed_full.gif"/>
+	<xpbutton halign="center" valign="bottom" label="Week" weightmajor="0" weightminor="0" miniimage="images/week_mini.gif" fullimage="resource://res/ui/images/week_full.gif" rule="ViewListRule" fullhoverimage="resource://res/ui/images/week_hover_full.gif" fullpressedimage="resource://res/ui/images/week_pressed_full.gif"/>
+	<xpbutton halign="center" valign="bottom" label="Month" weightmajor="0" weightminor="0" miniimage="images/month_mini.gif" fullimage="resource://res/ui/images/month_full.gif" rule="ViewListRule" fullhoverimage="resource://res/ui/images/month_hover_full.gif" fullpressedimage="resource://res/ui/images/month_pressed_full.gif"/>
 	<object class="separator" weightmajor="0" weightminor="0"/>
-	<xpbutton halign="center" valign="bottom" label="New Entry" weightmajor="0" weightminor="0" miniimage="newentry_mini.gif" fullimage="resource://res/ui/newentry_full.gif" fullhoverimage="resource://res/ui/newentry_hover_full.gif" fullpressedimage="resource://res/ui/newentry_pressed_full.gif"/>
-	<!--<xpbutton halign="center" valign="bottom" label="New Task" weightmajor="0" weightminor="0" miniimage="newtask_mini.gif" fullimage="resource://res/ui/newtask_full.gif" fullhoverimage="resource://res/ui/newtask_hover_full.gif" fullpressedimage="resource://res/ui/newtask_pressed_full.gif"/>-->
+	<xpbutton halign="center" valign="bottom" label="New Entry" weightmajor="0" weightminor="0" miniimage="images/newentry_mini.gif" fullimage="resource://res/ui/images/newentry_full.gif" fullhoverimage="resource://res/ui/images/newentry_hover_full.gif" fullpressedimage="resource://res/ui/images/newentry_pressed_full.gif"/>
+	<!--<xpbutton halign="center" valign="bottom" label="New Task" weightmajor="0" weightminor="0" miniimage="images/newtask_mini.gif" fullimage="resource://res/ui/images/newtask_full.gif" fullhoverimage="resource://res/ui/images/newtask_hover_full.gif" fullpressedimage="resource://res/ui/images/newtask_pressed_full.gif"/>-->
 	<object class="separator" weightmajor="0" weightminor="0" />
-	<xpbutton halign="center" valign="bottom" label="Print..." weightmajor="0" weightminor="0" miniimage="print_mini.gif" fullimage="resource://res/ui/print_full.gif" fullhoverimage="resource://res/ui/print_hover_full.gif" fullpressedimage="resource://res/ui/print_pressed_full.gif"/>
+	<xpbutton halign="center" valign="bottom" label="Print..." weightmajor="0" weightminor="0" miniimage="images/print_mini.gif" fullimage="resource://res/ui/images/print_full.gif" fullhoverimage="resource://res/ui/images/print_hover_full.gif" fullpressedimage="resource://res/ui/images/print_pressed_full.gif"/>
 	<object class="separator" weightmajor="0" weightminor="0"/>
 	<xpbutton halign="right" valign="center" label="GOTO:" weightmajor="0" weightminor="0"/>
 	<object class="editfield" weightmajor="1" weightminor="1" label=""/>
diff --git a/calendar/modules/util/src/config.mk b/calendar/modules/util/src/config.mk
index 5df12257e569..0b29d59b0d36 100644
--- a/calendar/modules/util/src/config.mk
+++ b/calendar/modules/util/src/config.mk
@@ -23,12 +23,7 @@ LD_LIBS += \
 	raptorbase \
 	xpcom$(MOZ_BITS) \
 	$(NATIVE_JULIAN_DLL) \
-	nsfmt$(MOZ_BITS)30 \
-	nsuni$(MOZ_BITS)30 \
-	nscck$(MOZ_BITS)30 \
-	nsjpn$(MOZ_BITS)30 \
-	nscnv$(MOZ_BITS)30 \
-	nssb$(MOZ_BITS)30 \
+    $(NATIVE_LIBNLS_LIBS) \
 	$(XP_REG_LIB)
 
 EXTRA_LIBS += $(NSPR_LIBS)