diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2013-08-24 08:26:59 -0700 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2013-08-24 08:26:59 -0700 |
| commit | 5b00469b73c176c81a544ec85051e5b2685fe487 (patch) | |
| tree | 544b491ab0cb67fefb1f52c13540c2405a012e37 | |
| parent | 68e9e10f8c604076bb9a20775c2e6e8fef63640b (diff) | |
| download | nautilus-5b00469b73c176c81a544ec85051e5b2685fe487.tar.gz | |
view: consistently use NULL instead of "" for no accelerators actions
As we don't inherit a stock accelerator anymore for those.
| -rw-r--r-- | src/nautilus-view.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/nautilus-view.c b/src/nautilus-view.c index df6bc424e..481d039f7 100644 --- a/src/nautilus-view.c +++ b/src/nautilus-view.c @@ -7214,10 +7214,8 @@ static const GtkActionEntry directory_view_entries[] = { /* label, accelerator */ N_("_Paste"), "<control>V", /* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command"), G_CALLBACK (action_paste_files_callback) }, - /* We make accelerator "" instead of null here to not inherit the stock - accelerator for paste */ /* name, stock id */ { NAUTILUS_ACTION_PASTE_FILES_INTO, NULL, - /* label, accelerator */ N_("_Paste Into Folder"), "", + /* label, accelerator */ N_("_Paste Into Folder"), NULL, /* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into the selected folder"), G_CALLBACK (action_paste_files_into_callback) }, /* name, stock id */ { NAUTILUS_ACTION_COPY_TO, NULL, @@ -7349,33 +7347,33 @@ static const GtkActionEntry directory_view_entries[] = { /* Location-specific actions */ /* name, stock id */ { NAUTILUS_ACTION_LOCATION_OPEN_ALTERNATE, NULL, - /* label, accelerator */ N_("Open in Navigation Window"), "", + /* label, accelerator */ N_("Open in Navigation Window"), NULL, /* tooltip */ N_("Open this folder in a navigation window"), G_CALLBACK (action_location_open_alternate_callback) }, /* name, stock id */ { NAUTILUS_ACTION_LOCATION_OPEN_IN_NEW_TAB, NULL, - /* label, accelerator */ N_("Open in New _Tab"), "", + /* label, accelerator */ N_("Open in New _Tab"), NULL, /* tooltip */ N_("Open this folder in a new tab"), G_CALLBACK (action_location_open_in_new_tab_callback) }, /* name, stock id */ { NAUTILUS_ACTION_LOCATION_CUT, NULL, - /* label, accelerator */ N_("Cu_t"), "", + /* label, accelerator */ N_("Cu_t"), NULL, /* tooltip */ N_("Prepare this folder to be moved with a Paste command"), G_CALLBACK (action_location_cut_callback) }, /* name, stock id */ { NAUTILUS_ACTION_LOCATION_COPY, NULL, - /* label, accelerator */ N_("_Copy"), "", + /* label, accelerator */ N_("_Copy"), NULL, /* tooltip */ N_("Prepare this folder to be copied with a Paste command"), G_CALLBACK (action_location_copy_callback) }, /* name, stock id */ { NAUTILUS_ACTION_LOCATION_PASTE_FILES_INTO, NULL, - /* label, accelerator */ N_("_Paste Into Folder"), "", + /* label, accelerator */ N_("_Paste Into Folder"), NULL, /* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into this folder"), G_CALLBACK (action_location_paste_files_into_callback) }, /* name, stock id */ { NAUTILUS_ACTION_LOCATION_TRASH, NULL, - /* label, accelerator */ N_("Mo_ve to Trash"), "", + /* label, accelerator */ N_("Mo_ve to Trash"), NULL, /* tooltip */ N_("Move this folder to the Trash"), G_CALLBACK (action_location_trash_callback) }, /* name, stock id */ { NAUTILUS_ACTION_LOCATION_DELETE, NAUTILUS_ICON_DELETE, - /* label, accelerator */ N_("_Delete"), "", + /* label, accelerator */ N_("_Delete"), NULL, /* tooltip */ N_("Delete this folder, without moving to the Trash"), G_CALLBACK (action_location_delete_callback) }, /* name, stock id */ { NAUTILUS_ACTION_LOCATION_RESTORE_FROM_TRASH, NULL, |