From 466b1a2167531d3d9e8c6dfa86bc74b904c335fd Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Mon, 20 Apr 2015 18:58:12 +0300 Subject: [PATCH] Avoid an ambiguous reference for Timeout object Explicitly use GLib.Timeout, not the Gtk.Timeout. --- lib/hypertextview.vala | 6 +++--- lib/note.vala | 2 +- lib/window-monitor.vala | 2 +- src/main-status-icon.vala | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/hypertextview.vala b/lib/hypertextview.vala index ffb2c64..199d590 100644 --- a/lib/hypertextview.vala +++ b/lib/hypertextview.vala @@ -201,13 +201,13 @@ namespace Xnp { Source.remove (this.undo_timeout); this.undo_timeout = 0; } - this.undo_timeout = Timeout.add_seconds (2, undo_snapshot); + this.undo_timeout = GLib.Timeout.add_seconds (2, undo_snapshot); /* Reinit tag_timeout as long as the buffer is under constant changes */ if (this.tag_timeout > 0) { Source.remove (this.tag_timeout); this.tag_timeout = 0; - this.tag_timeout = Timeout.add_seconds (2, tag_timeout_cb); + this.tag_timeout = GLib.Timeout.add_seconds (2, tag_timeout_cb); } } @@ -385,7 +385,7 @@ namespace Xnp { this.tag_timeout = 0; } - this.tag_timeout = Timeout.add_seconds (2, tag_timeout_cb); + this.tag_timeout = GLib.Timeout.add_seconds (2, tag_timeout_cb); } /** diff --git a/lib/note.vala b/lib/note.vala index 3d4266e..f7db558 100644 --- a/lib/note.vala +++ b/lib/note.vala @@ -42,7 +42,7 @@ namespace Xnp { this.save_timeout = 0; } else { - this.save_timeout = Timeout.add_seconds (60, save_cb); + this.save_timeout = GLib.Timeout.add_seconds (60, save_cb); } } } diff --git a/lib/window-monitor.vala b/lib/window-monitor.vala index b5a3dfa..75970c7 100644 --- a/lib/window-monitor.vala +++ b/lib/window-monitor.vala @@ -66,7 +66,7 @@ namespace Xnp { if (monitor_timeout != 0) { Source.remove (monitor_timeout); } - monitor_timeout = Timeout.add_seconds (5, () => { + monitor_timeout = GLib.Timeout.add_seconds (5, () => { window_updated (window); monitor_timeout = 0; return false; diff --git a/src/main-status-icon.vala b/src/main-status-icon.vala index 429b6d8..f1fe5b3 100644 --- a/src/main-status-icon.vala +++ b/src/main-status-icon.vala @@ -32,7 +32,7 @@ static void build_plugin () { application = new Xnp.Application (save_location); status_icon = new Gtk.StatusIcon.from_icon_name ("xfce4-notes-plugin"); status_icon.set_tooltip_text (_("Notes")); - Timeout.add_seconds (60, () => { + GLib.Timeout.add_seconds (60, () => { if (!status_icon.is_embedded ()) { warning ("Status Icon is not embedded"); Gtk.main_quit (); -- 2.1.4