Photos Lens

Merge lp:~davidc3/unity-lens-photos/fix-1057432 into lp:unity-lens-photos

  1. fix-1057432
  2. Merge into trunk
Proposed by David Callé
Status: Merged
Approved by: David Callé
Approved revision: 87
Merged at revision: 87
Proposed branch: lp:~davidc3/unity-lens-photos/fix-1057432
Merge into: lp:unity-lens-photos
Diff against target: 14 lines (+3/-1)
1 file modified
src/shotwell_scope.py (+3/-1)
To merge this branch: bzr merge lp:~davidc3/unity-lens-photos/fix-1057432
Reviewer Review Type Date Requested Status
David Callé Approve
Review via email: mp+126652@code.launchpad.net

Description of the change

Fallback on the actual file if Shotwell thumbnail is missing, before the image icon fallback.

To post a comment you must log in.
Revision history for this message
David Callé (davidc3) :
review: Approve

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-09-21 14:43:47 +0000
3+++ src/shotwell_scope.py 2012-09-27 10:08:22 +0000
4@@ -130,7 +130,9 @@
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 = "image"
9+ icon_hint = i[1]
10+ if not self.is_file (icon_hint):
11+ icon_hint = "image"
12 title = i[0]
13 comment = i[3]
14 uri = "file://"+i[1]

Subscribers

People subscribed via source and target branches

to all changes: