[Spice-commits] 2 commits - autogen.sh data/spice-protocol.vapi gtk/controller spice-common

[Christophe Fergau]

 autogen.sh                     |    1 +
 data/spice-protocol.vapi       |    4 ++++
 gtk/controller/controller.vala |   12 ++++++++++++
 spice-common                   |    2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 2eaa3cf7adbdffdddbed0bc6b9e87d50f8229d16
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Apr 2 17:09:28 2012 +0200

    controller: handle USB redirection messages

diff --git a/data/spice-protocol.vapi b/data/spice-protocol.vapi
index 4b88175..66f1373 100644
--- a/data/spice-protocol.vapi
+++ b/data/spice-protocol.vapi
@@ -62,6 +62,10 @@ namespace SpiceProtocol {
 
 			ENABLE_SMARTCARD,
 
+			ENABLE_USB,
+			ENABLE_USB_AUTOSHARE,
+			USB_FILTER,
+
 			//spice client -> external app
 			MENU_ITEM_CLICK,
 
diff --git a/gtk/controller/controller.vala b/gtk/controller/controller.vala
index 5970aaf..185f5e0 100644
--- a/gtk/controller/controller.vala
+++ b/gtk/controller/controller.vala
@@ -43,6 +43,9 @@ public class Controller: Object {
 	public bool send_cad { private set; get; }
 	public string[] disable_effects {private set; get; }
 	public uint32 color_depth {private set; get; }
+	public bool enable_usbredir { private set; get; }
+	public bool enable_usb_autoshare { private set; get; }
+	public string usb_filter { private set; get; }
 
 	public signal void do_connect ();
 	public signal void show ();
@@ -160,6 +163,15 @@ public class Controller: Object {
 		case SpiceProtocol.Controller.MsgId.HIDE:
 			hide ();
 			break;
+		case SpiceProtocol.Controller.MsgId.ENABLE_USB:
+			enable_usbredir = (bool)v.value;
+			break;
+		case SpiceProtocol.Controller.MsgId.ENABLE_USB_AUTOSHARE:
+			enable_usb_autoshare = (bool)v.value;
+			break;
+		case SpiceProtocol.Controller.MsgId.USB_FILTER:
+			usb_filter = str;
+			break;
 		default:
 			warn_if_reached ();
 			return false;
diff --git a/spice-common b/spice-common
index 2ab866f..e96dbb4 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 2ab866f522d8f730a93288fd82a596f00f193909
+Subproject commit e96dbb4172ec7a47a5b15d3b9e921e12623fddaa
commit 79436bcd0d44eecef447bac23d8ea4eb4c81fb78
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Apr 2 12:05:48 2012 +0200

    autogen.sh: log configure command line
    
    Since --enable-vala may or may not be passed to configure, seeing
    the actual command line that was used is helpful.

diff --git a/autogen.sh b/autogen.sh
index 11aedb0..aefd2fd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,6 +15,7 @@ if test ! -e gtk/controller/controller.vala.stamp; then
 fi
 
 if [ -z "$NOCONFIGURE" ]; then
+    echo "Running configure with --enable-maintainer-mode --enable-gtk-doc --with-gtk=3.0 $enable_vala ${1+"$@"}"
     "$srcdir"/configure --enable-maintainer-mode --enable-gtk-doc --with-gtk=3.0 $enable_vala ${1+"$@"}
 fi