Fix bug 290747 - use sunbird.jar for sunbird specific files. r=dbo
authorPhilipp Kewisch <mozilla@kewis.ch>
Tue, 21 Oct 2008 13:09:14 +0200
changeset 661 afd7891715ee048926979c99643c97c1d94a434b
parent 660 643c6297dd21c7118df0e0cc93198aaa33bf2df1
child 662 fdea86912f931a21b24abab15f502fb9f8d3178d
push idunknown
push userunknown
push dateunknown
reviewersdbo
bugs290747
Fix bug 290747 - use sunbird.jar for sunbird specific files. r=dbo
calendar/base/jar.mn
calendar/base/src/calApplicationUtils.js
calendar/installer/windows/packages-static
calendar/lightning/jar.mn
calendar/locales/en-US/chrome/calendar/aboutDialog.dtd
calendar/locales/en-US/chrome/sunbird/aboutDialog.dtd
calendar/providers/gdata/jar.mn
calendar/resources/content/calendarService.js
calendar/resources/content/calendarWindow.js
calendar/resources/jar.mn
calendar/sunbird/Makefile.in
calendar/sunbird/app/profile/sunbird.js
calendar/sunbird/base/Makefile.in
calendar/sunbird/base/content/aboutDialog.js
calendar/sunbird/base/content/aboutDialog.xul
calendar/sunbird/base/content/calendar.xul
calendar/sunbird/base/content/credits.xhtml
calendar/sunbird/base/content/sunbird-scripts.inc
calendar/sunbird/base/content/sunbird-toolbar.inc
calendar/sunbird/base/jar.mn
calendar/sunbird/base/themes/pinstripe/calendar.css
calendar/sunbird/base/themes/pinstripe/icon.png
calendar/sunbird/base/themes/pinstripe/offline-online.png
calendar/sunbird/base/themes/pinstripe/preview.png
calendar/sunbird/base/themes/winstripe/calendar.css
calendar/sunbird/base/themes/winstripe/icon.png
calendar/sunbird/base/themes/winstripe/offline-online.png
calendar/sunbird/base/themes/winstripe/preview.png
calendar/sunbird/locales/jar.mn
calendar/sunbird/themes/LICENSE
calendar/sunbird/themes/Makefile.in
calendar/sunbird/themes/pinstripe/Makefile.in
calendar/sunbird/themes/pinstripe/sunbird/Makefile.in
calendar/sunbird/themes/pinstripe/sunbird/calendar.css
calendar/sunbird/themes/pinstripe/sunbird/contents.rdf
calendar/sunbird/themes/pinstripe/sunbird/icon.png
calendar/sunbird/themes/pinstripe/sunbird/jar.mn
calendar/sunbird/themes/pinstripe/sunbird/offline-online.png
calendar/sunbird/themes/pinstripe/sunbird/preview.png
calendar/sunbird/themes/pinstripe/sunbird/synch_animated.gif
calendar/sunbird/themes/winstripe/Makefile.in
calendar/sunbird/themes/winstripe/sunbird/Makefile.in
calendar/sunbird/themes/winstripe/sunbird/Throbber.gif
calendar/sunbird/themes/winstripe/sunbird/Throbber.png
calendar/sunbird/themes/winstripe/sunbird/calendar.css
calendar/sunbird/themes/winstripe/sunbird/contents.rdf
calendar/sunbird/themes/winstripe/sunbird/icon.png
calendar/sunbird/themes/winstripe/sunbird/jar.mn
calendar/sunbird/themes/winstripe/sunbird/offline-online.png
calendar/sunbird/themes/winstripe/sunbird/preview.png
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -11,178 +11,176 @@ calendar.jar:
     content/calendar/calendar-bindings.css                 (content/calendar-bindings.css)
     content/calendar/calendar-calendars-list.xul           (content/calendar-calendars-list.xul)
     content/calendar/calendar-chrome-startup.js            (content/calendar-chrome-startup.js)
     content/calendar/calendar-common-sets.xul              (content/calendar-common-sets.xul)
     content/calendar/calendar-common-sets.js               (content/calendar-common-sets.js)
     content/calendar/calendar-creation.js                  (content/calendar-creation.js)
     content/calendar/calendar-daypicker.xml                (content/calendar-daypicker.xml)
     content/calendar/calendar-decorated-base.xml           (content/calendar-decorated-base.xml)
-    content/calendar/calendar-decorated-multiday-base-view.xml (content/calendar-decorated-multiday-base-view.xml)
+    content/calendar/calendar-decorated-multiday-base-view.xml  (content/calendar-decorated-multiday-base-view.xml)
     content/calendar/calendar-decorated-day-view.xml       (content/calendar-decorated-day-view.xml)
     content/calendar/calendar-decorated-week-view.xml      (content/calendar-decorated-week-view.xml)
     content/calendar/calendar-decorated-multiweek-view.xml (content/calendar-decorated-multiweek-view.xml)
     content/calendar/calendar-decorated-month-view.xml     (content/calendar-decorated-month-view.xml)
     content/calendar/calendar-dialog-utils.js              (content/calendar-dialog-utils.js)
 *   content/calendar/calendar-dnd-listener.js              (content/calendar-dnd-listener.js)
+    content/calendar/calendar-invitations-manager.js       (content/calendar-invitations-manager.js)
     content/calendar/calendar-item-editing.js              (content/calendar-item-editing.js)
     content/calendar/calendar-item-bindings.xml            (content/calendar-item-bindings.xml)
+    content/calendar/calendar-management.js                (content/calendar-management.js)
     content/calendar/calendar-menus.xml                    (content/calendar-menus.xml)
 *   content/calendar/calendar-month-view.xml               (content/calendar-month-view.xml)
     content/calendar/calendar-multiday-view.xml            (content/calendar-multiday-view.xml)
     content/calendar/calendar-occurrence-prompt.xul        (content/calendar-occurrence-prompt.xul)
     content/calendar/calendar-properties-dialog.xul        (content/calendar-properties-dialog.xul)
     content/calendar/calendar-properties-dialog.js         (content/calendar-properties-dialog.js)
+    content/calendar/calendar-statusbar.js                 (content/calendar-statusbar.js)
+    content/calendar/calendar-subscriptions-dialog.css     (content/calendar-subscriptions-dialog.css)
+    content/calendar/calendar-subscriptions-dialog.js      (content/calendar-subscriptions-dialog.js)
+    content/calendar/calendar-subscriptions-dialog.xul     (content/calendar-subscriptions-dialog.xul)
+    content/calendar/calendar-subscriptions-list.xml       (content/calendar-subscriptions-list.xml)
+    content/calendar/calendar-summary-dialog.js            (content/calendar-summary-dialog.js)
+    content/calendar/calendar-summary-dialog.xul           (content/calendar-summary-dialog.xul)
     content/calendar/calendar-task-editing.js              (content/calendar-task-editing.js)
     content/calendar/calendar-task-tree.xml                (content/calendar-task-tree.xml)
     content/calendar/calendar-task-tree.js                 (content/calendar-task-tree.js)
     content/calendar/calendar-task-view.xul                (content/calendar-task-view.xul)
     content/calendar/calendar-task-view.js                 (content/calendar-task-view.js)
     content/calendar/calendar-ui-utils.js                  (content/calendar-ui-utils.js)
     content/calendar/calendar-unifinder.xul                (content/calendar-unifinder.xul)
     content/calendar/calendar-unifinder.js                 (content/calendar-unifinder.js)
     content/calendar/calendar-unifinder-todo.xul           (content/calendar-unifinder-todo.xul)
     content/calendar/calendar-unifinder-todo.js            (content/calendar-unifinder-todo.js)
-    content/calendar/calendar-statusbar.js                 (content/calendar-statusbar.js)
-    content/calendar/calendar-summary-dialog.js            (content/calendar-summary-dialog.js)
-    content/calendar/calendar-summary-dialog.xul           (content/calendar-summary-dialog.xul)
+    content/calendar/calendar-view-bindings.css            (content/calendar-view-bindings.css)
+    content/calendar/calendar-view-core.xml                (content/calendar-view-core.xml)
+    content/calendar/calendar-views.js                     (content/calendar-views.js)
+*   content/calendar/migration.js                          (content/migration.js)
+    content/calendar/migration.xul                         (content/migration.xul)
+    content/calendar/import-export.js                      (content/import-export.js)
     content/calendar/today-pane.xul                        (content/today-pane.xul)
     content/calendar/today-pane.js                         (content/today-pane.js)
