[gimp] plug-ins: screenshot: don't pass NULL to gdk_keymap_get_entries_for_keyval()



commit 1f78e8e0c6a3172b16b091c93978083763c2f796
Author: Michael Natterer <mitch gimp org>
Date:   Fri Apr 22 00:06:22 2011 +0200

    plug-ins: screenshot: don't pass NULL to gdk_keymap_get_entries_for_keyval()
    
    because it's deprecated to do that and badly crashes in GTK+ 3.0.
    Use the display's keymap instead.

 plug-ins/common/screenshot.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c
index e5d625b..aa9a339 100644
--- a/plug-ins/common/screenshot.c
+++ b/plug-ins/common/screenshot.c
@@ -391,6 +391,7 @@ select_window_x11 (GdkScreen *screen)
   Window        x_win       = None;
   GC            x_gc        = NULL;
   Cursor        x_cursor    = XCreateFontCursor (x_dpy, GDK_CROSSHAIR);
+  GdkKeymap    *keymap;
   GdkKeymapKey *keys        = NULL;
   gint          status;
   gint          i, num_keys;
@@ -445,7 +446,10 @@ select_window_x11 (GdkScreen *screen)
                         &gc_values);
     }
 
-  if (gdk_keymap_get_entries_for_keyval (NULL, GDK_KEY_Escape, &keys, &num_keys))
+  keymap = gdk_keymap_get_for_display (gdk_screen_get_display (screen));
+
+  if (gdk_keymap_get_entries_for_keyval (keymap, GDK_KEY_Escape,
+                                         &keys, &num_keys))
     {
       gdk_error_trap_push ();
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]