Commit 3b052fed authored by Jim Nelson's avatar Jim Nelson

Changed calls deprecated in Gee 0.5.2.

parent 599d686e
......@@ -176,7 +176,7 @@ public class DirectoryMonitor : Object {
if (!normalize_file(file, info, out normalized, out id))
return false;
return id_map.contains(id);
return id_map.has_key(id);
}
public string? get_id(File file, FileInfo? info) {
......@@ -876,7 +876,7 @@ public class DirectoryMonitor : Object {
return false;
// if one already exists, nop
if (monitors.contains(id))
if (monitors.has_key(id))
return false;
FileMonitor monitor = null;
......
......@@ -167,10 +167,10 @@ public class PixbufCache : Object {
// signal is fired.
public void prefetch(Photo photo,
BackgroundJob.JobPriority priority = BackgroundJob.JobPriority.NORMAL, bool force = false) {
if (!force && cache.contains(photo))
if (!force && cache.has_key(photo))
return;
if (in_progress.contains(photo))
if (in_progress.has_key(photo))
return;
if (filter != null && !filter(photo))
......@@ -259,7 +259,7 @@ public class PixbufCache : Object {
assert(photo != null);
// only interested if in this cache and not an originals cache, as they never alter
if (!cache.contains(photo) && type != PhotoType.MASTER)
if (!cache.has_key(photo) && type != PhotoType.MASTER)
return;
decache(photo);
......@@ -316,7 +316,7 @@ public class PixbufCache : Object {
}
private void decache(Photo photo) {
if (!cache.remove(photo)) {
if (!cache.unset(photo)) {
assert(!lru.contains(photo));
return;
......
......@@ -191,7 +191,7 @@ public class TagSourceCollection : ContainerSourceCollection {
assert(is_removed);
if (tags.size == 0)
photo_map.remove(photo);
photo_map.unset(photo);
Gee.SortedSet<Tag>? sorted_tags = sorted_photo_map.get(photo);
assert(sorted_tags != null);
......@@ -200,7 +200,7 @@ public class TagSourceCollection : ContainerSourceCollection {
assert(is_removed);
if (sorted_tags.size == 0)
sorted_photo_map.remove(photo);
sorted_photo_map.unset(photo);
}
base.notify_container_contents_removed(container, removed);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment