# HG changeset patch # User Yuri Pourre # Date 1425306390 10800 # Node ID 2f27b6f8efc26848bd21abfeec19632efa37b4fe # Parent b1b82780635a664969a76ede990cfd220da68063 Up marlin: edit last patch (again) diff -r b1b82780635a -r 2f27b6f8efc2 marlin/stuff/marlin-fix-tests.patch --- a/marlin/stuff/marlin-fix-tests.patch Mon Mar 02 06:32:17 2015 -0500 +++ b/marlin/stuff/marlin-fix-tests.patch Mon Mar 02 11:26:30 2015 -0300 @@ -1,39 +1,44 @@ # opened ticket at https://bugs.launchpad.net/marlin/+bug/1404153 ---- marlin-0.5/libwidgets/tests/tests-pathbar.vala -+++ marlin-0.5/libwidgets/tests/tests-pathbar.vala -@@ -35,7 +35,7 @@ +diff -rupN marlin-0.5/libwidgets/tests/tests-pathbar.vala marlin-0.5-new/libwidgets/tests/tests-pathbar.vala +--- marlin-0.5/libwidgets/tests/tests-pathbar.vala 2015-02-26 22:56:43.937906000 -0300 ++++ marlin-0.5/libwidgets/tests/tests-pathbar.vala 2015-03-02 11:14:50.975590675 -0300 +@@ -35,7 +35,8 @@ void add_pathbar_tests() var bread_entry = new BreadcrumbsEntry(); assert(bread_entry is BreadcrumbsEntry); assert(bread_entry.text == ""); - Gdk.EventKey event = Gdk.EventKey(); -+ Gdk.EventKey event = new Gdk.EventKey(); ++ Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS); ++ Gdk.EventKey event = new Gdk.EventKey(e); event.window = breads.get_window(); event.keyval = 0x061; /* a */ bread_entry.key_press_event(event); -@@ -122,7 +122,7 @@ +@@ -122,7 +123,8 @@ void add_pathbar_tests() assert(bread_entry.text == ""); bread_entry.text = "abdcefghij/"; bread_entry.cursor = ("abdcefghij/").length; - Gdk.EventKey event = Gdk.EventKey(); -+ Gdk.EventKey event = new Gdk.EventKey(); ++ Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS); ++ Gdk.EventKey event = new Gdk.EventKey(e); event.state = Gdk.ModifierType.SHIFT_MASK; event.window = breads.get_window(); event.keyval = 0xff51; /* left */ -@@ -136,7 +136,7 @@ +@@ -136,7 +138,8 @@ void add_pathbar_tests() var bread_entry = new BreadcrumbsEntry(); assert(bread_entry is BreadcrumbsEntry); assert(bread_entry.text == ""); - Gdk.EventKey event = Gdk.EventKey(); -+ Gdk.EventKey event = new Gdk.EventKey(); ++ Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS); ++ Gdk.EventKey event = new Gdk.EventKey(e); event.window = breads.get_window(); event.keyval = 0xff08; /* backspace */ bread_entry.key_press_event(event); -@@ -149,7 +149,7 @@ +@@ -149,7 +152,8 @@ void add_pathbar_tests() BreadcrumbsEntry bread_entry = breads.entry; assert(bread_entry is BreadcrumbsEntry); assert(bread_entry.text == ""); - Gdk.EventKey event = Gdk.EventKey(); -+ Gdk.EventKey event = new Gdk.EventKey(); ++ Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS); ++ Gdk.EventKey event = new Gdk.EventKey(e); event.window = breads.get_window(); event.keyval = 0xff08; /* backspace */ breads.key_press_event(event);