[Spice-commits] 2 commits - gtk/channel-main.c gtk/spice-session.c NEWS

[Marc-André Lureau]

 NEWS                |   13 +++++++++++++
 gtk/channel-main.c  |    2 +-
 gtk/spice-session.c |    6 +++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 45f5f3d47ec5b716c77817aae7263fb736dd105c
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Tue Apr 24 13:10:23 2012 +0200

    Release v0.12

diff --git a/NEWS b/NEWS
index 1e21743..83fbe44 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+v0.12
+=====
+
+- Fix memory leak when guest is resized
+- Fix color-depth setting
+- Hide/Show cursor correctly when needed
+- Fix blue-tinted video with old Spice servers
+- Correct scroll-event not received with recent Gtk+
+- Fix various migrations issues
+- Allow to disable CELT encoding at runtime with SPICE_DISABLE_CELT
+- Various crash fixes (on pubkey, recording, clipboard)
+- Build changes (common submodule) and fixes
+
 v0.11
 =====
 
commit d41a57e35224dba943912ee2bd5fef5553de0f85
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Apr 23 17:32:19 2012 +0200

    Lower a few warnings when migration fails

diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 9de51d7..6d5281e 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -1517,7 +1517,7 @@ static void migrate_channel_event_cb(SpiceChannel *channel, SpiceChannelEvent ev
             coroutine_yieldto(mig->from, NULL);
         break;
     default:
-        g_warning("error or unhandled channel event during migration: %d", event);
+        SPICE_DEBUG("error or unhandled channel event during migration: %d", event);
         /* go back to main channel to report error */
         coroutine_yieldto(mig->from, NULL);
     }
diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index 38a1e92..959e099 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -1258,7 +1258,11 @@ void spice_session_abort_migration(SpiceSession *session)
     struct channel *c;
 
     g_return_if_fail(s != NULL);
-    g_return_if_fail(s->migration != NULL);
+
+    if (s->migration == NULL) {
+        SPICE_DEBUG("no migration in progress");
+        return;
+    }
 
     for (ring = ring_get_head(&s->channels);
          ring != NULL; ring = next) {