From abbfb5779ef0bd52285d630a8aa29c6c2bf9192d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Thu, 16 Jun 2011 01:30:43 +0200
Subject: [PATCH] gtk/controller: add accel menuitem property

---
 gtk/controller/controller.vala | 4 +++-
 gtk/controller/menu.vala       | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gtk/controller/controller.vala b/gtk/controller/controller.vala
index 7087118..760285f 100644
--- a/gtk/controller/controller.vala
+++ b/gtk/controller/controller.vala
@@ -190,8 +190,10 @@ public class Controller: Object {
 			if (read == 0)
 				break;
 
-			if (warn_if (read != sizeof (SpiceProtocol.Controller.Msg)))
+			if (warn_if (read != sizeof (SpiceProtocol.Controller.Msg))) {
+				warning ("read only: " + read.to_string ());
 				break;
+			}
 
 			var msg = (SpiceProtocol.Controller.Msg*)t;
 			if (warn_if (msg.size < sizeof (SpiceProtocol.Controller.Msg)))
diff --git a/gtk/controller/menu.vala b/gtk/controller/menu.vala
index 02640b3..7f2f42a 100644
--- a/gtk/controller/menu.vala
+++ b/gtk/controller/menu.vala
@@ -25,6 +25,7 @@ public class MenuItem: Object {
 	public int parent_id;
 	public int id;
 	public string text;
+	public string accel;
 	public SpiceProtocol.Controller.MenuFlags flags;
 
 	public MenuItem.from_string (string str) throws SpiceCtrl.Error {
@@ -33,7 +34,10 @@ public class MenuItem: Object {
 			throw new SpiceCtrl.Error.VALUE(""); /* Vala: why is it mandatory to give a string? */
 		parent_id = int.parse (params[0]);
 		id = int.parse (params[1]);
-		text = params[2];
+		var textaccel = params[2].split ("\t");
+		text = textaccel[0];
+		if (textaccel.length > 1)
+			accel = textaccel[1];
 		flags = (SpiceProtocol.Controller.MenuFlags)int.parse (params[3]);
 
 		submenu = new Menu ();