307685 - Trim down calendar.jar for Sunbird

Status: VERIFIED FIXED

(Calendar :: Sunbird Only, defect)

Description

[Simon Paquet [:sipaq]]

Calendar.jar contains a lot of files, that aren't used by Sunbird and should
therefore by removed from it, mostly by using #ifndef MOZ_SUNBIRD.

This would reduce the filesize of calendar.jar by 131kb and reduce the download
size of the zip package by 72kb.

The relevant files are:

(Classic theme)
- sunbird_small.png
- btn1.png
- calendar16.gif
- taskbar-cal.gif
- taskbar-cal-act.gif
- taskbar-calalarm.gif
- taskbar-calalarm-act.gif
- Throbber-small.gif (is available via in mozilla/toolkit)
- Throbber-small.png (is available via in mozilla/toolkit)

(Modern theme)
all of it.

Patch coming soon to a bugzilla near you...

Comment 1

[Simon Paquet [:sipaq]]

prefBird.xul and prefBirdOverlay.xul are also extension-only.

Comment 2

[Simon Paquet [:sipaq]]

Attachment: patch v1

Comment 3

[Michiel van Leeuwen (email: mvl+moz@)]

I'm going to delay this until after the next release.

Comment 4

[Simon Paquet [:sipaq]]

Attachment: Patch v2

New patch after the new view landing

Comment 5

[Simon Paquet [:sipaq]]

Comment on attachment 207025 [details] [diff] [review]
Patch v2

I found an error in this patch.

Comment 6

[Simon Paquet [:sipaq]]

Attachment: Patch v3

Comment 7

[Simon Paquet [:sipaq]]

Attachment: Patch v4

I found some more stuff which can be left out.
Since this patch looks a little bit more complicated than it really is, here's a short overview:

- Removes modern theme from Sunbird
- Removes the following extension-only files from Sunbird
  - about.html
  - about.xul
  - sunbird_small.png
  - menuOverlay.xul
  - calExtOverlay.js
  - calExtOverlay.xul
  - calendarMail.js
  - prefBird.xul
  - prefBirdOverlay.xul
  - btn1.png
  - calendar-16.gif
  - taskbar-cal.gif
  - taskbar-cal-act.gif
  - taskbar-calalarm.gif
  - taskbar-calalarm-act.gif
  - btn1.png
- Uses the identical small throbber images from toolkit

Comment 8

[Michiel van Leeuwen (email: mvl+moz@)]

Can you create a new patch that doesn't move the lines around? (like the locale files) It makes the patch hard to read.

Comment 9

[Simon Paquet [:sipaq]]

Attachment: Alternative patch (for better readability)

As requested here's an alternative patch, which doesn't move the lines around. This should improve patch readability.

In case of a positive review, I would suggest to checkin the v4 patch, because all of the #ifdefs in the file look pretty ugly and make the code itself hard to read.

Comment 10

[Simon Paquet [:sipaq]]

Attachment: Patch v5

jar.mn with four #ifdef/#ifndef blocks as requested by mvl on IRC.

Comment 11

[Michiel van Leeuwen (email: mvl+moz@)]

Comment on attachment 207839 [details] [diff] [review]
Patch v5

looks good, but it will conflict with the patch from bug 281935, so we need to fix that first.

Comment 12

[Simon Paquet [:sipaq]]

Attachment: Patch v6

Patch updated to tip.

Comment 13

[Michiel van Leeuwen (email: mvl+moz@)]

Comment on attachment 208559 [details] [diff] [review]
Patch v6

looks good.
r=mvl

Comment 14

[Michiel van Leeuwen (email: mvl+moz@)]

patch checked in

Comment 15

[Simon Paquet [:sipaq]]

This reduced the windows ZIP package by 77K :-))

It also caused bug 323665 :-((

Comment 16

[Simon Paquet [:sipaq]]

mvl, if you find the time, can you please cvs remove the two obsolete files:

- Throbber-small.png
- Throbber-small.gif

in calendar/sunbird/themes/winstripe/sunbird. Those files were removed from jar.mn and calendar.css in the v6 patch.

Comment 17

[Matthew (lilmatt) Willis]

Those files have now been removed from cvs.