[Spice-commits] Branch '0.8' - 4 commits - NEWS client/controller.cpp client/inputs_channel.cpp client/x11 configure.ac server/spice.h

[Hans de Goede]

 NEWS                      |    7 +++++++
 client/controller.cpp     |    1 +
 client/inputs_channel.cpp |    2 ++
 client/x11/platform.cpp   |    4 ++--
 configure.ac              |    4 ++--
 server/spice.h            |    2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 7fd8b7c971173c13842f041c1c7d51f8dc797e46
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Mar 1 19:40:25 2011 +0200

    Release 0.8.0

diff --git a/NEWS b/NEWS
index d605b62..4ff9345 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Major changes in 0.8.0:
+=======================
+* client: exit nicely for --controller with no SPICE_XPI_SOCKET (rhbz#644292)
+* client-x11: Use _exit rather then exit on X errors (rhbz#680763)
+* client-x11: Fix keyb modifiers not syncing from guest to client (rhbz#679467)
+* server: fix segfault on migration
+
 Major changes in 0.7.3:
 =======================
 * Suport building with (and requires) libcacard-0.1.2
diff --git a/configure.ac b/configure.ac
index 31293f0..810e92a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ([2.57])
 
 m4_define([SPICE_MAJOR], 0)
-m4_define([SPICE_MINOR], 7)
-m4_define([SPICE_MICRO], 3)
+m4_define([SPICE_MINOR], 8)
+m4_define([SPICE_MICRO], 0)
 
 AC_INIT(spice, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice)
 
diff --git a/server/spice.h b/server/spice.h
index 9335e84..2c5aed7 100644
--- a/server/spice.h
+++ b/server/spice.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <sys/socket.h>
 
-#define SPICE_SERVER_VERSION 0x000703 /* release 0.7.3 */
+#define SPICE_SERVER_VERSION 0x000800 /* release 0.8.0 */
 
 /* interface base type */
 
commit 1a20edffedf58f602b6d517cdc919115dc64c36a
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Mar 1 18:08:20 2011 +0200

    x11: Use _exit rather then exit on X errors (rhbz#680763)
    
    This avoids us trying to restore the original resolution when we're fullscreen
    and an X error happens. As restoring fullscreen is a bad idea then as this
    involves making more X calls, which can get us stuck (in side an XLockDisplay
    call for example).

diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index 4877798..48d5a52 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -3024,14 +3024,14 @@ static int x_error_handler(Display* display, XErrorEvent* error_event)
               error_str,
               (uint32_t)error_event->minor_code,
               request_str);
-    exit(-1);
+    _exit(-1);
     return 0;
 }
 
 static int x_io_error_handler(Display* display)
 {
     LOG_ERROR("x io error on %s", XDisplayString(display));
-    exit(-1);
+    _exit(-1);
     return 0;
 }
 
commit eda812f0d7fe0a08b3bdce6e95740f97ecaae2d8
Author: Uri Lublin <uril at redhat.com>
Date:   Tue Mar 1 17:58:47 2011 +0200

    client: exit nicely for --controller with no SPICE_XPI_SOCKET (rhbz#644292)
    
    When starting spicec with --controller, SPICE_XPI_SOCKET environment
    variable must be defined so spicec and the controller can be connected.

diff --git a/client/controller.cpp b/client/controller.cpp
index cf06aa3..c5722a1 100644
--- a/client/controller.cpp
+++ b/client/controller.cpp
@@ -44,6 +44,7 @@ Controller::Controller(ControllerInterface *handler)
     char *p_socket = getenv("SPICE_XPI_SOCKET");
     if (!p_socket) {
         LOG_ERROR("Failed to get a controller connection (SPICE_XPI_SOCKET)");
+        throw Exception("Failed to get a controller connection (SPICE_XPI_SOCKET)");
     }
     strncpy(pipe_name, p_socket, sizeof(pipe_name));
 #endif
commit a0996e0f70c19b3784cc433021ca7885bc404800
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Mar 1 16:11:52 2011 +0200

    Fix keyb modifiers not syncing from client to client os (rhbz#679467)

diff --git a/client/inputs_channel.cpp b/client/inputs_channel.cpp
index c527580..ae41624 100644
--- a/client/inputs_channel.cpp
+++ b/client/inputs_channel.cpp
@@ -423,8 +423,10 @@ void InputsChannel::on_focus_out()
 {
     Lock lock(_update_modifiers_lock);
     _active_modifiers_event = true;
+#ifndef SYNC_REMOTE_MODIFIERS
     _modifiers = _on_focus_modifiers;
     set_local_modifiers();
+#endif
 }
 
 void InputsChannel::init_scan_code(int index)