wok-next rev 20132

Patch midori for new vala.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Oct 31 15:24:24 2017 +0200 (2017-10-31)
parents 4f615ac29298
children c12ed7fac2f7
files midori/stuff/patches/series midori/stuff/patches/vala.patch
line diff
     1.1 --- a/midori/stuff/patches/series	Tue Oct 31 13:33:57 2017 +0100
     1.2 +++ b/midori/stuff/patches/series	Tue Oct 31 15:24:24 2017 +0200
     1.3 @@ -1,2 +1,3 @@
     1.4  search.patch
     1.5  desktops.patch
     1.6 +vala.patch
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/midori/stuff/patches/vala.patch	Tue Oct 31 15:24:24 2017 +0200
     2.3 @@ -0,0 +1,78 @@
     2.4 +The current vala doesn't forgive the mistakes...
     2.5 +Thanks Archlinux team!
     2.6 +
     2.7 +--- a/midori/midori-notebook.vala
     2.8 ++++ b/midori/midori-notebook.vala
     2.9 +@@ -22,7 +22,7 @@
    2.10 +         public bool close_button_left { get; set; default = false; }
    2.11 +         public bool close_button_visible { get; set; default = false; }
    2.12 + 
    2.13 +-        protected Tally (Midori.Tab tab) {
    2.14 ++        public Tally (Midori.Tab tab) {
    2.15 +             this.tab = tab;
    2.16 +             box = new Gtk.HBox (false, 1);
    2.17 +             add (box);
    2.18 +--- a/extensions/transfers.vala
    2.19 ++++ b/extensions/transfers.vala
    2.20 +@@ -275,7 +275,7 @@
    2.21 +                     Transfer found;
    2.22 +                     store.get (iter, 0, out found);
    2.23 +                     if (transfer == found) {
    2.24 +-                        store.remove (iter);
    2.25 ++                        store.remove (ref iter);
    2.26 +                         break;
    2.27 +                     }
    2.28 +                 } while (store.iter_next (ref iter));
    2.29 +@@ -455,7 +455,7 @@
    2.30 +                 if (notifications.length () == 1)
    2.31 +                     msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
    2.32 +                 else
    2.33 +-                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
    2.34 ++                    msg = _("'<b>%s</b>' and %u other files have been downloaded.").printf (filename, notifications.length ());
    2.35 +                 get_app ().send_notification (_("Transfer completed"), msg);
    2.36 +                 notifications = new GLib.List<string> ();
    2.37 +             }
    2.38 +--- a/extensions/adblock/widgets.vala
    2.39 ++++ b/extensions/adblock/widgets.vala
    2.40 +@@ -227,7 +227,7 @@
    2.41 +                             liststore.get (iter, 0, out sub);
    2.42 +                             if (sub.mutable) {
    2.43 +                                 config.remove (sub);
    2.44 +-                                liststore.remove (iter);
    2.45 ++                                liststore.remove (ref iter);
    2.46 +                                 return true;
    2.47 +                             }
    2.48 +                         }
    2.49 +--- a/extensions/apps.vala
    2.50 ++++ b/extensions/apps.vala
    2.51 +@@ -265,7 +265,7 @@
    2.52 +                             store.get (iter, 0, out launcher);
    2.53 +                             try {
    2.54 +                                 launcher.file.trash (null);
    2.55 +-                                store.remove (iter);
    2.56 ++                                store.remove (ref iter);
    2.57 + 
    2.58 +                                 string filename = Midori.Download.clean_filename (launcher.name);
    2.59 + #if HAVE_WIN32
    2.60 +--- a/extensions/history-list.vala
    2.61 ++++ b/extensions/history-list.vala
    2.62 +@@ -223,7 +223,7 @@
    2.63 +                     FixMe: the retrun value of `Gtk.ListStore.remove` should be checked
    2.64 +                     Note:  in some cases the return value of `Gtk.ListStore.remove` is wrong
    2.65 +                 */
    2.66 +-                model.remove (iter);
    2.67 ++                model.remove (ref iter);
    2.68 +                 this.browser.close_tab (view);
    2.69 +                 if (length > 2)
    2.70 +                     this.resize_treeview ();
    2.71 +--- a/extensions/notes.vala
    2.72 ++++ b/extensions/notes.vala
    2.73 +@@ -116,7 +116,7 @@
    2.74 +                     if (current_note == note) {
    2.75 +                         current_note = null;
    2.76 +                     }
    2.77 +-                    notes_list_store.remove (iter);
    2.78 ++                    notes_list_store.remove (ref iter);
    2.79 +                     break;
    2.80 +                 }
    2.81 +             } while (notes_list_store.iter_next (ref iter));