[gtk/wip/baedert/filechooser2: 4/10] filechooserwidget: Remove some GdkEvent usage
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/filechooser2: 4/10] filechooserwidget: Remove some GdkEvent usage
- Date: Sun, 28 Apr 2019 10:34:42 +0000 (UTC)
commit 2bd348558eb8d55e2d001e460e30b4a4b2f2122c
Author: Timm Bäder <mail baedert org>
Date: Sun Apr 28 11:05:37 2019 +0200
filechooserwidget: Remove some GdkEvent usage
gtk/gtkfilechooserwidget.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 8975080d33..4e1e5fe1e3 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -1259,13 +1259,10 @@ places_sidebar_show_error_message_cb (GtkPlacesSidebar *sidebar,
}
static gboolean
-key_is_left_or_right (const GdkEvent *event)
+key_is_left_or_right (guint keyval,
+ guint state)
{
- guint modifiers, keyval, state;
-
- if (!gdk_event_get_keyval (event, &keyval) ||
- !gdk_event_get_state (event, &state))
- return FALSE;
+ guint modifiers;
modifiers = gtk_accelerator_get_default_mod_mask ();
@@ -1326,11 +1323,8 @@ key_press_cb (GtkEventControllerKey *controller,
{
GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
GtkFileChooserWidgetPrivate *priv = impl->priv;
- const GdkEvent *event;
const char *string;
- event = gtk_get_current_event ();
-
if (should_trigger_location_entry (impl, keyval, state, &string) &&
(priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER))
@@ -1339,7 +1333,7 @@ key_press_cb (GtkEventControllerKey *controller,
return GDK_EVENT_STOP;
}
- if (key_is_left_or_right (event))
+ if (key_is_left_or_right (keyval, state))
{
if (gtk_widget_child_focus (priv->places_sidebar, GTK_DIR_LEFT))
return GDK_EVENT_STOP;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]