summaryrefslogtreecommitdiff
path: root/src/Thumbnail.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:35:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:35:32 +0200
commite230b6f78546827521107be23797048482c8b193 (patch)
tree948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/Thumbnail.vala
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parent49120f48474fc8fdc2448c75d961bc238213cfac (diff)
Update upstream source from tag 'upstream/0.28.2'
Update to upstream version '0.28.2' with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965
Diffstat (limited to 'src/Thumbnail.vala')
-rw-r--r--src/Thumbnail.vala11
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);