From 9228dcee29503f00c13f7379f0410e510c6a589b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 28 Nov 2005 14:03:20 +0000 Subject: [PATCH] Make F2 work for renaming bookmarks. (#320822, Jaap A. Haitsma, patch by 2005-11-28 Matthias Clasen * gtk/gtkfilechooserdefault.c (shortcuts_key_press_event_cb): Make F2 work for renaming bookmarks. (#320822, Jaap A. Haitsma, patch by Paolo Borelli) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtkfilechooserdefault.c | 18 ++++++++++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7106a9fecf..2d5b496cb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-28 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (shortcuts_key_press_event_cb): Make + F2 work for renaming bookmarks. (#320822, Jaap A. Haitsma, patch + by Paolo Borelli) + 2005-11-28 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_urgency_hint): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7106a9fecf..2d5b496cb7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-11-28 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (shortcuts_key_press_event_cb): Make + F2 work for renaming bookmarks. (#320822, Jaap A. Haitsma, patch + by Paolo Borelli) + 2005-11-28 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_set_urgency_hint): diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 2fd00ac894..d25d458977 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -2962,9 +2962,9 @@ remove_shortcut_cb (GtkMenuItem *item, remove_selected_bookmarks (impl); } +/* Rename the selected bookmark */ static void -rename_shortcut_cb (GtkMenuItem *item, - GtkFileChooserDefault *impl) +rename_selected_bookmark (GtkFileChooserDefault *impl) { GtkTreeIter iter; GtkTreePath *path; @@ -2986,6 +2986,13 @@ rename_shortcut_cb (GtkMenuItem *item, } } +static void +rename_shortcut_cb (GtkMenuItem *item, + GtkFileChooserDefault *impl) +{ + rename_selected_bookmark (impl); +} + /* Constructs the popup menu for the file list if needed */ static void shortcuts_build_popup_menu (GtkFileChooserDefault *impl) @@ -6789,6 +6796,13 @@ shortcuts_key_press_event_cb (GtkWidget *widget, return TRUE; } + if ((event->keyval == GDK_F2) + && (event->state & modifiers) == 0) + { + rename_selected_bookmark (impl); + return TRUE; + } + return FALSE; }