[Spice-commits] 2 commits - configure.ac src/spice-widget.c

[Pavel Grunt]

 configure.ac       |    4 +++-
 src/spice-widget.c |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ba031e37f24f305a2cacdd4c6147c13729e64077
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Mon Aug 15 10:27:39 2016 +0200

    Do not require epoxy for Windows
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/configure.ac b/configure.ac
index 16d946b..b9458b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,7 +135,9 @@ AC_SUBST([GTK_REQUIRED])
 AM_CONDITIONAL([WITH_GTK],[test "$with_gtk" != "no"])
 
 AS_IF([test "x$with_gtk" != "xno"],
-      [PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED epoxy)]
+      [AS_IF([test "x$os_win32" = "xyes"],
+             [PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)],
+             [PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED epoxy)])]
       [GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=$GTK_ENCODED_VERSION \
                                -DGDK_VERSION_MAX_ALLOWED=$GTK_ENCODED_VERSION"])
 AC_SUBST(GTK_CFLAGS)
commit fdd80e5ed4002f94d3e31c9a76426b49823ea7e5
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Fri Aug 12 23:38:01 2016 +0200

    widget: Fix rendering issues with CSD on Windows
    
    Replace GDK_WINDOW_HWND by gdk_win32_window_get_impl_hwnd() which gets
    the HWND directly, without any side effects.
    
    Related:
    https://bugzilla.redhat.com/show_bug.cgi?id=1352216
    
    Acked-by: Fabiano Fidêncio <fabiano at fidencio.org>

diff --git a/src/spice-widget.c b/src/spice-widget.c
index 7c1c756..f288c28 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -1417,7 +1417,9 @@ static gboolean check_for_grab_key_released(SpiceDisplay *display, int type, int
 static void update_display(SpiceDisplay *display)
 {
 #ifdef G_OS_WIN32
-    win32_window = display ? GDK_WINDOW_HWND(gtk_widget_get_window(GTK_WIDGET(display))) : NULL;
+    win32_window = display ?
+                        gdk_win32_window_get_impl_hwnd(gtk_widget_get_window(GTK_WIDGET(display))) :
+                        NULL;
 #endif
 }