wok rev 17707

Up marlin: edit last patch (again)
author Yuri Pourre <yuripourre@gmail.com>
date Mon Mar 02 11:31:13 2015 -0300 (2015-03-02)
parents 2f27b6f8efc2
children 432b40f0a85f
files marlin/stuff/marlin-fix-tests.patch
line diff
     1.1 --- a/marlin/stuff/marlin-fix-tests.patch	Mon Mar 02 11:26:30 2015 -0300
     1.2 +++ b/marlin/stuff/marlin-fix-tests.patch	Mon Mar 02 11:31:13 2015 -0300
     1.3 @@ -1,44 +1,41 @@
     1.4 -# opened ticket at https://bugs.launchpad.net/marlin/+bug/1404153
     1.5 +# Opened ticket at https://bugs.launchpad.net/marlin/+bug/1404153
     1.6 +# Reference: http://valadoc.org/#!api=gdk-3.0/Gdk.EventKey
     1.7  diff -rupN marlin-0.5/libwidgets/tests/tests-pathbar.vala marlin-0.5-new/libwidgets/tests/tests-pathbar.vala
     1.8  --- marlin-0.5/libwidgets/tests/tests-pathbar.vala	2015-02-26 22:56:43.937906000 -0300
     1.9 -+++ marlin-0.5/libwidgets/tests/tests-pathbar.vala	2015-03-02 11:14:50.975590675 -0300
    1.10 -@@ -35,7 +35,8 @@ void add_pathbar_tests()
    1.11 ++++ marlin-0.5/libwidgets/tests/tests-pathbar.vala	2015-03-02 11:28:47.254657420 -0300
    1.12 +@@ -35,7 +35,7 @@ void add_pathbar_tests()
    1.13           var bread_entry = new BreadcrumbsEntry();
    1.14           assert(bread_entry is BreadcrumbsEntry);
    1.15           assert(bread_entry.text == "");
    1.16  -        Gdk.EventKey event = Gdk.EventKey();
    1.17 -+       	Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS);
    1.18 -+        Gdk.EventKey event = new Gdk.EventKey(e);
    1.19 ++        Gdk.EventKey event = new Gdk.EventKey(Gdk.EventType.KEY_PRESS);
    1.20           event.window = breads.get_window();
    1.21           event.keyval = 0x061; /* a */
    1.22           bread_entry.key_press_event(event);
    1.23 -@@ -122,7 +123,8 @@ void add_pathbar_tests()
    1.24 +@@ -122,7 +122,7 @@ void add_pathbar_tests()
    1.25           assert(bread_entry.text == "");
    1.26           bread_entry.text = "abdcefghij/";
    1.27           bread_entry.cursor = ("abdcefghij/").length;
    1.28  -        Gdk.EventKey event = Gdk.EventKey();
    1.29 -+        Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS);
    1.30 -+        Gdk.EventKey event = new Gdk.EventKey(e);
    1.31 ++        Gdk.EventKey event = new Gdk.EventKey(Gdk.EventType.KEY_PRESS);
    1.32           event.state = Gdk.ModifierType.SHIFT_MASK;
    1.33           event.window = breads.get_window();
    1.34           event.keyval = 0xff51; /* left */
    1.35 -@@ -136,7 +138,8 @@ void add_pathbar_tests()
    1.36 +@@ -136,7 +136,7 @@ void add_pathbar_tests()
    1.37           var bread_entry = new BreadcrumbsEntry();
    1.38           assert(bread_entry is BreadcrumbsEntry);
    1.39           assert(bread_entry.text == "");
    1.40  -        Gdk.EventKey event = Gdk.EventKey();
    1.41 -+        Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS);
    1.42 -+        Gdk.EventKey event = new Gdk.EventKey(e);
    1.43 ++        Gdk.EventKey event = new Gdk.EventKey(Gdk.EventType.KEY_PRESS);
    1.44           event.window = breads.get_window();
    1.45           event.keyval = 0xff08; /* backspace */
    1.46           bread_entry.key_press_event(event);
    1.47 -@@ -149,7 +152,8 @@ void add_pathbar_tests()
    1.48 +@@ -149,7 +149,7 @@ void add_pathbar_tests()
    1.49           BreadcrumbsEntry bread_entry = breads.entry;
    1.50           assert(bread_entry is BreadcrumbsEntry);
    1.51           assert(bread_entry.text == "");
    1.52  -        Gdk.EventKey event = Gdk.EventKey();
    1.53 -+        Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS);
    1.54 -+        Gdk.EventKey event = new Gdk.EventKey(e);
    1.55 ++        Gdk.EventKey event = new Gdk.EventKey(Gdk.EventType.KEY_PRESS);
    1.56           event.window = breads.get_window();
    1.57           event.keyval = 0xff08; /* backspace */
    1.58           breads.key_press_event(event);