[poppler] cmake/modules glib/demo

[Albert Astals Cid]

 cmake/modules/FindGTK.cmake |    2 +-
 glib/demo/annots.c          |    2 +-
 glib/demo/selections.c      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c7a317635cfc6934e975e846335e37a68d6b3876
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Mar 26 16:10:05 2018 +0200

    glib: less deprecated calls
    
    And increate gdk pixbuf requirement to the version i think we actually require

diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
index 10e22924..4b9e23e2 100644
--- a/cmake/modules/FindGTK.cmake
+++ b/cmake/modules/FindGTK.cmake
@@ -15,7 +15,7 @@ include(FindPackageHandleStandardArgs)
 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)
 
diff --git a/glib/demo/annots.c b/glib/demo/annots.c
index 7f2e8618..bbcc31c2 100644
--- a/glib/demo/annots.c
+++ b/glib/demo/annots.c
@@ -350,7 +350,7 @@ pgd_annots_update_cursor (PgdAnnotsDemo *demo,
      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);
 }
diff --git a/glib/demo/selections.c b/glib/demo/selections.c
index eff099e2..d450f36a 100644
--- a/glib/demo/selections.c
+++ b/glib/demo/selections.c
@@ -168,7 +168,7 @@ pgd_selections_update_cursor (PgdSelectionsDemo *demo,
 	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);
 }