[gnome-software/gnome-3-26] Remove use of deprecated gdk_keymap_get_default() API
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/gnome-3-26] Remove use of deprecated gdk_keymap_get_default() API
- Date: Thu, 8 Feb 2018 11:52:54 +0000 (UTC)
commit 5a102db1cb9e9432c38d0b5d8e0f53474d0516c7
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 7a68492b..aceeb7e2 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -659,7 +659,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 db218dc2..8637cab5 100644
--- a/src/gs-sources-dialog.c
+++ b/src/gs-sources-dialog.c
@@ -533,8 +533,9 @@ remove_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;
@@ -543,7 +544,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]