-    content/calendar/calendar-management.js                (content/calendar-management.js)
-    content/calendar/calendar-subscriptions-dialog.css     (content/calendar-subscriptions-dialog.css)
-    content/calendar/calendar-subscriptions-dialog.js      (content/calendar-subscriptions-dialog.js)
-    content/calendar/calendar-subscriptions-dialog.xul     (content/calendar-subscriptions-dialog.xul)
-    content/calendar/calendar-subscriptions-list.xml       (content/calendar-subscriptions-list.xml)
-    content/calendar/calendar-invitations-manager.js       (content/calendar-invitations-manager.js)
+    content/calendar/calendar-event-dialog.css             (content/dialogs/calendar-event-dialog.css)
+    content/calendar/calendar-event-dialog.js              (content/dialogs/calendar-event-dialog.js)
+    content/calendar/calendar-event-dialog.xul             (content/dialogs/calendar-event-dialog.xul)
+    content/calendar/calendar-event-dialog-attendees.xml   (content/dialogs/calendar-event-dialog-attendees.xml)
+    content/calendar/calendar-event-dialog-freebusy.xml    (content/dialogs/calendar-event-dialog-freebusy.xml)
+    content/calendar/calendar-event-dialog-recurrence.xul  (content/dialogs/calendar-event-dialog-recurrence.xul)
+    content/calendar/calendar-event-dialog-recurrence.js   (content/dialogs/calendar-event-dialog-recurrence.js)
+    content/calendar/calendar-event-dialog-recurrence-preview.xml  (content/dialogs/calendar-event-dialog-recurrence-preview.xml)
+    content/calendar/calendar-event-dialog-reminder.js     (content/dialogs/calendar-event-dialog-reminder.js)
+    content/calendar/calendar-event-dialog-reminder.xul    (content/dialogs/calendar-event-dialog-reminder.xul)
+    content/calendar/calendar-event-dialog-timezone.js     (content/dialogs/calendar-event-dialog-timezone.js)
+    content/calendar/calendar-event-dialog-timezone.xul    (content/dialogs/calendar-event-dialog-timezone.xul)
+    content/calendar/calendar-event-dialog-attendees.xul   (content/dialogs/calendar-event-dialog-attendees.xul)
+    content/calendar/calendar-event-dialog-attendees.js    (content/dialogs/calendar-event-dialog-attendees.js)
     content/calendar/calendar-invitations-dialog.css       (content/dialogs/calendar-invitations-dialog.css)
     content/calendar/calendar-invitations-dialog.js        (content/dialogs/calendar-invitations-dialog.js)
     content/calendar/calendar-invitations-dialog.xul       (content/dialogs/calendar-invitations-dialog.xul)
     content/calendar/calendar-invitations-list.xml         (content/dialogs/calendar-invitations-list.xml)
-    content/calendar/widgets/minimonth.xml                 (content/widgets/minimonth.xml)
-    content/calendar/calendar-view-bindings.css            (content/calendar-view-bindings.css)
-    content/calendar/calendar-view-core.xml                (content/calendar-view-core.xml)
-    content/calendar/calendar-views.js                     (content/calendar-views.js)
-*   content/calendar/calApplicationUtils.js                (src/calApplicationUtils.js)
-    content/calendar/calUtils.js                           (src/calUtils.js)
-    content/calendar/calFilter.js                          (src/calFilter.js)
-    content/calendar/Windows98ToZoneInfoTZId.properties    (src/Windows98ToZoneInfoTZId.properties)
-    content/calendar/WindowsNTToZoneInfoTZId.properties    (src/WindowsNTToZoneInfoTZId.properties)
-    content/calendar/calErrorPrompt.xul                    (content/calErrorPrompt.xul)
-    content/calendar/chooseCalendarDialog.xul              (content/chooseCalendarDialog.xul)
-    content/calendar/import-export.js                      (content/import-export.js)
-*   content/calendar/migration.js                          (content/migration.js)
-    content/calendar/migration.xul                         (content/migration.xul)
-    content/calendar/widgets/calendar-widgets.xml          (content/widgets/calendar-widgets.xml)
-    content/calendar/widgets/calendar-widget-bindings.css  (content/widgets/calendar-widget-bindings.css)
     content/calendar/preferences/alarms.xul                (content/preferences/alarms.xul)
     content/calendar/preferences/alarms.js                 (content/preferences/alarms.js)
     content/calendar/preferences/categories.xul            (content/preferences/categories.xul)
     content/calendar/preferences/categories.js             (content/preferences/categories.js)
     content/calendar/preferences/editCategory.xul          (content/preferences/editCategory.xul)
     content/calendar/preferences/general.js                (content/preferences/general.js)
     content/calendar/preferences/general.xul               (content/preferences/general.xul)
     content/calendar/preferences/timezones.js              (content/preferences/timezones.js)
     content/calendar/preferences/timezones.xul             (content/preferences/timezones.xul)
     content/calendar/preferences/views.js                  (content/preferences/views.js)
     content/calendar/preferences/views.xul                 (content/preferences/views.xul)
