[gnome-software] Remove use of deprecated gdk_keymap_get_default() API



commit 5c7ad052f059f3f5e4e8851d58d5fd5eb3223037
Author: Kalev Lember <klember redhat com>
Date:   Sun Jan 28 14:52:57 2018 +0100

    Remove use of deprecated gdk_keymap_get_default() API

 src/gs-shell.c          | 2 +-
 src/gs-sources-dialog.c | 5 +++--
 src/gs-update-dialog.c  | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/gs-shell.c b/src/gs-shell.c
index 4b59f0d4..126a2335 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -661,7 +661,7 @@ window_key_press_event (GtkWidget *win, GdkEventKey *event, GsShell *shell)
                return GDK_EVENT_PROPAGATE;
 
        state = event->state;
-       keymap = gdk_keymap_get_default ();
+       keymap = gdk_keymap_get_for_display (gtk_widget_get_display (win));
        gdk_keymap_add_virtual_modifiers (keymap, &state);
        state = state & gtk_accelerator_get_default_mod_mask ();
        is_rtl = gtk_widget_get_direction (button) == GTK_TEXT_DIR_RTL;
diff --git a/src/gs-sources-dialog.c b/src/gs-sources-dialog.c
index 6bcc1dfe..1713312e 100644
--- a/src/gs-sources-dialog.c
+++ b/src/gs-sources-dialog.c
@@ -526,8 +526,9 @@ back_button_cb (GtkWidget *widget, GsSourcesDialog *dialog)
 }
 
 static gboolean
-key_press_event (GsSourcesDialog *dialog, GdkEventKey *event)
+key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
+       GsSourcesDialog *dialog = (GsSourcesDialog *) widget;
        GdkKeymap *keymap;
        GdkModifierType state;
        gboolean is_rtl;
@@ -536,7 +537,7 @@ key_press_event (GsSourcesDialog *dialog, GdkEventKey *event)
                return GDK_EVENT_PROPAGATE;
 
        state = event->state;
-       keymap = gdk_keymap_get_default ();
+       keymap = gdk_keymap_get_for_display (gtk_widget_get_display (widget));
        gdk_keymap_add_virtual_modifiers (keymap, &state);
        state = state & gtk_accelerator_get_default_mod_mask ();
        is_rtl = gtk_widget_get_direction (dialog->button_back) == GTK_TEXT_DIR_RTL;
diff --git a/src/gs-update-dialog.c b/src/gs-update-dialog.c
index ec670271..8fa0a315 100644
--- a/src/gs-update-dialog.c
+++ b/src/gs-update-dialog.c
@@ -592,8 +592,9 @@ scrollbar_mapped_cb (GtkWidget *sb, GtkScrolledWindow *swin)
 }
 
 static gboolean
-key_press_event (GsUpdateDialog *dialog, GdkEventKey *event)
+key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
+       GsUpdateDialog *dialog = (GsUpdateDialog *) widget;
        GdkKeymap *keymap;
        GdkModifierType state;
        gboolean is_rtl;
@@ -602,7 +603,7 @@ key_press_event (GsUpdateDialog *dialog, GdkEventKey *event)
                return GDK_EVENT_PROPAGATE;
 
        state = event->state;
-       keymap = gdk_keymap_get_default ();
+       keymap = gdk_keymap_get_for_display (gtk_widget_get_display (widget));
        gdk_keymap_add_virtual_modifiers (keymap, &state);
        state = state & gtk_accelerator_get_default_mod_mask ();
        is_rtl = gtk_widget_get_direction (dialog->button_back) == GTK_TEXT_DIR_RTL;


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