[Spice-commits] 2 commits - NEWS client/gui client/x11 configure.ac server/spice.h

[Hans de Goede]

 NEWS                           |    8 ++++++++
 client/gui/softrenderer.cpp    |    2 +-
 client/x11/event_sources_p.cpp |    2 +-
 client/x11/platform.cpp        |   12 ++++++------
 client/x11/red_window.cpp      |    2 +-
 configure.ac                   |    2 +-
 server/spice.h                 |    2 +-
 7 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit 8817549795722026ca83edab2640b8f156510074
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Jan 23 15:23:44 2012 +0100

    Release 0.10.1

diff --git a/NEWS b/NEWS
index 83765f1..2deba57 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Major changes in 0.10.1:
+========================
+* Mini header support
+* Add server API for injecting a client connection socket
+* Add Xinerama support to spicec
+* Many bugfixes / code cleanups
+* Requires spice-protocol >= 0.10.1
+
 Major changes in 0.10.0:
 ========================
 * 32 bit (little endian) server builds.
diff --git a/configure.ac b/configure.ac
index b6fb751..0f8ad7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.57])
 
 m4_define([SPICE_MAJOR], 0)
 m4_define([SPICE_MINOR], 10)
-m4_define([SPICE_MICRO], 0)
+m4_define([SPICE_MICRO], 1)
 
 AC_INIT(spice, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice)
 
diff --git a/server/spice.h b/server/spice.h
index 6233a6c..c582e6c 100644
--- a/server/spice.h
+++ b/server/spice.h
@@ -22,7 +22,7 @@
 #include <sys/socket.h>
 #include <spice/qxl_dev.h>
 
-#define SPICE_SERVER_VERSION 0x000901 /* release 0.9.1 */
+#define SPICE_SERVER_VERSION 0x000a01 /* release 0.10.1 */
 
 /* interface base type */
 
commit a0190fce2302b8051f744c5cf38c1b334d77d11e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Jan 23 15:49:22 2012 +0100

    Fix various comparison between signed and unsigned integer expressions warnings
    
    These turn into errors because of our -Werror use, breaking the build.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/client/gui/softrenderer.cpp b/client/gui/softrenderer.cpp
index 9f19e7b..c888bc0 100644
--- a/client/gui/softrenderer.cpp
+++ b/client/gui/softrenderer.cpp
@@ -45,7 +45,7 @@ SoftRenderer::SoftRenderer(uint8_t* surface, uint width, uint height, uint strid
     , _image_codec_module (NULL)
     , _queueing(true)
 {
-    assert(stride == _width * 4); //for now
+    assert(stride == width * 4); //for now
     if (!_image_codec) {
         setupImageCodec();
     }
diff --git a/client/x11/event_sources_p.cpp b/client/x11/event_sources_p.cpp
index 1958a04..5f9f452 100644
--- a/client/x11/event_sources_p.cpp
+++ b/client/x11/event_sources_p.cpp
@@ -119,7 +119,7 @@ bool EventSources::wait_events(int timeout_msec)
         return false;
     }
 
-    for (int i = 0; i < _events.size(); i++) {
+    for (unsigned int i = 0; i < _events.size(); i++) {
         if (FD_ISSET(_fds[i], &rfds)) {
             _events[i]->action();
             /* The action may have removed / added event sources changing
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index 416513e..f535d6d 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -135,7 +135,7 @@ static struct clipboard_format_info clipboard_formats[] = {
     { VD_AGENT_CLIPBOARD_IMAGE_JPG, { "image/jpeg", NULL }, },
 };
 
-#define clipboard_format_count (sizeof(clipboard_formats)/sizeof(clipboard_formats[0]))
+#define clipboard_format_count ((int)(sizeof(clipboard_formats)/sizeof(clipboard_formats[0])))
 
 struct selection_request {
     XEvent event;
@@ -145,11 +145,11 @@ struct selection_request {
 static int expected_targets_notifies = 0;
 static bool waiting_for_property_notify = false;
 static uint8_t* clipboard_data = NULL;
-static int32_t clipboard_data_size = 0;
-static int32_t clipboard_data_space = 0;
+static uint32_t clipboard_data_size = 0;
+static uint32_t clipboard_data_space = 0;
 static Atom clipboard_request_target = None;
 static selection_request *next_selection_request = NULL;
-static uint32_t clipboard_type_count = 0;
+static int clipboard_type_count = 0;
 static uint32_t clipboard_agent_types[256];
 static Atom clipboard_x11_targets[256];
 static Mutex clipboard_lock;
@@ -1242,7 +1242,7 @@ private:
     void update_position();
     bool find_mode_in_outputs(RRMode mode, int start_index, XRRScreenResources* res);
     bool find_mode_in_clones(RRMode mode, XRRScreenResources* res);
-    XRRModeInfo* find_mode(int width, int height, XRRScreenResources* res);
+    XRRModeInfo* find_mode(unsigned int width, unsigned int height, XRRScreenResources* res);
 
 private:
     MultyMonScreen& _container;
@@ -2181,7 +2181,7 @@ public:
     }
 };
 
-XRRModeInfo* XMonitor::find_mode(int width, int height, XRRScreenResources* res)
+XRRModeInfo* XMonitor::find_mode(unsigned int width, unsigned int height, XRRScreenResources* res)
 {
     typedef std::set<ModeInfo, ModeCompare> ModesSet;
     ModesSet modes_set;
diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp
index e0b7d45..b16249e 100644
--- a/client/x11/red_window.cpp
+++ b/client/x11/red_window.cpp
@@ -922,7 +922,7 @@ void RedWindow_p::win_proc(XEvent& event)
     case ClientMessage:
         if (event.xclient.message_type == wm_protocol_atom) {
             ASSERT(event.xclient.format == 32);
-            if (event.xclient.data.l[0] == wm_delete_window_atom) {
+            if ((Atom)event.xclient.data.l[0] == wm_delete_window_atom) {
                 DBG(0, "wm_delete_window");
                 Platform::send_quit_request();
             }