[Spice-commits] configure.ac data/spice-protocol.vapi gtk/controller

[Marc-André Lureau]

 configure.ac                   |    2 +-
 data/spice-protocol.vapi       |    2 ++
 gtk/controller/controller.vala |    4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2ba25926dbd2a651f417c1f46c14b0d047e66dee
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Fri Feb 17 17:33:27 2012 +0100

    Add controller ENABLE_SMARTCARD message

diff --git a/configure.ac b/configure.ac
index d8602fd..28b3418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_CHECK_HEADERS([sys/socket.h netinet/in.h arpa/inet.h])
 
 dnl =========================================================================
 dnl Chek optional features
-PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.10.1)
+PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.10.2)
 AC_SUBST(PROTOCOL_CFLAGS)
 
 AC_CHECK_LIBM
diff --git a/data/spice-protocol.vapi b/data/spice-protocol.vapi
index ae884a9..4cb1a2f 100644
--- a/data/spice-protocol.vapi
+++ b/data/spice-protocol.vapi
@@ -60,6 +60,8 @@ namespace SpiceProtocol {
 			SHOW,
 			HIDE,
 
+			ENABLE_SMARTCARD,
+
 			//spice client -> extrenal app
 			MENU_ITEM_CLICK,
 		}
diff --git a/gtk/controller/controller.vala b/gtk/controller/controller.vala
index 237e817..12b5b8d 100644
--- a/gtk/controller/controller.vala
+++ b/gtk/controller/controller.vala
@@ -39,6 +39,7 @@ public class Controller: Object {
 	public string[] secure_channels { private set; get; }
 	public string[] disable_channels { private set; get; }
 	public SpiceCtrl.Menu? menu  { private set; get; }
+	public bool enable_smartcard { private set; get; }
 
 	public signal void do_connect ();
 	public signal void show ();
@@ -119,6 +120,9 @@ public class Controller: Object {
 		case SpiceProtocol.Controller.MsgId.SET_TITLE:
 			title = str;
 			break;
+		case SpiceProtocol.Controller.MsgId.ENABLE_SMARTCARD:
+			enable_smartcard = (bool)v.value;
+			break;
 
 		case SpiceProtocol.Controller.MsgId.CREATE_MENU:
 			menu = new SpiceCtrl.Menu.from_string (str);