diff options
Diffstat (limited to 'www-client/midori/files/midori-0.5.11-vala-syntax.patch')
| -rw-r--r-- | www-client/midori/files/midori-0.5.11-vala-syntax.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/www-client/midori/files/midori-0.5.11-vala-syntax.patch b/www-client/midori/files/midori-0.5.11-vala-syntax.patch new file mode 100644 index 0000000..3d6c6c4 --- /dev/null +++ b/www-client/midori/files/midori-0.5.11-vala-syntax.patch @@ -0,0 +1,100 @@ +diff -ur midori-0.5.11.orig/extensions/adblock/widgets.vala midori-0.5.11/extensions/adblock/widgets.vala +--- midori-0.5.11.orig/extensions/adblock/widgets.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/adblock/widgets.vala 2017-09-30 01:07:04.033922383 +0200 +@@ -227,7 +227,7 @@ + liststore.get (iter, 0, out sub); + if (sub.mutable) { + config.remove (sub); +- liststore.remove (iter); ++ liststore.remove (ref iter); + return true; + } + } +diff -ur midori-0.5.11.orig/extensions/apps.vala midori-0.5.11/extensions/apps.vala +--- midori-0.5.11.orig/extensions/apps.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/apps.vala 2017-09-30 01:08:12.831916408 +0200 +@@ -265,7 +265,7 @@ + store.get (iter, 0, out launcher); + try { + launcher.file.trash (null); +- store.remove (iter); ++ store.remove (ref iter); + + string filename = Midori.Download.clean_filename (launcher.name); + #if HAVE_WIN32 +diff -ur midori-0.5.11.orig/extensions/history-list.vala midori-0.5.11/extensions/history-list.vala +--- midori-0.5.11.orig/extensions/history-list.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/history-list.vala 2017-09-30 01:10:25.137904917 +0200 +@@ -223,7 +223,7 @@ + FixMe: the retrun value of `Gtk.ListStore.remove` should be checked + Note: in some cases the return value of `Gtk.ListStore.remove` is wrong + */ +- model.remove (iter); ++ model.remove (ref iter); + this.browser.close_tab (view); + if (length > 2) + this.resize_treeview (); +diff -ur midori-0.5.11.orig/extensions/notes.vala midori-0.5.11/extensions/notes.vala +--- midori-0.5.11.orig/extensions/notes.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/notes.vala 2017-09-30 01:09:14.703911034 +0200 +@@ -116,7 +116,7 @@ + if (current_note == note) { + current_note = null; + } +- notes_list_store.remove (iter); ++ notes_list_store.remove (ref iter); + break; + } + } while (notes_list_store.iter_next (ref iter)); +diff -ur midori-0.5.11.orig/extensions/transfers.vala midori-0.5.11/extensions/transfers.vala +--- midori-0.5.11.orig/extensions/transfers.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/extensions/transfers.vala 2017-09-30 01:05:00.916933075 +0200 +@@ -275,7 +275,7 @@ + Transfer found; + store.get (iter, 0, out found); + if (transfer == found) { +- store.remove (iter); ++ store.remove (ref iter); + break; + } + } while (store.iter_next (ref iter)); +@@ -455,7 +455,7 @@ + if (notifications.length () == 1) + msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename); + else +- msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ()); ++ msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, (int) notifications.length ()); + get_app ().send_notification (_("Transfer completed"), msg); + notifications = new GLib.List<string> (); + } +diff -ur midori-0.5.11.orig/midori/midori-notebook.vala midori-0.5.11/midori/midori-notebook.vala +--- midori-0.5.11.orig/midori/midori-notebook.vala 2015-08-30 13:56:26.000000000 +0200 ++++ midori-0.5.11/midori/midori-notebook.vala 2017-09-30 00:49:47.947012362 +0200 +@@ -10,7 +10,7 @@ + */ + + namespace Midori { +- protected class Tally : Gtk.EventBox { ++ internal class Tally : Gtk.EventBox { + public Midori.Tab tab { get; set; } + Gtk.Spinner spinner; + public Gtk.Label label; +@@ -22,7 +22,7 @@ + public bool close_button_left { get; set; default = false; } + public bool close_button_visible { get; set; default = false; } + +- protected Tally (Midori.Tab tab) { ++ internal Tally (Midori.Tab tab) { + this.tab = tab; + box = new Gtk.HBox (false, 1); + add (box); +@@ -155,7 +155,7 @@ + int last_tab_size = 0; + + #if !HAVE_GTK3 +- static const string style_fixup = """ ++ const string style_fixup = """ + style "midori-close-button-style" + { + GtkWidget::focus-padding = 0 + |