[gnome-builder] keymap: remove use of deprecated API



commit 5850e83b946644ee871ef46a3d55d67421bfd1b6
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jan 2 17:42:56 2018 -0800

    keymap: remove use of deprecated API

 src/libide/sourceview/ide-source-view.c       |    4 ++--
 src/plugins/python-pack/ide-python-indenter.c |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/libide/sourceview/ide-source-view.c b/src/libide/sourceview/ide-source-view.c
index 374ed35..1ea0a71 100644
--- a/src/libide/sourceview/ide-source-view.c
+++ b/src/libide/sourceview/ide-source-view.c
@@ -1939,7 +1939,7 @@ is_key_vim_binded (GtkWidget       *widget,
   IdeSourceViewPrivate *priv = ide_source_view_get_instance_private (IDE_SOURCE_VIEW (widget));
 
   context = gtk_widget_get_style_context (GTK_WIDGET (priv->mode));
-  keymap = gdk_keymap_get_default ();
+  keymap = gdk_keymap_get_for_display (gtk_widget_get_display (widget));
   state = gtk_widget_get_state_flags (GTK_WIDGET (priv->mode));
 
   gtk_style_context_get (context, state, "gtk-key-bindings", &binding_set_array, NULL);
@@ -2147,7 +2147,7 @@ ide_source_view_key_press_event (GtkWidget   *widget,
         {
           guint new_keyval;
           GdkModifierType state_consumed;
-          GdkKeymap *keymap = gdk_keymap_get_default ();
+          GdkKeymap *keymap = gdk_keymap_get_for_display (gtk_widget_get_display (widget));
 
           _ide_source_view_set_modifier (self, gdk_keyval_to_unicode (event->keyval));
           gdk_keymap_translate_keyboard_state (keymap,
diff --git a/src/plugins/python-pack/ide-python-indenter.c b/src/plugins/python-pack/ide-python-indenter.c
index 730f0e3..50e8775 100644
--- a/src/plugins/python-pack/ide-python-indenter.c
+++ b/src/plugins/python-pack/ide-python-indenter.c
@@ -774,9 +774,11 @@ static gboolean
 ide_python_indenter_is_trigger (IdeIndenter *indenter,
                                 GdkEventKey *event)
 {
+  GdkDisplay *display = gdk_window_get_display (event->window);
+  GdkKeymap *keymap = gdk_keymap_get_for_display (display);
   guint modifier_state;
 
-  modifier_state = gdk_keymap_get_modifier_state (gdk_keymap_get_default ());
+  modifier_state = gdk_keymap_get_modifier_state (keymap);
   if (modifier_state & GDK_SHIFT_MASK ||
       modifier_state & GDK_CONTROL_MASK ||
       modifier_state & GDK_MOD1_MASK)


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