Unity HUD

Merge lp:~jbicha/hud/build-with-vala36 into lp:hud

  1. build-with-vala36
  2. Merge into trunk.15.10
Proposed by Jeremy Bícha
Status: Merged
Approved by: Robert Ancell
Approved revision: 413
Merged at revision: 413
Proposed branch: lp:~jbicha/hud/build-with-vala36
Merge into: lp:hud
Diff against target: 27 lines (+8/-0)
1 file modified
tools-vala/hud-gtk.vala (+8/-0)
To merge this branch: bzr merge lp:~jbicha/hud/build-with-vala36
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+325887@code.launchpad.net

Commit message

Build with vala 0.36

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

I've had fun fixing these in my own projects :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools-vala/hud-gtk.vala'
--- tools-vala/hud-gtk.vala 2013-08-16 06:27:45 +0000
+++ tools-vala/hud-gtk.vala 2017-06-18 00:46:59 +0000
@@ -44,7 +44,11 @@
44 Gtk.TreePath path = new Gtk.TreePath.from_string(spath);44 Gtk.TreePath path = new Gtk.TreePath.from_string(spath);
45 Gtk.TreeIter iter;45 Gtk.TreeIter iter;
46 model.get_iter(out iter, path);46 model.get_iter(out iter, path);
47#if VALA_0_36
48 model.remove(ref iter);
49#else
47 model.remove(iter);50 model.remove(iter);
51#endif
48 }52 }
4953
50 void appstack_results_row_added (Dee.Model results, Dee.ModelIter result_iter) {54 void appstack_results_row_added (Dee.Model results, Dee.ModelIter result_iter) {
@@ -65,7 +69,11 @@
65 Gtk.TreePath path = new Gtk.TreePath.from_string(spath);69 Gtk.TreePath path = new Gtk.TreePath.from_string(spath);
66 Gtk.TreeIter iter;70 Gtk.TreeIter iter;
67 appstack_model.get_iter(out iter, path);71 appstack_model.get_iter(out iter, path);
72#if VALA_0_36
73 appstack_model.remove(ref iter);
74#else
68 appstack_model.remove(iter);75 appstack_model.remove(iter);
76#endif
69 }77 }
7078
71 void entry_text_changed (Object object, ParamSpec pspec) {79 void entry_text_changed (Object object, ParamSpec pspec) {

Subscribers

People subscribed via source and target branches