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-window.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-window.c')
| -rw-r--r-- | src/caja-window.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/caja-window.c b/src/caja-window.c index 55a83e52..9dcf3863 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -1134,7 +1134,7 @@ add_view_as_menu_item (CajaWindow *window, g_snprintf (accel_path, sizeof (accel_path), "<Caja-Window>/%s", action_name); accel_keyval = gdk_keyval_from_name (accel); - g_assert (accel_keyval != GDK_VoidSymbol); + g_assert (accel_keyval != GDK_KEY_VoidSymbol); gtk_accel_map_add_entry (accel_path, accel_keyval, GDK_CONTROL_MASK); gtk_action_set_accel_path (GTK_ACTION (action), accel_path); @@ -2155,12 +2155,12 @@ caja_window_class_init (CajaWindowClass *class) G_TYPE_NONE, 0); binding_set = gtk_binding_set_by_class (class); - gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0, "go_up", 1, G_TYPE_BOOLEAN, FALSE); - gtk_binding_entry_add_signal (binding_set, GDK_F5, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_F5, 0, "reload", 0); - gtk_binding_entry_add_signal (binding_set, GDK_slash, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, 0, "prompt-for-location", 1, G_TYPE_STRING, "/"); |