[Spice-commits] 3 commits - common/draw.h common/pixman_utils.c gtk/Makefile.am gtk/spice-option.c NEWS THANKS

[Marc-André Lureau]

 NEWS                  |   13 +++++++++++++
 THANKS                |    1 +
 common/draw.h         |    2 +-
 common/pixman_utils.c |    6 +++---
 gtk/Makefile.am       |    2 +-
 gtk/spice-option.c    |    2 +-
 6 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit dca63ebf3868b305bf08578d5a1a23f92cef4af3
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Thu Feb 23 18:09:34 2012 +0100

    Release v0.10

diff --git a/NEWS b/NEWS
index 01ea249..523e277 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
+v0.10
+=====
+
+- USB redir is now aware of host/guest side filtering
+- you can query spice_usb_device_manager_can_redirect_device()
+- fix the usbredir channel lifetime to be equal to session lifetime
+- set keepalive on channel socket
+- fix hangs on windows when using ssl chanels
+- add a SpiceDisplay::zoom-level to maintain a scaling ratio
+- add controller ENABLE_SMARTCARD option
+- remove a few warnings, ui improvements, build fixes
+
 v0.9
 ====
+
 - Add command line options for setting the cache size and the glz window size
 - Add a USB device selection widget to libspice-client-gtk
 - Various bug fixes and code improvements
diff --git a/THANKS b/THANKS
index 3840f1c..b296695 100644
--- a/THANKS
+++ b/THANKS
@@ -5,4 +5,5 @@ Attila Sukosd <attila.sukosd at gmail.com>
 Christophe Fergeau <cfergeau at redhat.com>
 Daniel P. Berrange <berrange at redhat.com>
 Hans de Goede <hdegoede at redhat.com>
+Nicolas Prochazka <prochazka.nicolas at gmail.com>
 Tiziano Mueller <dev-zero at gentoo.org>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index fd2e477..7b2211d 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -156,7 +156,7 @@ nodist_libspice_client_gtkinclude_HEADERS =	\
 	$(NULL)
 
 libspice_client_glib_2_0_la_LDFLAGS =	\
-	-version-info 5:0:4		\
+	-version-info 6:0:5		\
 	-no-undefined			\
 	$(VERSION_LDFLAGS)		\
 	$(NULL)
commit f2962e8ceff8b4810abade38447cab288a360918
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Thu Feb 23 17:33:39 2012 +0100

    use :glz-window-size not :glz_window_size

diff --git a/gtk/spice-option.c b/gtk/spice-option.c
index 9c85c37..6e23214 100644
--- a/gtk/spice-option.c
+++ b/gtk/spice-option.c
@@ -155,5 +155,5 @@ void spice_set_session_option(SpiceSession *session)
     if (cache_size)
         g_object_set(session, "cache-size", cache_size, NULL);
     if (glz_window_size)
-        g_object_set(session, "glz_window_size", glz_window_size, NULL);
+        g_object_set(session, "glz-window-size", glz_window_size, NULL);
 }
commit 765e54090e42491084e9782fc588f7c2422c4f2a
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Thu Feb 23 17:14:09 2012 +0100

    build: fix build with recent mingw64
    
    Christophe did similar patches for common/ directory in spice.  Some
    day, we should try to sync and move common/ to a spice-common
    project...

diff --git a/common/draw.h b/common/draw.h
index 95f07b8..994aebb 100644
--- a/common/draw.h
+++ b/common/draw.h
@@ -35,7 +35,7 @@
 #include <spice/enums.h>
 #include "mem.h"
 
-#define SPICE_GET_ADDRESS(addr) ((void *)(unsigned long)(addr))
+#define SPICE_GET_ADDRESS(addr) ((void *)(uintptr_t)(addr))
 #define SPICE_SET_ADDRESS(addr, val) ((addr) = (unsigned long)(val))
 
 typedef int32_t SPICE_FIXED28_4;
diff --git a/common/pixman_utils.c b/common/pixman_utils.c
index 705f7b2..e1eec41 100644
--- a/common/pixman_utils.c
+++ b/common/pixman_utils.c
@@ -254,19 +254,19 @@ void spice_pixman_fill_rect(pixman_image_t *dest,
         byte_line += stride;
         w = byte_width;
 
-        while (w >= 1 && ((unsigned long)d & 1)) {
+        while (w >= 1 && ((uintptr_t)d & 1)) {
             *(uint8_t *)d = (value & 0xff);
             w--;
             d++;
         }
 
-        while (w >= 2 && ((unsigned long)d & 3)) {
+        while (w >= 2 && ((uintptr_t)d & 3)) {
             *(uint16_t *)d = value;
             w -= 2;
             d += 2;
         }
 
-        while (w >= 4 && ((unsigned long)d & 7)) {
+        while (w >= 4 && ((uintptr_t)d & 7)) {
             *(uint32_t *)d = value;
 
             w -= 4;