commit c7a317635cfc6934e975e846335e37a68d6b3876
author Albert Astals Cid <aacid@kde.org> Mon Mar 26 16:10:05 2018 +0200
committer Albert Astals Cid <aacid@kde.org> Wed Mar 28 00:59:03 2018 +0200
tree 594109053c1946880994e4901982a19abf77cfa2
parent 7a708ffd374cd18e9e4bfe8a8e95c02184a074ba

glib: less deprecated calls

And increate gdk pixbuf requirement to the version i think we actually require

cmake/modules/FindGTK.cmake

diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
index 10e2292..4b9e23e 100644
--- a/cmake/modules/FindGTK.cmake
+++ b/cmake/modules/FindGTK.cmake
@@ -15,7 +15,7 @@
 if (NOT WIN32)
   find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GTK3 "gtk+-3.0>=3.8" "gdk-pixbuf-2.0")
+  pkg_check_modules(GTK3 "gtk+-3.0>=3.8" "gdk-pixbuf-2.0>=2.8")
 
   find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS)
 

glib/demo/annots.c

diff --git a/glib/demo/annots.c b/glib/demo/annots.c
index 7f2e861..bbcc31c 100644
--- a/glib/demo/annots.c
+++ b/glib/demo/annots.c
@@ -350,7 +350,7 @@
      demo->cursor = cursor_type;
 
      gdk_window_set_cursor (gtk_widget_get_window (demo->main_box), cursor);
-     gdk_flush ();
+     gdk_display_flush (gtk_widget_get_display (demo->main_box));
      if (cursor)
          g_object_unref (cursor);
 }

glib/demo/selections.c

diff --git a/glib/demo/selections.c b/glib/demo/selections.c
index eff099e..d450f36 100644
--- a/glib/demo/selections.c
+++ b/glib/demo/selections.c
@@ -168,7 +168,7 @@
 	demo->cursor = cursor_type;
 
 	gdk_window_set_cursor (window, cursor);
-	gdk_flush ();
+	gdk_display_flush (gtk_widget_get_display (demo->darea));
 	if (cursor)
 		g_object_unref (cursor);
 }