Merge lp:~davidc3/unity-lens-photos/crw-and-friends into lp:unity-lens-photos

Proposed by David Callé
Status: Merged
Approved by: David Callé
Approved revision: 112
Merge reported by: David Callé
Merged at revision: not available
Proposed branch: lp:~davidc3/unity-lens-photos/crw-and-friends
Merge into: lp:unity-lens-photos
Diff against target: 19 lines (+6/-2)
1 file modified
src/shotwell_scope.py (+6/-2)
To merge this branch: bzr merge lp:~davidc3/unity-lens-photos/crw-and-friends
Reviewer Review Type Date Requested Status
Unity Photos Lens Pending
Review via email: mp+130753@code.launchpad.net

Commit message

Fix some RAW files showing up incorrectly. Thanks Andrew!

Description of the change

Fix some RAW files showing up incorrectly.

Before fallbacking to the standard "image" icon, this branch checks if there is a jpg Shotwell generated thumbnail matching the thumb id, regardless of the original file extension.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/shotwell_scope.py'
2--- src/shotwell_scope.py 2012-10-19 22:02:00 +0000
3+++ src/shotwell_scope.py 2012-10-22 08:47:21 +0000
4@@ -129,9 +129,13 @@
5 if not self.is_file (icon_hint):
6 icon_hint = THUMB_CACHE + "thumbs360/" + thumb_id + "." + extension
7 if not self.is_file (icon_hint):
8- icon_hint = i[1]
9+ icon_hint = THUMB_CACHE + "thumbs128/" + thumb_id + ".jpg"
10 if not self.is_file (icon_hint):
11- icon_hint = "image"
12+ icon_hint = THUMB_CACHE + "thumbs360/" + thumb_id + ".jpg"
13+ if not self.is_file (icon_hint):
14+ icon_hint = i[1]
15+ if not self.is_file (icon_hint):
16+ icon_hint = "image"
17 title = i[0]
18 comment = i[3]
19 uri = "file://"+i[1]

Subscribers

People subscribed via source and target branches

to all changes: