[Spice-commits] 3 commits - configure.ac src/channel-display.c tests/uri.c

[Pavel Grunt]

 configure.ac          |    4 ++--
 src/channel-display.c |    3 ---
 tests/uri.c           |    5 +++++
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 3c8fb7e24da26d13bcc51ffcc4587feec8421473
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Mon Jun 13 11:35:01 2016 +0200

    channel-display: Remove deprecated init functions
    
    They are called at the construct time since spice-common commit:
    5b6be16b37370bb774aa3c2a7d5c41791fdc3a1e

diff --git a/src/channel-display.c b/src/channel-display.c
index 22e64e2..cf9c583 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -451,9 +451,6 @@ static void spice_display_channel_class_init(SpiceDisplayChannelClass *klass)
 
     g_type_class_add_private(klass, sizeof(SpiceDisplayChannelPrivate));
 
-    sw_canvas_init();
-    quic_init();
-    rop3_init();
     channel_set_handlers(SPICE_CHANNEL_CLASS(klass));
 }
 
commit 8cf25bea7b98c38ef9c82a6bcd938e4a6164463e
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Mon Jun 13 11:35:00 2016 +0200

    tests-uri: Define g_assert_nonnull
    
    It is available since Glib 2.40

diff --git a/tests/uri.c b/tests/uri.c
index ea8b794..5bfed2d 100644
--- a/tests/uri.c
+++ b/tests/uri.c
@@ -19,6 +19,11 @@
 #include <spice-client.h>
 #include "spice-uri-priv.h"
 
+/* GLIB_CHECK_VERSION(2, 40, 0) */
+#ifndef g_assert_nonnull
+#define g_assert_nonnull g_assert
+#endif
+
 struct test_case {
     gchar *uri;
     gchar *scheme;
commit 2253df177e2e5a5e52c5f13a412d242fad00ebb7
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Mon Jun 13 11:34:59 2016 +0200

    Require gtk+ 3.12
    
    Allow to use gtk_stack_get_child_by_name

diff --git a/configure.ac b/configure.ac
index 3fe8055..6e65188 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,8 +123,8 @@ AC_ARG_WITH([gtk],
   [with_gtk=3.0])
 
 case "$with_gtk" in
-  3.0) GTK_REQUIRED=3.10
-       GTK_ENCODED_VERSION="GDK_VERSION_3_10"
+  3.0) GTK_REQUIRED=3.12
+       GTK_ENCODED_VERSION="GDK_VERSION_3_12"
        ;;
   no)
        AS_IF([test x$enable_gtk_doc = xyes],