Closed Bug 1001985 Opened 5 years ago Closed 5 years ago

Fix lightning skin on non-linux unix oses after bug 882761

Categories

(Calendar :: Lightning Only, defect)

x86_64
OpenBSD
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: gaston, Assigned: gaston)

References

Details

Attachments

(3 files)

Bug 882761 shuffled skins around for tier1 platforms, enforcing os=Linux for chrome/skin/linux/lightning/ and chrome/skin/linux/calendar/ in jar.mn files.

This breaks the calendar display on non-linux oses like the BSDs - as discussed on IRC, removing the os=Linux enforcement might be a fix - after testing with seamonkey 2.26b2 and lightning 3.1, it actually fixes the issue. patch in a few.


diff between broken and working chrome.manifest:

--- /usr/local/lib/seamonkey-2.26/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest     Sun Apr 27 10:57:44 2014
+++ /usr/local/lib/seamonkey-2.26/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest.orig        Sun Apr 27 10:57:27 2014
@@ -44,7 +44,7 @@
 manifest components/calImportExportModule.manifest
 locale calendar en-US jar:chrome/calendar-en-US.jar!/locale/en-US/calendar/
 overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/suite-overlay-sidebar.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-skin lightning classic/1.0 chrome/skin/linux/lightning/ os=Linux
+skin lightning classic/1.0 chrome/skin/linux/lightning/
 skin calendar-windows classic/1.0 chrome/skin/windows/calendar/win-aero/ os=WINNT osversion>=6
 overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/views.xul
 manifest components/calDefaultACLManager.manifest
@@ -63,4 +63,4 @@
 overlay about:addons chrome://lightning/content/suite-overlay-addons.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://lightning/content/lightning-calendar-properties.xul
 style chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://calendar-windows/skin/calendar-event-dialog.css os=WINNT
-skin calendar classic/1.0 chrome/skin/linux/calendar/ os=Linux
+skin calendar classic/1.0 chrome/skin/linux/calendar/
Attached image broken display
Assignee: nobody → landry
Attached patch remove os=LinuxSplinter Review
Attachment #8413339 - Flags: review?(richard.marti)
Blocks: 882761
Status: NEW → ASSIGNED
Comment on attachment 8413339 [details] [diff] [review]
remove os=Linux

Review of attachment 8413339 [details] [diff] [review]:
-----------------------------------------------------------------

Tested on Linux and Windows, so OS X should also work.

Luckily this works because the jar.mn parser sorts the alphabetically and bug 891476 isn't desperately needed.

Using the Linux theme as default works for all platforms which support GTK icons. I don't know if OS/2 is still supported, but here this would fail and maybe a special workaround would be needed.
Attachment #8413339 - Flags: review?(richard.marti) → review+
A bit lost in the versions, dunno what version lightning has in c-c..
Status: ASSIGNED → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → 3.3
You need to log in before you can comment on or make changes to this bug.