diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
commit | 709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch) | |
tree | 496b2f3899e1d5728ee9ae76095cc5056c317447 /src/Thumbnail.vala | |
parent | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff) | |
parent | 5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff) |
Merge branch 'release/0.28.3-1'0.28.3-1
Diffstat (limited to 'src/Thumbnail.vala')
-rw-r--r-- | src/Thumbnail.vala | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Thumbnail.vala b/src/Thumbnail.vala index 2fe28e8..17dda4b 100644 --- a/src/Thumbnail.vala +++ b/src/Thumbnail.vala @@ -119,8 +119,6 @@ public class Thumbnail : MediaSourceItem { clear_title(); else if (!init) set_title(title); - else - set_title(""); } private void update_comment(bool init = false) { @@ -129,8 +127,6 @@ public class Thumbnail : MediaSourceItem { clear_comment(); else if (!init) set_comment(comment); - else - set_comment(""); } protected override void notify_altered(Alteration alteration) { @@ -198,12 +194,11 @@ public class Thumbnail : MediaSourceItem { public static int64 filename_ascending_comparator(void *a, void *b) { string path_a = ((Thumbnail *) a)->media.get_file().get_basename().down(); string path_b = ((Thumbnail *) b)->media.get_file().get_basename().down(); - - int64 result = strcmp(g_utf8_collate_key_for_filename(path_a), - g_utf8_collate_key_for_filename(path_b)); + + int64 result = strcmp(path_a.collate_key_for_filename(), path_b.collate_key_for_filename()); return (result != 0) ? result : photo_id_ascending_comparator(a, b); } - + public static int64 filename_descending_comparator(void *a, void *b) { int64 result = filename_ascending_comparator(b, a); |