-    content/calendar/calendar-event-dialog.css             (content/dialogs/calendar-event-dialog.css)
-    content/calendar/calendar-event-dialog.js              (content/dialogs/calendar-event-dialog.js)
-    content/calendar/calendar-event-dialog.xul             (content/dialogs/calendar-event-dialog.xul)
-    content/calendar/calendar-event-dialog-attendees.xml   (content/dialogs/calendar-event-dialog-attendees.xml)
-    content/calendar/calendar-event-dialog-freebusy.xml    (content/dialogs/calendar-event-dialog-freebusy.xml)
-    content/calendar/calendar-event-dialog-recurrence.xul  (content/dialogs/calendar-event-dialog-recurrence.xul)
-    content/calendar/calendar-event-dialog-recurrence.js   (content/dialogs/calendar-event-dialog-recurrence.js)
-    content/calendar/calendar-event-dialog-recurrence-preview.xml (content/dialogs/calendar-event-dialog-recurrence-preview.xml)
-    content/calendar/calendar-event-dialog-reminder.js     (content/dialogs/calendar-event-dialog-reminder.js)
-    content/calendar/calendar-event-dialog-reminder.xul    (content/dialogs/calendar-event-dialog-reminder.xul)
-    content/calendar/calendar-event-dialog-timezone.js     (content/dialogs/calendar-event-dialog-timezone.js)
-    content/calendar/calendar-event-dialog-timezone.xul    (content/dialogs/calendar-event-dialog-timezone.xul)
-    content/calendar/calendar-event-dialog-attendees.xul   (content/dialogs/calendar-event-dialog-attendees.xul)
-    content/calendar/calendar-event-dialog-attendees.js    (content/dialogs/calendar-event-dialog-attendees.js)
-% skin calendar classic/1.0 %skin/classic/calendar/
-    skin/classic/calendar/abcard.png                       (themes/common/abcard.png)
-    skin/classic/calendar/alarm-suppressed.png             (themes/common/alarm-suppressed.png)
-    skin/classic/calendar/alarm-flashing.png               (themes/common/alarm-flashing.png)
-    skin/classic/calendar/alarm.png                        (themes/common/alarm.png)
-    skin/classic/calendar/daypicker-background.png         (themes/common/daypicker-background.png)
-    skin/classic/calendar/cal-icon32.png                   (themes/@THEME@/cal-icon32.png)
-    skin/classic/calendar/calendar-alarm-dialog.css        (themes/@THEME@/calendar-alarm-dialog.css)
-    skin/classic/calendar/calendar-toolbar.css             (themes/@THEME@/calendar-toolbar.css)
-    skin/classic/calendar/today-pane.css                   (themes/@THEME@/today-pane.css)
-    skin/classic/calendar/widgets/calendar-widgets.css     (themes/@THEME@/widgets/calendar-widgets.css)
-    skin/classic/calendar/calendar-creation-wizard.css     (themes/@THEME@/calendar-creation-wizard.css)
-    skin/classic/calendar/calendar-event-dialog.css        (themes/@THEME@/calendar-event-dialog.css)
-    skin/classic/calendar/calendar-occurrence-prompt.css   (themes/@THEME@/calendar-occurrence-prompt.css)
-    skin/classic/calendar/calendar-occurrence-prompt.png   (themes/@THEME@/calendar-occurrence-prompt.png)
-    skin/classic/calendar/calendar-properties-dialog.css   (themes/@THEME@/calendar-properties-dialog.css)
-    skin/classic/calendar/calendar-unifinder.css           (themes/@THEME@/calendar-unifinder.css)
-    skin/classic/calendar/calendar-views.css               (themes/@THEME@/calendar-views.css)
-    skin/classic/calendar/toolbar-large.png                (themes/@THEME@/toolbar-large.png)
-    skin/classic/calendar/toolbar-small.png                (themes/@THEME@/toolbar-small.png)
-    skin/classic/calendar/mode-switch-icons.png            (themes/@THEME@/mode-switch-icons.png)
-    skin/classic/calendar/ok-cancel.png                    (themes/@THEME@/ok-cancel.png)
-    skin/classic/calendar/calendar-management.css          (themes/@THEME@/calendar-management.css)
-    skin/classic/calendar/calendar-daypicker.css           (themes/@THEME@/calendar-daypicker.css)
-    skin/classic/calendar/calendar-task-tree.css           (themes/@THEME@/calendar-task-tree.css)
-    skin/classic/calendar/calendar-task-view.css           (themes/@THEME@/calendar-task-view.css)
-    skin/classic/calendar/widgets/minimonth.css            (themes/@THEME@/widgets/minimonth.css)
-    skin/classic/calendar/calendar-status.png              (themes/common/calendar-status.png)
-    skin/classic/calendar/event-grippy-bottom.png          (themes/common/event-grippy-bottom.png)
-    skin/classic/calendar/event-grippy-left.png            (themes/common/event-grippy-left.png)
-    skin/classic/calendar/event-grippy-right.png           (themes/common/event-grippy-right.png)
-    skin/classic/calendar/event-grippy-top.png             (themes/common/event-grippy-top.png)
-    skin/classic/calendar/gradient-overlay.png             (themes/common/gradient-overlay.png)
-    skin/classic/calendar/calendar-overlay.png             (themes/common/calendar-overlay.png)
-    skin/classic/calendar/category-overlay.png             (themes/common/category-overlay.png)
-    skin/classic/calendar/unifinder-images.png             (themes/common/unifinder-images.png)
-    skin/classic/calendar/day-box-item-image.png           (themes/common/day-box-item-image.png)
-    skin/classic/calendar/widgets/nav-buttons.png          (themes/common/widgets/nav-buttons.png)
-    skin/classic/calendar/calendar-day-label-back.png      (themes/common/calendar-day-label-back.png)
-    skin/classic/calendar/widgets/view-navigation.png      (themes/common/widgets/view-navigation.png)
-    skin/classic/calendar/mini-day-background.png          (themes/common/mini-day-background.png)
-    skin/classic/calendar/calendar-event-dialog-attendees.png (themes/@THEME@/dialogs/calendar-event-dialog-attendees.png)
-    skin/classic/calendar/calendar-event-dialog-toolbar.png (themes/@THEME@/dialogs/calendar-event-dialog-toolbar.png)
-    skin/classic/calendar/calendar-event-dialog.png        (themes/@THEME@/dialogs/calendar-event-dialog.png)
-    skin/classic/calendar/timezone_0h.png                  (themes/@THEME@/dialogs/timezone_0h.png)
-    skin/classic/calendar/timezone_1h.png                  (themes/@THEME@/dialogs/timezone_1h.png)
-    skin/classic/calendar/timezone_2h.png                  (themes/@THEME@/dialogs/timezone_2h.png)
-    skin/classic/calendar/timezone_3h30.png                (themes/@THEME@/dialogs/timezone_3h30.png)
-    skin/classic/calendar/timezone_3h.png                  (themes/@THEME@/dialogs/timezone_3h.png)
-    skin/classic/calendar/timezone_4h30.png                (themes/@THEME@/dialogs/timezone_4h30.png)
-    skin/classic/calendar/timezone_4h.png                  (themes/@THEME@/dialogs/timezone_4h.png)
-    skin/classic/calendar/timezone_5h30.png                (themes/@THEME@/dialogs/timezone_5h30.png)
-    skin/classic/calendar/timezone_5h45.png                (themes/@THEME@/dialogs/timezone_5h45.png)
-    skin/classic/calendar/timezone_5h.png                  (themes/@THEME@/dialogs/timezone_5h.png)
-    skin/classic/calendar/timezone_6h30.png                (themes/@THEME@/dialogs/timezone_6h30.png)
-    skin/classic/calendar/timezone_6h.png                  (themes/@THEME@/dialogs/timezone_6h.png)
-    skin/classic/calendar/timezone_7h.png                  (themes/@THEME@/dialogs/timezone_7h.png)
-    skin/classic/calendar/timezone_8h.png                  (themes/@THEME@/dialogs/timezone_8h.png)
-    skin/classic/calendar/timezone_9h30.png                (themes/@THEME@/dialogs/timezone_9h30.png)
-    skin/classic/calendar/timezone_9h.png                  (themes/@THEME@/dialogs/timezone_9h.png)
-    skin/classic/calendar/timezone_10h30.png               (themes/@THEME@/dialogs/timezone_10h.png)
-    skin/classic/calendar/timezone_10h.png                 (themes/@THEME@/dialogs/timezone_10h.png)
-    skin/classic/calendar/timezone_11h30.png               (themes/@THEME@/dialogs/timezone_11h.png)
-    skin/classic/calendar/timezone_11h.png                 (themes/@THEME@/dialogs/timezone_11h.png)
-    skin/classic/calendar/timezone_12h45.png               (themes/@THEME@/dialogs/timezone_12h.png)
-    skin/classic/calendar/timezone_12h.png                 (themes/@THEME@/dialogs/timezone_12h.png)
-    skin/classic/calendar/timezone_13h.png                 (themes/@THEME@/dialogs/timezone_13h.png)
-    skin/classic/calendar/timezone_14h.png                 (themes/@THEME@/dialogs/timezone_13h.png)
-    skin/classic/calendar/timezone_-1h.png                 (themes/@THEME@/dialogs/timezone_-1h.png)
-    skin/classic/calendar/timezone_-2h.png                 (themes/@THEME@/dialogs/timezone_-2h.png)
-    skin/classic/calendar/timezone_-3h30.png               (themes/@THEME@/dialogs/timezone_-3h30.png)
-    skin/classic/calendar/timezone_-3h.png                 (themes/@THEME@/dialogs/timezone_-3h.png)
-    skin/classic/calendar/timezone_-4h.png                 (themes/@THEME@/dialogs/timezone_-4h.png)
-    skin/classic/calendar/timezone_-5h.png                 (themes/@THEME@/dialogs/timezone_-5h.png)
-    skin/classic/calendar/timezone_-6h.png                 (themes/@THEME@/dialogs/timezone_-6h.png)
-    skin/classic/calendar/timezone_-7h.png                 (themes/@THEME@/dialogs/timezone_-7h.png)
-    skin/classic/calendar/timezone_-8h30.png               (themes/@THEME@/dialogs/timezone_-8h30.png)
-    skin/classic/calendar/timezone_-8h.png                 (themes/@THEME@/dialogs/timezone_-8h.png)
-    skin/classic/calendar/timezone_-9h30.png               (themes/@THEME@/dialogs/timezone_-9h30.png)
-    skin/classic/calendar/timezone_-9h.png                 (themes/@THEME@/dialogs/timezone_-9h.png)
-    skin/classic/calendar/timezone_-10h.png                (themes/@THEME@/dialogs/timezone_-10h.png)
-    skin/classic/calendar/timezone_-11h.png                (themes/@THEME@/dialogs/timezone_-11h.png)
-    skin/classic/calendar/timezone_-12h45.png              (themes/@THEME@/dialogs/timezone_-12h45.png)
-    skin/classic/calendar/timezone_-12h.png                (themes/@THEME@/dialogs/timezone_-12h.png)
-    skin/classic/calendar/timezone_map.png                 (themes/@THEME@/dialogs/timezone_map.png)
-    skin/classic/calendar/calendar-invitations-dialog.css  (themes/@THEME@/dialogs/calendar-invitations-dialog.css)
-    skin/classic/calendar/calendar-invitations-dialog-button-images.png (themes/@THEME@/dialogs/calendar-invitations-dialog-button-images.png)
-    skin/classic/calendar/calendar-invitations-dialog-list-images.png (themes/@THEME@/dialogs/calendar-invitations-dialog-list-images.png)
-    skin/classic/calendar/calendar-subscriptions-dialog.css (themes/@THEME@/calendar-subscriptions-dialog.css)
+    content/calendar/widgets/minimonth.xml                 (content/widgets/minimonth.xml)
+    content/calendar/widgets/calendar-widgets.xml          (content/widgets/calendar-widgets.xml)
+    content/calendar/widgets/calendar-widget-bindings.css  (content/widgets/calendar-widget-bindings.css)
+*   content/calendar/calApplicationUtils.js                (src/calApplicationUtils.js)
+    content/calendar/calUtils.js                           (src/calUtils.js)
+    content/calendar/calFilter.js                          (src/calFilter.js)
+    content/calendar/Windows98ToZoneInfoTZId.properties    (src/Windows98ToZoneInfoTZId.properties)
+    content/calendar/WindowsNTToZoneInfoTZId.properties    (src/WindowsNTToZoneInfoTZId.properties)
+% skin calendar classic/1.0 %skin/calendar/
+    skin/calendar/abcard.png                               (themes/common/abcard.png)
+    skin/calendar/alarm-suppressed.png                     (themes/common/alarm-suppressed.png)
+    skin/calendar/alarm-flashing.png                       (themes/common/alarm-flashing.png)
+    skin/calendar/alarm.png                                (themes/common/alarm.png)
+    skin/calendar/calendar-day-label-back.png              (themes/common/calendar-day-label-back.png)
+    skin/calendar/calendar-overlay.png                     (themes/common/calendar-overlay.png)
+    skin/calendar/category-overlay.png                     (themes/common/category-overlay.png)
+    skin/calendar/calendar-status.png                      (themes/common/calendar-status.png)
+    skin/calendar/daypicker-background.png                 (themes/common/daypicker-background.png)
+    skin/calendar/day-box-item-image.png                   (themes/common/day-box-item-image.png)
+    skin/calendar/event-grippy-bottom.png                  (themes/common/event-grippy-bottom.png)
+    skin/calendar/event-grippy-left.png                    (themes/common/event-grippy-left.png)
+    skin/calendar/event-grippy-right.png                   (themes/common/event-grippy-right.png)
+    skin/calendar/event-grippy-top.png                     (themes/common/event-grippy-top.png)
+    skin/calendar/gradient-overlay.png                     (themes/common/gradient-overlay.png)
+    skin/calendar/mini-day-background.png                  (themes/common/mini-day-background.png)
+    skin/calendar/unifinder-images.png                     (themes/common/unifinder-images.png)
+    skin/calendar/widgets/nav-buttons.png                  (themes/common/widgets/nav-buttons.png)
+    skin/calendar/widgets/view-navigation.png              (themes/common/widgets/view-navigation.png)
+    skin/calendar/cal-icon32.png                           (themes/@THEME@/cal-icon32.png)
+    skin/calendar/calendar-alarm-dialog.css                (themes/@THEME@/calendar-alarm-dialog.css)
+    skin/calendar/calendar-creation-wizard.css             (themes/@THEME@/calendar-creation-wizard.css)
+    skin/calendar/calendar-daypicker.css                   (themes/@THEME@/calendar-daypicker.css)
+    skin/calendar/calendar-event-dialog.css                (themes/@THEME@/calendar-event-dialog.css)
+    skin/calendar/calendar-event-dialog-attendees.png      (themes/@THEME@/dialogs/calendar-event-dialog-attendees.png)
+    skin/calendar/calendar-event-dialog-toolbar.png        (themes/@THEME@/dialogs/calendar-event-dialog-toolbar.png)
+    skin/calendar/calendar-event-dialog.png                (themes/@THEME@/dialogs/calendar-event-dialog.png)
+    skin/calendar/calendar-invitations-dialog.css          (themes/@THEME@/dialogs/calendar-invitations-dialog.css)
+    skin/calendar/calendar-invitations-dialog-button-images.png  (themes/@THEME@/dialogs/calendar-invitations-dialog-button-images.png)
+    skin/calendar/calendar-invitations-dialog-list-images.png  (themes/@THEME@/dialogs/calendar-invitations-dialog-list-images.png)
+    skin/calendar/calendar-management.css                  (themes/@THEME@/calendar-management.css)
+    skin/calendar/calendar-occurrence-prompt.css           (themes/@THEME@/calendar-occurrence-prompt.css)
+    skin/calendar/calendar-occurrence-prompt.png           (themes/@THEME@/calendar-occurrence-prompt.png)
+    skin/calendar/calendar-properties-dialog.css           (themes/@THEME@/calendar-properties-dialog.css)
+    skin/calendar/calendar-subscriptions-dialog.css        (themes/@THEME@/calendar-subscriptions-dialog.css)
+    skin/calendar/calendar-task-tree.css                   (themes/@THEME@/calendar-task-tree.css)
+    skin/calendar/calendar-task-view.css                   (themes/@THEME@/calendar-task-view.css)
+    skin/calendar/calendar-toolbar.css                     (themes/@THEME@/calendar-toolbar.css)
+    skin/calendar/calendar-unifinder.css                   (themes/@THEME@/calendar-unifinder.css)
+    skin/calendar/calendar-views.css                       (themes/@THEME@/calendar-views.css)
+    skin/calendar/mode-switch-icons.png                    (themes/@THEME@/mode-switch-icons.png)
+    skin/calendar/ok-cancel.png                            (themes/@THEME@/ok-cancel.png)
+    skin/calendar/today-pane.css                           (themes/@THEME@/today-pane.css)
+    skin/calendar/toolbar-large.png                        (themes/@THEME@/toolbar-large.png)
+    skin/calendar/toolbar-small.png                        (themes/@THEME@/toolbar-small.png)
+    skin/calendar/widgets/calendar-widgets.css             (themes/@THEME@/widgets/calendar-widgets.css)
+    skin/calendar/widgets/minimonth.css                    (themes/@THEME@/widgets/minimonth.css)
+    skin/calendar/timezone_0h.png                          (themes/@THEME@/dialogs/timezone_0h.png)
+    skin/calendar/timezone_1h.png                          (themes/@THEME@/dialogs/timezone_1h.png)
+    skin/calendar/timezone_2h.png                          (themes/@THEME@/dialogs/timezone_2h.png)
+    skin/calendar/timezone_3h30.png                        (themes/@THEME@/dialogs/timezone_3h30.png)
+    skin/calendar/timezone_3h.png                          (themes/@THEME@/dialogs/timezone_3h.png)
+    skin/calendar/timezone_4h30.png                        (themes/@THEME@/dialogs/timezone_4h30.png)
+    skin/calendar/timezone_4h.png                          (themes/@THEME@/dialogs/timezone_4h.png)
+    skin/calendar/timezone_5h30.png                        (themes/@THEME@/dialogs/timezone_5h30.png)
+    skin/calendar/timezone_5h45.png                        (themes/@THEME@/dialogs/timezone_5h45.png)
+    skin/calendar/timezone_5h.png                          (themes/@THEME@/dialogs/timezone_5h.png)
+    skin/calendar/timezone_6h30.png                        (themes/@THEME@/dialogs/timezone_6h30.png)
+    skin/calendar/timezone_6h.png                          (themes/@THEME@/dialogs/timezone_6h.png)
+    skin/calendar/timezone_7h.png                          (themes/@THEME@/dialogs/timezone_7h.png)
+    skin/calendar/timezone_8h.png                          (themes/@THEME@/dialogs/timezone_8h.png)
+    skin/calendar/timezone_9h30.png                        (themes/@THEME@/dialogs/timezone_9h30.png)
+    skin/calendar/timezone_9h.png                          (themes/@THEME@/dialogs/timezone_9h.png)
+    skin/calendar/timezone_10h30.png                       (themes/@THEME@/dialogs/timezone_10h.png)
+    skin/calendar/timezone_10h.png                         (themes/@THEME@/dialogs/timezone_10h.png)
+    skin/calendar/timezone_11h30.png                       (themes/@THEME@/dialogs/timezone_11h.png)
+    skin/calendar/timezone_11h.png                         (themes/@THEME@/dialogs/timezone_11h.png)
+    skin/calendar/timezone_12h45.png                       (themes/@THEME@/dialogs/timezone_12h.png)
+    skin/calendar/timezone_12h.png                         (themes/@THEME@/dialogs/timezone_12h.png)
+    skin/calendar/timezone_13h.png                         (themes/@THEME@/dialogs/timezone_13h.png)
+    skin/calendar/timezone_14h.png                         (themes/@THEME@/dialogs/timezone_13h.png)
+    skin/calendar/timezone_-1h.png                         (themes/@THEME@/dialogs/timezone_-1h.png)
+    skin/calendar/timezone_-2h.png                         (themes/@THEME@/dialogs/timezone_-2h.png)
+    skin/calendar/timezone_-3h30.png                       (themes/@THEME@/dialogs/timezone_-3h30.png)
+    skin/calendar/timezone_-3h.png                         (themes/@THEME@/dialogs/timezone_-3h.png)
+    skin/calendar/timezone_-4h.png                         (themes/@THEME@/dialogs/timezone_-4h.png)
+    skin/calendar/timezone_-5h.png                         (themes/@THEME@/dialogs/timezone_-5h.png)
+    skin/calendar/timezone_-6h.png                         (themes/@THEME@/dialogs/timezone_-6h.png)
+    skin/calendar/timezone_-7h.png                         (themes/@THEME@/dialogs/timezone_-7h.png)
+    skin/calendar/timezone_-8h30.png                       (themes/@THEME@/dialogs/timezone_-8h30.png)
+    skin/calendar/timezone_-8h.png                         (themes/@THEME@/dialogs/timezone_-8h.png)
+    skin/calendar/timezone_-9h30.png                       (themes/@THEME@/dialogs/timezone_-9h30.png)
+    skin/calendar/timezone_-9h.png                         (themes/@THEME@/dialogs/timezone_-9h.png)
+    skin/calendar/timezone_-10h.png                        (themes/@THEME@/dialogs/timezone_-10h.png)
+    skin/calendar/timezone_-11h.png                        (themes/@THEME@/dialogs/timezone_-11h.png)
+    skin/calendar/timezone_-12h45.png                      (themes/@THEME@/dialogs/timezone_-12h45.png)
+    skin/calendar/timezone_-12h.png                        (themes/@THEME@/dialogs/timezone_-12h.png)
+    skin/calendar/timezone_map.png                         (themes/@THEME@/dialogs/timezone_map.png)
--- a/calendar/base/src/calApplicationUtils.js
+++ b/calendar/base/src/calApplicationUtils.js
@@ -38,17 +38,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 function openAboutDialog()
 {
   const SUNBIRD_ID = "{718e30fb-e89b-41dd-9da7-e25a45638b28}";
   var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
                           .getService(Components.interfaces.nsIXULAppInfo);
   var url = (appInfo.ID == SUNBIRD_ID) ?
-    "chrome://calendar/content/aboutDialog.xul" :
+    "chrome://sunbird/content/aboutDialog.xul" :
     "chrome://messenger/content/aboutDialog.xul" ;
   var name = "About";
 #ifdef XP_MACOSX
   // Define minimizable=no although it does nothing on OS X (bug 287162).
   // Remove this comment once bug 287162 is fixed
   window.open(url, name, "centerscreen,chrome,resizable=no,minimizable=no");
 #else
   window.openDialog(url, name, "modal,centerscreen,chrome,resizable=no");
--- a/calendar/installer/windows/packages-static
+++ b/calendar/installer/windows/packages-static
@@ -12,16 +12,18 @@
 
 bin/.autoreg
 
 [@AB_CD@]
 bin\chrome\@AB_CD@.jar
 bin\chrome\@AB_CD@.manifest
 bin\chrome\calendar-@AB_CD@.jar
 bin\chrome\calendar-@AB_CD@.manifest
+bin\chrome\sunbird-@AB_CD@.jar
+bin\chrome\sunbird-@AB_CD@.manifest
 bin\defaults\pref\sunbird-l10n.js
 bin\defaults\profile\prefs.js
 bin\defaults\profile\chrome\*
 bin\dictionaries\*
 bin\uninstall\uninst.exe
 bin\updater.ini
 
 [xpcom]
@@ -259,16 +261,18 @@ bin\js\calWeekInfoService.js
 bin\js\calWeekPrinter.js
 
 ; [Modules]
 bin\modules\*
 
 ; [Calendar Chrome Files]
 bin\chrome\calendar.jar
 bin\chrome\calendar.manifest
+bin\chrome\sunbird.jar
+bin\chrome\sunbird.manifest
 bin\chrome\classic.jar
 bin\chrome\classic.manifest
 bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
 bin\extensions\{e2fda1a4-762b-4020-b5ad-a41df1933103}\install.rdf
 bin\chrome\comm.jar
 bin\chrome\comm.manifest
 bin\chrome\toolkit.jar
 bin\chrome\toolkit.manifest
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -1,10 +1,10 @@
+#filter substitution
 lightning.jar:
-% content lightning %content/lightning/
 % content messagebody %content/messagebody/ contentaccessible=yes
 % override chrome://messagebody/skin/imip.css chrome://lightning/skin/imip.css
 % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-migration.xul
 % overlay chrome://messenger/content/msgAccountCentral.xul chrome://lightning/content/messenger-overlay-accountCentral.xul
 % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul
 % overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/imip-bar-overlay.xul
 % overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/messenger-overlay-messageWindow.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/imip-bar-overlay.xul
@@ -18,50 +18,51 @@ lightning.jar:
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder-todo.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-task-view.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/today-pane.xul
 % overlay chrome://lightning/content/lightning-standalone.xul chrome://lightning/content/messenger-overlay-sidebar.xul
 % overlay chrome://global/content/customizeToolbar.xul chrome://lightning/content/toolkit-overlay-custombar.xul
 % overlay chrome://calendar/content/calendarCreation.xul chrome://lightning/content/lightning-calendar-creation.xul
 % overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://lightning/content/lightning-calendar-properties.xul
-% skin lightning classic/1.0 %skin/classic/lightning/
-  content/lightning/imip-bar.js                         (content/imip-bar.js)
-  content/lightning/imip-bar-overlay.xul                (content/imip-bar-overlay.xul)
-  content/lightning/lightning-common-sets.js (content/lightning-common-sets.js)
-  content/lightning/lightning-migration.xul             (content/lightning-migration.xul)
-  content/lightning/lightning-standalone.xul		(content/lightning-standalone.xul)
-  content/lightning/lightning-utils.js			(content/lightning-utils.js) 
-  content/lightning/lightning-widgets.css		(content/lightning-widgets.css)
-  content/lightning/lightning-widgets.xml		(content/lightning-widgets.xml)
-  content/lightning/messenger-overlay-sidebar.css	(content/messenger-overlay-sidebar.css)
-  content/lightning/messenger-overlay-accountCentral.xul (content/messenger-overlay-accountCentral.xul)
-  content/lightning/messenger-overlay-messageWindow.xul (content/messenger-overlay-messageWindow.xul)
-* content/lightning/messenger-overlay-sidebar.js	(content/messenger-overlay-sidebar.js)
-* content/lightning/messenger-overlay-sidebar.xul	(content/messenger-overlay-sidebar.xul)
-  content/lightning/messenger-overlay-preferences.js    (content/messenger-overlay-preferences.js)
-  content/lightning/messenger-overlay-preferences.xul	(content/messenger-overlay-preferences.xul)
-  content/lightning/messenger-overlay-toolbar.js        (content/messenger-overlay-toolbar.js)
-* content/lightning/messenger-overlay-toolbar.xul       (content/messenger-overlay-toolbar.xul)
-  content/lightning/toolkit-overlay-custombar.xul       (content/toolkit-overlay-custombar.xul)
-  content/lightning/lightning-calendar-creation.xul     (content/lightning-calendar-creation.xul)
-  content/lightning/lightning-calendar-creation.js      (content/lightning-calendar-creation.js)
-  content/lightning/lightning-calendar-properties.xul   (content/lightning-calendar-properties.xul)
-  content/lightning/lightning-calendar-properties.js    (content/lightning-calendar-properties.js)
-#expand    skin/classic/lightning/imip.css       (themes/__THEME__/imip.css)
-#expand    skin/classic/lightning/lightning.css  (themes/__THEME__/lightning.css)
-#expand    skin/classic/lightning/accountCentral.css (themes/__THEME__/accountCentral.css)
-#expand    skin/classic/lightning/lightning-widgets.css		(themes/__THEME__/lightning-widgets.css)
+% content lightning %content/lightning/
+    content/lightning/imip-bar.js                          (content/imip-bar.js)
+    content/lightning/imip-bar-overlay.xul                 (content/imip-bar-overlay.xul)
+    content/lightning/lightning-calendar-creation.xul      (content/lightning-calendar-creation.xul)
+    content/lightning/lightning-calendar-creation.js       (content/lightning-calendar-creation.js)
+    content/lightning/lightning-calendar-properties.xul    (content/lightning-calendar-properties.xul)
+    content/lightning/lightning-calendar-properties.js     (content/lightning-calendar-properties.js)
+    content/lightning/lightning-common-sets.js             (content/lightning-common-sets.js)
+    content/lightning/lightning-migration.xul              (content/lightning-migration.xul)
+    content/lightning/lightning-standalone.xul             (content/lightning-standalone.xul)
+    content/lightning/lightning-utils.js                   (content/lightning-utils.js)
+    content/lightning/lightning-widgets.css                (content/lightning-widgets.css)
+    content/lightning/lightning-widgets.xml                (content/lightning-widgets.xml)
+    content/lightning/messenger-overlay-sidebar.css        (content/messenger-overlay-sidebar.css)
+    content/lightning/messenger-overlay-accountCentral.xul (content/messenger-overlay-accountCentral.xul)
+    content/lightning/messenger-overlay-messageWindow.xul  (content/messenger-overlay-messageWindow.xul)
+*   content/lightning/messenger-overlay-sidebar.js         (content/messenger-overlay-sidebar.js)
+*   content/lightning/messenger-overlay-sidebar.xul        (content/messenger-overlay-sidebar.xul)
+    content/lightning/messenger-overlay-preferences.js     (content/messenger-overlay-preferences.js)
+    content/lightning/messenger-overlay-preferences.xul    (content/messenger-overlay-preferences.xul)
+    content/lightning/messenger-overlay-toolbar.js         (content/messenger-overlay-toolbar.js)
+*   content/lightning/messenger-overlay-toolbar.xul        (content/messenger-overlay-toolbar.xul)
+    content/lightning/toolkit-overlay-custombar.xul        (content/toolkit-overlay-custombar.xul)
+% skin lightning classic/1.0 %skin/lightning/
+    skin/lightning/imip.css                                (themes/@THEME@/imip.css)
+    skin/lightning/lightning.css                           (themes/@THEME@/lightning.css)
+    skin/lightning/accountCentral.css                      (themes/@THEME@/accountCentral.css)
+    skin/lightning/lightning-widgets.css                   (themes/@THEME@/lightning-widgets.css)
 
 calendar.jar:
-  content/calendar/calendarCreation.xul		(/calendar/resources/content/calendarCreation.xul) 
-  content/calendar/calendarCreation.js		(/calendar/resources/content/calendarCreation.js) 
-  content/calendar/mouseoverPreviews.js		(/calendar/resources/content/mouseoverPreviews.js) 
-  content/calendar/datetimepickers/datetimepickers.css (/calendar/resources/content/datetimepickers/datetimepickers.css)
-* content/calendar/datetimepickers/datetimepickers.xml (/calendar/resources/content/datetimepickers/datetimepickers.xml)
-* content/calendar/printDialog.js                (/calendar/resources/content/printDialog.js)
-  content/calendar/printDialog.xul               (/calendar/resources/content/printDialog.xul)
-  content/calendar/publish.js                   (/calendar/resources/content/publish.js)
-  content/calendar/publishDialog.js             (/calendar/resources/content/publishDialog.js)    
-  content/calendar/publishDialog.xul            (/calendar/resources/content/publishDialog.xul)
-  content/calendar/clipboard.js                 (/calendar/resources/content/clipboard.js)
-  content/calendar/sound.wav                    (/calendar/resources/content/sound.wav)
-#expand    skin/classic/calendar/datetimepickers/datetimepickers.css  (/calendar/resources/skin/classic/datetimepickers/datetimepickers.css)
+    content/calendar/calendarCreation.xul                  (/calendar/resources/content/calendarCreation.xul)
+    content/calendar/calendarCreation.js                   (/calendar/resources/content/calendarCreation.js)
+    content/calendar/clipboard.js                          (/calendar/resources/content/clipboard.js)
+    content/calendar/datetimepickers/datetimepickers.css   (/calendar/resources/content/datetimepickers/datetimepickers.css)
+*   content/calendar/datetimepickers/datetimepickers.xml   (/calendar/resources/content/datetimepickers/datetimepickers.xml)
+    content/calendar/mouseoverPreviews.js                  (/calendar/resources/content/mouseoverPreviews.js)
+*   content/calendar/printDialog.js                        (/calendar/resources/content/printDialog.js)
+    content/calendar/printDialog.xul                       (/calendar/resources/content/printDialog.xul)
+    content/calendar/publish.js                            (/calendar/resources/content/publish.js)
+    content/calendar/publishDialog.js                      (/calendar/resources/content/publishDialog.js)
+    content/calendar/publishDialog.xul                     (/calendar/resources/content/publishDialog.xul)
+    content/calendar/sound.wav                             (/calendar/resources/content/sound.wav)
+    skin/calendar/datetimepickers/datetimepickers.css      (/calendar/resources/skin/classic/datetimepickers/datetimepickers.css)
rename from calendar/locales/en-US/chrome/calendar/aboutDialog.dtd
rename to calendar/locales/en-US/chrome/sunbird/aboutDialog.dtd
--- a/calendar/providers/gdata/jar.mn
+++ b/calendar/providers/gdata/jar.mn
@@ -1,15 +1,15 @@
 #filter substitution
 
 gdata-provider.jar:
 % content gdata-provider %content/
 % skin gdata-provider classic/1.0 %skin/
 % overlay chrome://calendar/content/calendarCreation.xul chrome://gdata-provider/content/calendarCreation.xul
-% overlay chrome://calendar/content/calendar.xul chrome://gdata-provider/content/gdata-migration-overlay.xul    application={718e30fb-e89b-41dd-9da7-e25a45638b28}
+% overlay chrome://sunbird/content/calendar.xul chrome://gdata-provider/content/gdata-migration-overlay.xul    application={718e30fb-e89b-41dd-9da7-e25a45638b28}
 % overlay chrome://messenger/content/messenger.xul chrome://gdata-provider/content/gdata-migration-overlay.xul  application={3550f703-e582-4d05-9a08-453d09bdfdc6}
 % overlay chrome://calendar/content/calendar-event-dialog.xul chrome://gdata-provider/content/gdata-calendar-event-dialog.xul
     content/calendarCreation.xul                 (content/calendarCreation.xul)
     content/gdata-calendar-event-dialog.xul      (content/gdata-calendar-event-dialog.xul)
     content/gdata-migration.js                   (content/gdata-migration.js)
     content/gdata-migration-overlay.xul          (content/gdata-migration-overlay.xul)
     content/gdata-migration-wizard.xul           (content/gdata-migration-wizard.xul)
     content/gcal.png                             (content/gcal.png)
--- a/calendar/resources/content/calendarService.js
+++ b/calendar/resources/content/calendarService.js
@@ -120,17 +120,17 @@ CLineService.prototype = {
 
     /* nsICommandLineHandler */
 
     handle : function service_handle(cmdLine) {
         if (!cmdLine.preventDefault) {
             // just pass all arguments on to the Sunbird window
             wwatch = Components.classes[WINDOWWATCHER_CONTRACTID]
                                .getService(nsIWindowWatcher);
-            wwatch.openWindow(null, "chrome://calendar/content/",
+            wwatch.openWindow(null, "chrome://sunbird/content/calendar.xul",
                                   "_blank", "chrome,dialog=no,all", cmdLine);
             cmdLine.preventDefault = true;
         }
     },
 
     helpInfo : "  -subscribe or -url   Pass in a path pointing to a calendar\n" +
                "                       to subscribe to.\n" +
                "  -showdate            Pass in a value for a javascript date\n" +
@@ -193,17 +193,17 @@ function(aContentType, aWindowTarget, aR
         w.focus();
     } else {
         var ass = Components.classes[ASS_CONTRACTID]
                             .getService(nsIAppShellService);
         w = ass.hiddenDOMWindow;
 
         var args = new Object ();
         args.channel = channel;
-        w.openDialog("chrome://calendar/content/calendar.xul", "calendar", "chrome,menubar,resizable,scrollbars,status,toolbar,dialog=no", args);
+        w.openDialog("chrome://sunbird/content/calendar.xul", "calendar", "chrome,menubar,resizable,scrollbars,status,toolbar,dialog=no", args);
     }
 }
 
 /* content handler factory object (ICALContentHandler) */
 var ICALContentHandlerFactory = new Object();
 
 ICALContentHandlerFactory.createInstance =
 function (outer, iid) {
--- a/calendar/resources/content/calendarWindow.js
+++ b/calendar/resources/content/calendarWindow.js
@@ -53,17 +53,17 @@ function CalendarWindow() {
 }
 
 CalendarWindow.prototype.pickAndGoToDate = function calWin_pickAndGoToDate() {
   var initialDate = currentView().selectedDay.getInTimezone(floating()).jsDate;
   var callback = function receiveAndGoToDate(pickedDate) {
     currentView().goToDay(jsDateToDateTime(pickedDate));
     getMinimonth().value = pickedDate;
   };
-  openDialog("chrome://calendar/content/calendar-gotodate-dialog.xul",
+  openDialog("chrome://sunbird/content/calendar-gotodate-dialog.xul",
              "calendar-gotodate-dialog",
              "chrome,modal",
              {callback: callback, date: initialDate});
 }
 
 CalendarWindow.prototype.goToDay = function calWin_goToDay(newDate) {
     var view = document.getElementById("view-deck").selectedPanel;
     var cdt = Components.classes["@mozilla.org/calendar/datetime;1"]
--- a/calendar/resources/jar.mn
+++ b/calendar/resources/jar.mn
@@ -1,26 +1,27 @@
+#filter substitution
 calendar.jar:
 % content calendar %content/calendar/
-    content/calendar/calendar.js (content/calendar.js)
-    content/calendar/calendarWindow.js (content/calendarWindow.js)
-    content/calendar/calendarCreation.xul (content/calendarCreation.xul)
-    content/calendar/calendarCreation.js (content/calendarCreation.js)
-    content/calendar/clipboard.js (content/clipboard.js)
-*   content/calendar/printDialog.js  (content/printDialog.js)    
-    content/calendar/printDialog.xul  (content/printDialog.xul)
-    content/calendar/publish.js  (content/publish.js)
-    content/calendar/publishDialog.js  (content/publishDialog.js)    
-    content/calendar/publishDialog.xul  (content/publishDialog.xul)
-    content/calendar/mouseoverPreviews.js (content/mouseoverPreviews.js)
-    content/calendar/sound.wav  (content/sound.wav)
-    content/calendar/datetimepickers/datetimepickers.css (content/datetimepickers/datetimepickers.css)
-*   content/calendar/datetimepickers/datetimepickers.xml (content/datetimepickers/datetimepickers.xml)
-    content/calendar/preferences/advanced.js      (/calendar/base/content/preferences/advanced.js)
-*   content/calendar/preferences/advanced.xul     (/calendar/base/content/preferences/advanced.xul)
-*   content/calendar/preferences/connection.xul   (/calendar/base/content/preferences/connection.xul)
-    content/calendar/preferences/connection.js    (/calendar/base/content/preferences/connection.js)
-*   content/calendar/preferences/preferences.xul  (/calendar/base/content/preferences/preferences.xul)
-% skin calendar classic/1.0 %skin/classic/calendar/
-    skin/classic/calendar/dialogOverlay.css (skin/classic/dialogOverlay.css)
-    skin/classic/calendar/datetimepickers/datetimepickers.css (skin/classic/datetimepickers/datetimepickers.css)
-#expand    skin/classic/calendar/preferences/Options.png  (/calendar/base/themes/__THEME__/preferences/Options.png)
-#expand    skin/classic/calendar/preferences/preferences.css  (/calendar/base/themes/__THEME__/preferences/preferences.css)
+    content/calendar/calendar.js                           (content/calendar.js)
+    content/calendar/calendarWindow.js                     (content/calendarWindow.js)
+    content/calendar/calendarCreation.xul                  (content/calendarCreation.xul)
+    content/calendar/calendarCreation.js                   (content/calendarCreation.js)
+    content/calendar/clipboard.js                          (content/clipboard.js)
+*   content/calendar/printDialog.js                        (content/printDialog.js)    
+    content/calendar/printDialog.xul                       (content/printDialog.xul)
+    content/calendar/publish.js                            (content/publish.js)
+    content/calendar/publishDialog.js                      (content/publishDialog.js)    
+    content/calendar/publishDialog.xul                     (content/publishDialog.xul)
+    content/calendar/mouseoverPreviews.js                  (content/mouseoverPreviews.js)
+    content/calendar/sound.wav                             (content/sound.wav)
+    content/calendar/datetimepickers/datetimepickers.css   (content/datetimepickers/datetimepickers.css)
+*   content/calendar/datetimepickers/datetimepickers.xml   (content/datetimepickers/datetimepickers.xml)
+    content/calendar/preferences/advanced.js               (/calendar/base/content/preferences/advanced.js)
+*   content/calendar/preferences/advanced.xul              (/calendar/base/content/preferences/advanced.xul)
+*   content/calendar/preferences/connection.xul            (/calendar/base/content/preferences/connection.xul)
+    content/calendar/preferences/connection.js             (/calendar/base/content/preferences/connection.js)
+*   content/calendar/preferences/preferences.xul           (/calendar/base/content/preferences/preferences.xul)
+% skin calendar classic/1.0 %skin/calendar/
+    skin/calendar/dialogOverlay.css                        (skin/classic/dialogOverlay.css)
+    skin/calendar/datetimepickers/datetimepickers.css      (skin/classic/datetimepickers/datetimepickers.css)
+    skin/calendar/preferences/Options.png                  (/calendar/base/themes/@THEME@/preferences/Options.png)
+    skin/calendar/preferences/preferences.css              (/calendar/base/themes/@THEME@/preferences/preferences.css)
--- a/calendar/sunbird/Makefile.in
+++ b/calendar/sunbird/Makefile.in
@@ -39,17 +39,17 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = base themes locales app
+DIRS = base locales app
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_INSTALLER
 DIRS += ../installer/windows
 
 ifdef MOZ_BRANDING_DIRECTORY
 DEFINES += -DOFFICIAL_BRANDING=1
 endif
--- a/calendar/sunbird/app/profile/sunbird.js
+++ b/calendar/sunbird/app/profile/sunbird.js
@@ -70,18 +70,18 @@ pref("calendar.previousweeks.inview", 0)
 pref("calendar.allday.defaultTransparency", "TRANSPARENT");
 
 // whether CalDAV (experimental) scheduling is enabled or not.
 pref("calendar.caldav.sched.enabled", false);
 
 // pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties");
 pref("general.startup.calendar", true);
 
-pref("toolkit.defaultChromeURI","chrome://calendar/content/");
-pref("browser.hiddenWindowChromeURL", "chrome://calendar/content/hiddenWindow.xul");
+pref("toolkit.defaultChromeURI","chrome://sunbird/content/calendar.xul");
+pref("browser.hiddenWindowChromeURL", "chrome://sunbird/content/hiddenWindow.xul");
 
 pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
 pref("xpinstall.dialog.progress", "chrome://mozapps/content/downloads/downloads.xul");
 pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul");
 pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul");
 pref("xpinstall.dialog.progress.type.skin", "Extension:Manager");
 pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager");
 pref("xpinstall.whitelist.add", "update.mozilla.org");
--- a/calendar/sunbird/base/Makefile.in
+++ b/calendar/sunbird/base/Makefile.in
@@ -38,18 +38,31 @@
 DEPTH   = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
-DEFINES += -DAPP_VERSION="$(APP_VERSION)"
+
+# Select a theme from which to pull our skin goodness
+# OS X: pinstripe
+# Others: winstripe
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+THEME = pinstripe
+else
+THEME = winstripe
+endif
+
+DEFINES += \
+    -DAPP_VERSION="$(APP_VERSION)" \
+    -DTHEME=$(THEME) \
+    $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 ifndef MOZ_BRANDING_DIRECTORY
 DEFINES += -DMOZ_USE_GENERIC_BRANDING
 endif
-
--- a/calendar/sunbird/base/content/aboutDialog.js
+++ b/calendar/sunbird/base/content/aboutDialog.js
@@ -64,17 +64,17 @@ function uninit(aEvent)
 function switchPage(aEvent)
 {
   var button = aEvent.target;
   if (button.localName != "button")
     return;
 
   var iframe = document.getElementById("creditsIframe");
   if (gSelectedPage == 0) { 
-    iframe.setAttribute("src", "chrome://calendar/content/credits.xhtml");
+    iframe.setAttribute("src", "chrome://sunbird/content/credits.xhtml");
     button.setAttribute("label", document.documentElement.getAttribute("aboutlabel"));
     button.setAttribute("accesskey", document.documentElement.getAttribute("aboutaccesskey"));
     gSelectedPage = 1;
   }
   else {
     iframe.setAttribute("src", ""); 
     button.setAttribute("label", document.documentElement.getAttribute("creditslabel"));
     button.setAttribute("accesskey", document.documentElement.getAttribute("creditsaccesskey"));
--- a/calendar/sunbird/base/content/aboutDialog.xul
+++ b/calendar/sunbird/base/content/aboutDialog.xul
@@ -35,22 +35,22 @@
 # and other provisions required by the LGPL or the GPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/content/aboutDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://sunbird/content/aboutDialog.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
-<!ENTITY % aboutDialogDTD SYSTEM "chrome://calendar/locale/aboutDialog.dtd" >
+<!ENTITY % aboutDialogDTD SYSTEM "chrome://sunbird/locale/aboutDialog.dtd" >
 %aboutDialogDTD;
 ]>
 
 <dialog xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="aboutDialog"
         onload="init(event);" onunload="uninit(event);"
 #ifdef XP_MACOSX
@@ -61,30 +61,30 @@
         buttons="accept,extra2"
 #endif
         creditslabel="&copyright.label;"
         creditsaccesskey="&copyright.accesskey;"
         aboutlabel="&aboutLink.label;"
         aboutaccesskey="&aboutLink.accesskey;"
         style="width: 299px;height: 435px;">
 
-  <script type="application/javascript" src="chrome://calendar/content/aboutDialog.js"/>
+  <script type="application/javascript" src="chrome://sunbird/content/aboutDialog.js"/>
 
   <deck id="modes" flex="1">
     <vbox flex="1" id="clientBox">
 #expand <label id="version" value="&aboutVersion; __APP_VERSION__"/>
       <description id="copyright">&copyrightText;</description>
       <vbox id="detailsBox" align="center" flex="1">
         <spacer flex="1"/>
         <textbox flex="1" id="userAgent" multiline="true" readonly="true" cols="60"/>
       </vbox>
     </vbox>
     <vbox flex="1" id="creditsBox">
       <html:iframe style="border: 0px;" id="creditsIframe" 
-                   src="chrome://calendar/content/credits.xhtml" flex="1"/>
+                   src="chrome://sunbird/content/credits.xhtml" flex="1"/>
     </vbox>
   </deck>
   <separator class="groove" id="groove"/>
 
 # manually add Cmd+W until we add a menubar on mac
 #ifdef XP_MACOSX
   <keyset id="mainKeyset">
     <key id="keyClose"
--- a/calendar/sunbird/base/content/calendar.xul
+++ b/calendar/sunbird/base/content/calendar.xul
@@ -44,17 +44,17 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Style sheets -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://sunbird/skin/calendar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-toolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/minimonth.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-view-bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
 
--- a/calendar/sunbird/base/content/credits.xhtml
+++ b/calendar/sunbird/base/content/credits.xhtml
@@ -1,52 +1,51 @@
-<!-- -*- Mode: HTML; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Firefox Credits.
-#
-# The Initial Developer of the Original Code is Ben Goodger.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Ben Goodger <ben@mozilla.org>
-#   David Baron <dbaron@mozilla.org>
-#
-# 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
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
--->
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Firefox Credits code.
+   -
+   - The Initial Developer of the Original Code is Ben Goodger.
+   - Portions created by the Initial Developer are Copyright (C) 2004
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Ben Goodger <ben@mozilla.org>
+   -   David Baron <dbaron@mozilla.org>
+   -
+   - 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
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
                       "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
   [
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
-    <!ENTITY % creditsDTD SYSTEM "chrome://calendar/locale/aboutDialog.dtd">
+    <!ENTITY % creditsDTD SYSTEM "chrome://sunbird/locale/aboutDialog.dtd">
     %creditsDTD;
     <!ENTITY % licenseDTD SYSTEM "chrome://global/locale/license.dtd">
     %licenseDTD;
   ]
 >
 
 
 <html xmlns="http://www.w3.org/1999/xhtml">
old mode 100755
new mode 100644
--- a/calendar/sunbird/base/content/sunbird-scripts.inc
+++ b/calendar/sunbird/base/content/sunbird-scripts.inc
@@ -38,21 +38,21 @@
 # and other provisions required by the LGPL or the GPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 #ifdef XP_MACOSX
   <!-- Needed for Mac OS X "Window" menu -->
-  <script type="application/javascript" src="chrome://calendar/content/hiddenWindow.js"/>
+  <script type="application/javascript" src="chrome://sunbird/content/hiddenWindow.js"/>
 #endif
 
   <script type="application/javascript" src="chrome://calendar/content/calendar.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendarWindow.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-offline.js"/>
+  <script type="application/javascript" src="chrome://sunbird/content/calendar-offline.js"/>
   <script type="application/javascript" src="chrome://calendar/content/migration.js"/>
 
   <!-- NEEDED FOR APPLICATION SUPPORT -->
-  <script type="application/javascript" src="chrome://calendar/content/applicationUtil.js"/>
+  <script type="application/javascript" src="chrome://sunbird/content/applicationUtil.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calApplicationUtils.js"/>
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
old mode 100755
new mode 100644
--- a/calendar/sunbird/base/jar.mn
+++ b/calendar/sunbird/base/jar.mn
@@ -1,23 +1,26 @@
-calendar.jar:
-% content calendar %content/calendar/
-*  content/calendar/aboutDialog.css              (content/aboutDialog.css)
-*  content/calendar/aboutDialog.js               (content/aboutDialog.js)
-*  content/calendar/aboutDialog.xul              (content/aboutDialog.xul)
-*  content/calendar/calendar.xul                 (content/calendar.xul)
-   content/calendar/calendar-gotodate-dialog.xul (content/calendar-gotodate-dialog.xul)
-   content/calendar/calendar-offline.js          (content/calendar-offline.js)
-*  content/calendar/credits.xhtml                (content/credits.xhtml)
-   content/calendar/applicationUtil.js           (content/applicationUtil.js)
-% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar.css
+#filter substitution
+sunbird.jar:
+% content sunbird %content/sunbird/
+% style chrome://global/content/customizeToolbar.xul chrome://sunbird/skin/calendar.css
 % style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-toolbar.css
-*  content/calendar/hiddenWindow.xul             (content/hiddenWindow.xul)
-*  content/calendar/hiddenWindow.js              (content/hiddenWindow.js)
+*   content/sunbird/aboutDialog.css                        (content/aboutDialog.css)
+    content/sunbird/aboutDialog.js                         (content/aboutDialog.js)
+*   content/sunbird/aboutDialog.xul                        (content/aboutDialog.xul)
+    content/sunbird/applicationUtil.js                     (content/applicationUtil.js)
+*   content/sunbird/calendar.xul                           (content/calendar.xul)
+    content/sunbird/calendar-gotodate-dialog.xul           (content/calendar-gotodate-dialog.xul)
+    content/sunbird/calendar-offline.js                    (content/calendar-offline.js)
+    content/sunbird/credits.xhtml                          (content/credits.xhtml)
+*   content/sunbird/hiddenWindow.xul                       (content/hiddenWindow.xul)
+*   content/sunbird/hiddenWindow.js                        (content/hiddenWindow.js)
+% skin sunbird classic/1.0 %skin/sunbird/
+    skin/sunbird/calendar.css                              (themes/@THEME@/calendar.css)
+    skin/sunbird/offline-online.png                        (themes/@THEME@/offline-online.png)
 #ifdef MOZ_USE_GENERIC_BRANDING
-#   NOTE: xpcnativewrappers=yes became the default in Gecko 1.8.1
-% content branding %content/branding/ xpcnativewrappers=yes
-    content/branding/about.png                   (branding/about.png)
-    content/branding/aboutCredits.png            (branding/aboutCredits.png)
-    content/branding/aboutFooter.png             (branding/aboutFooter.png)
-    content/branding/icon64.png                  (branding/icon64.png)
-    content/branding/icon48.png                  (branding/icon48.png)
+% content branding %content/branding/
+    content/branding/about.png                             (branding/about.png)
+    content/branding/aboutCredits.png                      (branding/aboutCredits.png)
+    content/branding/aboutFooter.png                       (branding/aboutFooter.png)
+    content/branding/icon64.png                            (branding/icon64.png)
+    content/branding/icon48.png                            (branding/icon48.png)
 #endif
rename from calendar/sunbird/themes/pinstripe/sunbird/calendar.css
rename to calendar/sunbird/base/themes/pinstripe/calendar.css
--- a/calendar/sunbird/themes/pinstripe/sunbird/calendar.css
+++ b/calendar/sunbird/base/themes/pinstripe/calendar.css
@@ -102,15 +102,15 @@ toolbarbutton.chevron > .toolbarbutton-m
 toolbar[printpreview="true"] {
   -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar");
 }
 
 /*--------------------------------------------------------------------
  * Offline Status
  *-------------------------------------------------------------------*/
 #offline-status {
-    list-style-image: url(chrome://calendar/skin/offline-online.png);
+    list-style-image: url(chrome://sunbird/skin/offline-online.png);
     -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 #offline-status[offline="true"] {
     -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
rename from calendar/sunbird/themes/pinstripe/sunbird/icon.png
rename to calendar/sunbird/base/themes/pinstripe/icon.png
rename from calendar/sunbird/themes/pinstripe/sunbird/offline-online.png
rename to calendar/sunbird/base/themes/pinstripe/offline-online.png
rename from calendar/sunbird/themes/pinstripe/sunbird/preview.png
rename to calendar/sunbird/base/themes/pinstripe/preview.png
rename from calendar/sunbird/themes/winstripe/sunbird/calendar.css
rename to calendar/sunbird/base/themes/winstripe/calendar.css
--- a/calendar/sunbird/themes/winstripe/sunbird/calendar.css
+++ b/calendar/sunbird/base/themes/winstripe/calendar.css
@@ -64,44 +64,43 @@
 #navigator-throbber {
   -moz-appearance: none;
   -moz-user-focus: ignore;
   margin: 0 !important;
   border: none !important;
   padding: 0px !important;
   min-width: 0;
   background-color: transparent;
-  list-style-image: url('chrome://calendar/skin/Throbber.png');
+  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
 }
 
 #navigator-throbber[busy="true"] {
-  list-style-image: url('chrome://calendar/skin/Throbber.gif');
-  opacity: 0.5;
+  list-style-image: url("chrome://global/skin/icons/loading_16.gif");
 }
 
 toolbar[iconsize="small"] #navigator-throbber {
-  list-style-image: url('chrome://global/skin/throbber/Throbber-small.png');
+  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
 }
 
 toolbar[iconsize="small"] #navigator-throbber[busy="true"] {
-  list-style-image: url('chrome://global/skin/throbber/Throbber-small.gif');
+  list-style-image: url("chrome://global/skin/icons/loading_16.gif");
 }
 
 /*--------------------------------------------------------------------
  * print preview
  *-------------------------------------------------------------------*/
 toolbar[printpreview="true"] {
   -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar");
 }
 
 /*--------------------------------------------------------------------
  * Offline Status
  *-------------------------------------------------------------------*/
 
 #offline-status {
-    list-style-image: url(chrome://calendar/skin/offline-online.png);
+    list-style-image: url(chrome://sunbird/skin/offline-online.png);
     -moz-image-region: rect(0px, 28px, 14px, 14px);
     padding: 0px 2px;
 }
 
 #offline-status[offline="true"] {
     -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
rename from calendar/sunbird/themes/winstripe/sunbird/icon.png
rename to calendar/sunbird/base/themes/winstripe/icon.png
rename from calendar/sunbird/themes/winstripe/sunbird/offline-online.png
rename to calendar/sunbird/base/themes/winstripe/offline-online.png
rename from calendar/sunbird/themes/winstripe/sunbird/preview.png
rename to calendar/sunbird/base/themes/winstripe/preview.png
--- a/calendar/sunbird/locales/jar.mn
+++ b/calendar/sunbird/locales/jar.mn
@@ -2,14 +2,14 @@
 
 #ifdef MOZ_USE_GENERIC_BRANDING
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 +   locale/branding/brand.dtd                    (%chrome/branding/brand.dtd)
 +   locale/branding/brand.properties             (%chrome/branding/brand.properties)
 #endif
 
-calendar-@AB_CD@.jar:
-% locale calendar @AB_CD@ %locale/@AB_CD@/calendar/
-*   locale/@AB_CD@/calendar/aboutDialog.dtd      (%chrome/calendar/aboutDialog.dtd)
+sunbird-@AB_CD@.jar:
+% locale sunbird @AB_CD@ %locale/@AB_CD@/sunbird/
+    locale/@AB_CD@/sunbird/aboutDialog.dtd       (%chrome/sunbird/aboutDialog.dtd)
 
 # Extra l10n files for documentation and such
 #includesubst @LOCALE_SRCDIR@/extra-jar.mn
deleted file mode 100644
--- a/calendar/sunbird/themes/LICENSE
+++ /dev/null
@@ -1,2 +0,0 @@
-All files in this directory are assumed to be licensed under the 
-tri-license (MPL/GPL/LGPL) used throughout this codebase.
\ No newline at end of file
deleted file mode 100644
--- a/calendar/sunbird/themes/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Browser code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Brian Ryner <bryner@brianryner.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
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-#
-# Theme Selection
-#
-# Windows, GNOME/Linux    Winstripe
-# MacOS X                 Pinstripe
-#
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-DIRS = pinstripe
-else
-DIRS = winstripe
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/calendar/sunbird/themes/pinstripe/Makefile.in
+++ /dev/null
@@ -1,46 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Browser code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = sunbird
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/calendar/sunbird/themes/pinstripe/sunbird/Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Browser code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/calendar/sunbird/themes/pinstripe/sunbird/contents.rdf
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is OEone Calendar Code, released October 31st, 2001.
-   -
-   - The Initial Developer of the Original Code is
-   - OEone Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - 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
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:sunbird"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:sunbird"
-    chrome:skinVersion="1.5"/>
-</RDF:RDF>
\ No newline at end of file
deleted file mode 100644
--- a/calendar/sunbird/themes/pinstripe/sunbird/jar.mn
+++ /dev/null
@@ -1,9 +0,0 @@
-calendar.jar:
-+  skin/classic/calendar/calendar.css
-   skin/classic/calendar/offline-online.png
-+  skin/classic/calendar/synch_animated.gif
-   skin/classic/calendar/cal-icon32.png         (/calendar/base/themes/pinstripe/cal-icon32.png)
-
-classic.jar:
-   icon.png
-   preview.png
deleted file mode 100644
index c038b0a52d8a6bc13ba165a98e5b0a6f130d189b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/calendar/sunbird/themes/winstripe/Makefile.in
+++ /dev/null
@@ -1,46 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Browser code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = sunbird
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/calendar/sunbird/themes/winstripe/sunbird/Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Browser code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
index deac700d4fc776933c8c82026dc246bfc50dceb2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a315da8bbf9be01340e8b18ee6ea5817bde0ff90..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/calendar/sunbird/themes/winstripe/sunbird/contents.rdf
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is OEone Calendar Code, released October 31st, 2001.
-   -
-   - The Initial Developer of the Original Code is
-   - OEone Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - 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
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- Classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:calendar"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-  
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:calendar"
-                   chrome:skinVersion="1.5"/>
-</RDF:RDF>
deleted file mode 100644
--- a/calendar/sunbird/themes/winstripe/sunbird/jar.mn
+++ /dev/null
@@ -1,10 +0,0 @@
-calendar.jar:
-+  skin/classic/calendar/calendar.css
-   skin/classic/calendar/offline-online.png
-   skin/classic/calendar/Throbber.png
-   skin/classic/calendar/Throbber.gif
-   skin/classic/calendar/cal-icon32.png         (/calendar/base/themes/winstripe/cal-icon32.png)
-
-classic.jar:
-   icon.png
-   preview.png