File midori-fix-vala_0.35.patch of Package mingw32-midori

Overview Repositories Revisions Requests Users Attributes Meta

File midori-fix-vala_0.35.patch of Package mingw32-midori (Revision 8133873d7cb397f3c132bdcd07945841)

Currently displaying revision 8133873d7cb397f3c132bdcd07945841 , Show latest

Index: midori-0.5.11/extensions/transfers.vala
===================================================================
--- midori-0.5.11.orig/extensions/transfers.vala
+++ midori-0.5.11/extensions/transfers.vala
@@ -275,7 +275,7 @@ namespace Transfers {
 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 @@ namespace Transfers {
 if (notifications.length () == 1)
 msg = _("The file '%s' has been downloaded.").printf (filename);
 else
- msg = _("'%s' and %d other files have been downloaded.").printf (filename, notifications.length ());
+ msg = _("'%s' and %d other files have been downloaded.").printf (filename, (int) notifications.length ());
 get_app ().send_notification (_("Transfer completed"), msg);
 notifications = new GLib.List<string> ();
 }
Index: midori-0.5.11/midori/midori-notebook.vala
===================================================================
--- midori-0.5.11.orig/midori/midori-notebook.vala
+++ midori-0.5.11/midori/midori-notebook.vala
@@ -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 @@ namespace Midori {
 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 @@ namespace Midori {
 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
Index: midori-0.5.11/extensions/apps.vala
===================================================================
--- midori-0.5.11.orig/extensions/apps.vala
+++ midori-0.5.11/extensions/apps.vala
@@ -265,7 +265,7 @@ namespace Apps {
 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
Index: midori-0.5.11/extensions/history-list.vala
===================================================================
--- midori-0.5.11.orig/extensions/history-list.vala
+++ midori-0.5.11/extensions/history-list.vala
@@ -223,7 +223,7 @@ namespace HistoryList {
 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 ();
Index: midori-0.5.11/extensions/notes.vala
===================================================================
--- midori-0.5.11.orig/extensions/notes.vala
+++ midori-0.5.11/extensions/notes.vala
@@ -116,7 +116,7 @@ namespace ClipNotes {
 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));
Index: midori-0.5.11/extensions/adblock/widgets.vala
===================================================================
--- midori-0.5.11.orig/extensions/adblock/widgets.vala
+++ midori-0.5.11/extensions/adblock/widgets.vala
@@ -227,7 +227,7 @@ namespace Adblock {
 liststore.get (iter, 0, out sub);
 if (sub.mutable) {
 config.remove (sub);
- liststore.remove (iter);
+ liststore.remove (ref iter);
 return true;
 }
 }

Places

File midori-fix-vala_0.35.patch of Package mingw32-midori (Revision 8133873d7cb397f3c132bdcd07945841)

Places