diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-07-28 00:34:13 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-07-28 00:34:13 +0200 |
commit | e0b9e377f1822be434dc9eba516972979485694b (patch) | |
tree | bab3137a98d00f308a401095074829303f067059 /gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch | |
parent | 201c0e72768fa92e2035512e16c17c07f308815b (diff) | |
parent | fb2715720adfb770bccd37dd72b2bf1b0bc22e36 (diff) | |
download | guix-patches-e0b9e377f1822be434dc9eba516972979485694b.tar guix-patches-e0b9e377f1822be434dc9eba516972979485694b.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch')
-rw-r--r-- | gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch b/gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch new file mode 100644 index 0000000000..a03e0c5481 --- /dev/null +++ b/gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch @@ -0,0 +1,41 @@ +From 5676766be5e845ccb6cdf46cfa8722497f151752 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha <jbicha@ubuntu.com> +Date: Fri, 16 Jun 2017 15:11:37 -0400 +Subject: Use 'ref' keyword for iter, requires vala 0.36 + + +diff --git a/deja-dup/widgets/ConfigList.vala b/deja-dup/widgets/ConfigList.vala +index 15de2d6..02cd81a 100644 +--- a/deja-dup/widgets/ConfigList.vala ++++ b/deja-dup/widgets/ConfigList.vala +@@ -333,7 +333,7 @@ public class ConfigList : ConfigWidget + + model.row_deleted.disconnect(write_to_config); + foreach (Gtk.TreeIter iter in iters) { +- (model as Gtk.ListStore).remove(iter); ++ (model as Gtk.ListStore).remove(ref iter); + } + model.row_deleted.connect(write_to_config); + +diff --git a/deja-dup/widgets/ConfigLocation.vala b/deja-dup/widgets/ConfigLocation.vala +index 869e2a8..d21c556 100644 +--- a/deja-dup/widgets/ConfigLocation.vala ++++ b/deja-dup/widgets/ConfigLocation.vala +@@ -397,12 +397,12 @@ public class ConfigLocation : ConfigWidget + if (uuid == saved_uuid) + return; + +- store.remove(iter); ++ store.remove(ref iter); + + if (--num_volumes == 0) { + Gtk.TreeIter sep_iter; + if (store.get_iter_from_string(out sep_iter, index_vol_sep.to_string())) { +- store.remove(sep_iter); ++ store.remove(ref sep_iter); + index_vol_sep = -2; + } + } +-- +cgit v0.10.2 + |