[Xfce4-commits] <xfmpc:master> Fix ambiguity between GLib.Menu and Gtk.Menu (bug #8922)

[Mike Massonnet]

Updating branch refs/heads/master
         to 06b68094e4283f45d3254366d847056b9041d7a0 (commit)
       from 1f86f8565d836072a1f2c5e4305094a9f0a27a99 (commit)

commit 06b68094e4283f45d3254366d847056b9041d7a0
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Mon Jul 30 21:45:23 2012 +0200

    Fix ambiguity between GLib.Menu and Gtk.Menu (bug #8922)

 src/extended-interface.vala |    2 +-
 src/playlist.vala           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/extended-interface.vala b/src/extended-interface.vala
index 5fa3a0a..3787b93 100644
--- a/src/extended-interface.vala
+++ b/src/extended-interface.vala
@@ -197,7 +197,7 @@ namespace Xfmpc {
 			this.context_menu.show_all ();
 		}
 
-		private void menu_detach (Widget attach_widget, Menu menu) {
+		private void menu_detach (Gtk.Widget attach_widget, Gtk.Menu menu) {
 		}
 
 		/*
diff --git a/src/playlist.vala b/src/playlist.vala
index 924431b..adf20f9 100644
--- a/src/playlist.vala
+++ b/src/playlist.vala
@@ -98,7 +98,7 @@ namespace Xfmpc {
 							       new Gtk.Adjustment (0, 0, 0, 0, 0, 0));
 			scrolled.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.ALWAYS);
 
-			this.menu = new Menu ();
+			this.menu = new Gtk.Menu ();
 
 			var mi = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.REMOVE, null);
 			this.menu.append (mi);