Merge branch 'release/debian/0.30.1-1'debian/0.30.1-1

1 files changed, 11 insertions, 5 deletions

diff --git a/src/Thumbnail.vala b/src/Thumbnail.vala
index 17dda4b..f47fc69 100644
--- a/src/Thumbnail.vala
+++ b/src/Thumbnail.vala
@@ -57,8 +57,7 @@ public class Thumbnail : MediaSourceItem {
         Tag.global.items_altered.connect(on_tags_altered);
         
         assert((media is LibraryPhoto) || (media is Video));
-        set_enable_sprockets(media is Video);
-        
+
         original_dim = media.get_dimensions();
         dim = original_dim.get_scaled(scale, true);
         
@@ -378,12 +377,15 @@ public class Thumbnail : MediaSourceItem {
         
         base.unexposed();
     }
-    
+
     protected override Gdk.Pixbuf? get_top_right_trinket(int scale) {
         Flaggable? flaggable = media as Flaggable;
         
-        return (flaggable != null && flaggable.is_flagged())
-            ? Resources.get_icon(Resources.ICON_FLAGGED_TRINKET) : null;
+        if (!(flaggable != null && flaggable.is_flagged()))
+            return null;
+
+        return Resources.get_flagged_trinket(scale);
+
     }
     
     protected override Gdk.Pixbuf? get_bottom_left_trinket(int scale) {
@@ -393,4 +395,8 @@ public class Thumbnail : MediaSourceItem {
         return (rating != Rating.UNRATED && show_ratings)
             ? Resources.get_rating_trinket(rating, scale) : null;
     }
+
+    protected override Gdk.Pixbuf? get_top_left_trinket(int scale) {
+        return (media is Video) ? Resources.get_video_trinket (scale) : null;
+    }
 }