diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-05 23:14:35 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:50 +0200 |
| commit | b24f066e23fb5b204c940c229c5cdebffd2f7600 (patch) | |
| tree | 405f3aba07a9951344e35e7dbd4a19e3bd76ec79 /src/caja-places-sidebar.c | |
| parent | 360d966dfa2a9ebe579e77d4f59a1e3b37ead28c (diff) | |
| download | caja-b24f066e23fb5b204c940c229c5cdebffd2f7600.tar.bz2 caja-b24f066e23fb5b204c940c229c5cdebffd2f7600.tar.xz | |
[src] convert to new GDK_KEY prefix
http://git.gnome.org/browse/nautilus/commit/?id=71fa1a50145a6f06da3b805a29e75c1295fd546b
Also, make sure we use GDK_KEY prefix in places-sidebar where this patch was previously
applied to Caja but with old prefix:
places-sidebar: allow keyboard navigation with Enter/Space (#637768)
http://git.gnome.org/browse/nautilus/commit/?id=fd03c910a73ba18459e68baaf15e8dd295acd5c1
Diffstat (limited to 'src/caja-places-sidebar.c')
| -rw-r--r-- | src/caja-places-sidebar.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c index eb05ba37..c12c6200 100644 --- a/src/caja-places-sidebar.c +++ b/src/caja-places-sidebar.c @@ -2577,10 +2577,10 @@ bookmarks_key_press_event_cb (GtkWidget *widget, modifiers = gtk_accelerator_get_default_mod_mask (); - if (event->keyval == GDK_Return || - event->keyval == GDK_KP_Enter || - event->keyval == GDK_ISO_Enter || - event->keyval == GDK_space) + if (event->keyval == GDK_KEY_Return || + event->keyval == GDK_KEY_KP_Enter || + event->keyval == GDK_KEY_ISO_Enter || + event->keyval == GDK_KEY_space) { if ((event->state & modifiers) == GDK_SHIFT_MASK) flags = CAJA_WINDOW_OPEN_FLAG_NEW_TAB; @@ -2596,21 +2596,21 @@ bookmarks_key_press_event_cb (GtkWidget *widget, return TRUE; } - if (event->keyval == GDK_Down && + if (event->keyval == GDK_KEY_Down && (event->state & modifiers) == GDK_MOD1_MASK) { return eject_or_unmount_selection (sidebar); } - if ((event->keyval == GDK_Delete - || event->keyval == GDK_KP_Delete) + if ((event->keyval == GDK_KEY_Delete + || event->keyval == GDK_KEY_KP_Delete) && (event->state & modifiers) == 0) { remove_selected_bookmarks (sidebar); return TRUE; } - if ((event->keyval == GDK_F2) + if ((event->keyval == GDK_KEY_F2) && (event->state & modifiers) == 0) { rename_selected_bookmark (sidebar); |