summaryrefslogtreecommitdiffstats
path: root/main/nautilus/006-select-extension.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-04-25 18:06:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-04-25 19:53:02 +0000
commit286429b1aa72ee964ba0cac4b79c754859b1c60a (patch)
tree33c01e6792fd99a430be126c19b9b71947ffd060 /main/nautilus/006-select-extension.patch
parent3597c695c8ae4a22da8bd26c363aa8ceae267be3 (diff)
downloadaports-286429b1aa72ee964ba0cac4b79c754859b1c60a.tar.bz2
aports-286429b1aa72ee964ba0cac4b79c754859b1c60a.tar.xz
main/nautilus: upgrade to 2.32.2.1
Diffstat (limited to 'main/nautilus/006-select-extension.patch')
-rw-r--r--main/nautilus/006-select-extension.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/main/nautilus/006-select-extension.patch b/main/nautilus/006-select-extension.patch
new file mode 100644
index 000000000..fc1615e62
--- /dev/null
+++ b/main/nautilus/006-select-extension.patch
@@ -0,0 +1,59 @@
+From 0fa8f53c89b84a47fac33eb923a5fb196ca564ee Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Fri, 25 Feb 2011 20:11:46 +0000
+Subject: list-view: make sure not to select the extension on rename
+
+Delay calling gtk_editable_select_region() until after
+gtk_tree_view_set_cursor()
+
+https://bugzilla.gnome.org/show_bug.cgi?id=627110
+(cherry picked from commit 5e2edee2e8dc6b4eababdff993176d591cc2a6e6)
+---
+diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
+index 3f59959..cde5ac6 100644
+--- a/src/file-manager/fm-list-view.c
++++ b/src/file-manager/fm-list-view.c
+@@ -1172,7 +1172,6 @@ cell_renderer_editing_started_cb (GtkCellRenderer *renderer,
+ FMListView *list_view)
+ {
+ GtkEntry *entry;
+- gint start_offset, end_offset;
+
+ entry = GTK_ENTRY (editable);
+ list_view->details->editable_widget = editable;
+@@ -1181,9 +1180,6 @@ cell_renderer_editing_started_cb (GtkCellRenderer *renderer,
+ g_free (list_view->details->original_name);
+
+ list_view->details->original_name = g_strdup (gtk_entry_get_text (entry));
+- eel_filename_get_rename_region (list_view->details->original_name,
+- &start_offset, &end_offset);
+- gtk_editable_select_region (GTK_EDITABLE (entry), start_offset, end_offset);
+
+ nautilus_clipboard_set_up_editable
+ (GTK_EDITABLE (entry),
+@@ -2644,6 +2640,7 @@ fm_list_view_start_renaming_file (FMDirectoryView *view,
+ FMListView *list_view;
+ GtkTreeIter iter;
+ GtkTreePath *path;
++ gint start_offset, end_offset;
+
+ list_view = FM_LIST_VIEW (view);
+
+@@ -2679,6 +2676,15 @@ fm_list_view_start_renaming_file (FMDirectoryView *view,
+ list_view->details->file_name_column,
+ TRUE);
+
++ /* set cursor also triggers editing-started, where we save the editable widget */
++ if (list_view->details->editable_widget != NULL) {
++ eel_filename_get_rename_region (list_view->details->original_name,
++ &start_offset, &end_offset);
++
++ gtk_editable_select_region (GTK_EDITABLE (list_view->details->editable_widget),
++ start_offset, end_offset);
++ }
++
+ gtk_tree_path_free (path);
+ }
+
+--
+cgit v0.9