[Spice-commits] 4 commits - NEWS configure.ac server/smartcard-channel-client.c server/smartcard-channel-client.h server/smartcard.c

[Christophe Fergau]

 NEWS                              |   19 +++++++++++++++++++
 configure.ac                      |    2 +-
 server/smartcard-channel-client.c |    7 +------
 server/smartcard-channel-client.h |    2 --
 server/smartcard.c                |    2 +-
 5 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit c52da2fec56e27cc6cae418b86608e55b83c6cb4
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Nov 18 18:05:29 2016 +0100

    build: Update NEWS file

diff --git a/NEWS b/NEWS
index e1b0217..eb99483 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+Major Changes in 0.13.3:
+========================
+
+*** IMPORTANT ***
+The 0.13.x release series is an unstable release series, if you are looking for
+stability for daily use, please use the latest 0.12.x release. We are trying to
+keep the code as functional as 0.12, but regressions or bugs could still happen.
+
+* Ongoing work on separating/encapsulating the existing codebase. Main
+  highlight is that RedChannel/RedChannelClient have been converted to GObjects
+* Statistics code is now disabled by default, if you need it,
+  -DREDS_STATISTICS must be added to CPPFLAGS when building
+* Improvements to replay utility
+* Limit (deprecated/unusud) QXLMessage size to 100,000 characters for improved
+  safety
+* Build fixes on older distros (el6)
+* Improve image quality in low bitrate situation when using the
+  GStreamer backend
+
 Major Changes in 0.13.2:
 ========================
 
commit 44645cde92f22883a23b9018a725a6cf7b4bfdb7
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Nov 21 14:36:10 2016 +0100

    build: Update SPICE_REVISION for new release
    
    No ABI addition/removal/... so no need to change anything else.

diff --git a/configure.ac b/configure.ac
index caf9f4c..d36e27e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_PREREQ([2.57])
 #
 dnl TODO see server/spice-char.h TODO comment for API breakage
 m4_define([SPICE_CURRENT], [13])
-m4_define([SPICE_REVISION], [0])
+m4_define([SPICE_REVISION], [1])
 m4_define([SPICE_AGE], [12])
 
 AC_INIT(spice, [m4_esyscmd(build-aux/git-version-gen .tarball-version)],
commit 598fb35ec550026cc052f6fc30e01b796e652761
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Nov 21 14:32:49 2016 +0100

    smartcard: Remove duplicate accessor
    
    smartcard_channel_client_get_device() is the same as
    smartcard_channel_client_get_char_device(). Let's only keep the latter.

diff --git a/server/smartcard-channel-client.c b/server/smartcard-channel-client.c
index 14fea4f..35327dc 100644
--- a/server/smartcard-channel-client.c
+++ b/server/smartcard-channel-client.c
@@ -282,11 +282,6 @@ static void smartcard_channel_client_remove_reader(SmartCardChannelClient *scc,
     }
 }
 
-RedCharDeviceSmartcard* smartcard_channel_client_get_device(SmartCardChannelClient *scc)
-{
-    return scc->priv->smartcard;
-}
-
 static void smartcard_channel_client_write_to_reader(SmartCardChannelClient *scc)
 {
     g_return_if_fail(scc);
diff --git a/server/smartcard-channel-client.h b/server/smartcard-channel-client.h
index 4fe1c72..db29e20 100644
--- a/server/smartcard-channel-client.h
+++ b/server/smartcard-channel-client.h
@@ -83,8 +83,6 @@ void smartcard_channel_client_send_error(RedChannelClient *rcc,
                                          SpiceMarshaller *m,
                                          RedPipeItem *item);
 
-RedCharDeviceSmartcard* smartcard_channel_client_get_device(SmartCardChannelClient *scc);
-
 int smartcard_channel_client_handle_message(RedChannelClient *rcc,
                                             uint16_t type,
                                             uint32_t size,
diff --git a/server/smartcard.c b/server/smartcard.c
index 5b18abe..1a19fa7 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -501,7 +501,7 @@ void smartcard_channel_write_to_reader(RedCharDeviceWriteBuffer *write_buf)
     sin = g_smartcard_readers.sin[vheader->reader_id];
     dev = RED_CHAR_DEVICE_SMARTCARD(sin->st);
     spice_assert(!dev->priv->scc ||
-                 dev == smartcard_channel_client_get_device(dev->priv->scc));
+                 dev == smartcard_channel_client_get_char_device(dev->priv->scc));
     /* protocol requires messages to be in network endianess */
     vheader->type = htonl(vheader->type);
     vheader->length = htonl(vheader->length);
commit 00d2c6f22669d1886d50dc4c413c1b954dfbc600
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Nov 21 14:30:52 2016 +0100

    smartcard: Fix SmartcardChannelClient creation
    
    The wrong type (RED_TYPE_CHANNEL_CLIENT rather than
    TYPE_SMARTCARD_CHANNEL_CLIENT) was used when creating a
    SmartcardChannelClient, which meant the _init function was never called,
    and SmartcardChannelClient::priv was never initialized.
    
    This caused a crash when trying to connect with --spice-smartcard to a
    VM with a smartcard channel configured.

diff --git a/server/smartcard-channel-client.c b/server/smartcard-channel-client.c
index d00a6b2..14fea4f 100644
--- a/server/smartcard-channel-client.c
+++ b/server/smartcard-channel-client.c
@@ -119,7 +119,7 @@ SmartCardChannelClient* smartcard_channel_client_create(RedChannel *channel,
         g_array_append_vals(caps_array, caps, num_caps);
     }
 
-    rcc = g_initable_new(RED_TYPE_CHANNEL_CLIENT,
+    rcc = g_initable_new(TYPE_SMARTCARD_CHANNEL_CLIENT,
                          NULL, NULL,
                          "channel", channel,
                          "client", client,