diff -u nautilus-2.32.0/debian/changelog nautilus-2.32.0/debian/changelog --- nautilus-2.32.0/debian/changelog +++ nautilus-2.32.0/debian/changelog @@ -1,3 +1,31 @@ +nautilus (1:2.32.0-0ubuntu1.4~ppa2) maverick; urgency=low + + * debian/patches/101_not-select-extension-on-rename.patch: (LP: #658555) + - list-view: make sure not to select the extension on rename + + -- B. Clausius Sun, 20 Mar 2011 04:23:51 +0100 + +nautilus (1:2.32.0-0ubuntu1.3) maverick-proposed; urgency=low + + * debian/patches/100_dont_treat_tilda_as_a_relative_path.patch: (LP: #630512) + - Open the user's home dir when '~' is entered into the address bar. + + -- Omer Akram Mon, 03 Jan 2011 20:35:02 +0500 + +nautilus (1:2.32.0-0ubuntu1.2) maverick-proposed; urgency=low + + * debian/patches/97_unmount_crash_2.patch: + - Don't crash when unmounting usb devices. (LP: #683972) + + -- Omer Akram Tue, 11 Jan 2011 17:56:31 +0500 + +nautilus (1:2.32.0-0ubuntu1.1) maverick-proposed; urgency=low + + * debian/patches/96_git_unmount_crash.patch: backport an upstream commit + to fix nautilus crashing un unmount (lp: #630884) + + -- Sebastien Bacher Fri, 05 Nov 2010 11:09:49 +0100 + nautilus (1:2.32.0-0ubuntu1) maverick; urgency=low * New upstream release: diff -u nautilus-2.32.0/debian/patches/series nautilus-2.32.0/debian/patches/series --- nautilus-2.32.0/debian/patches/series +++ nautilus-2.32.0/debian/patches/series @@ -15,2 +15,5 @@ +96_git_unmount_crash.patch +97_unmount_crash_2.patch 99_ltmain_as-needed.patch - +100_dont_treat_tilda_as_a_relative_path.patch +101_not-select-extension-on-rename.patch only in patch2: unchanged: --- nautilus-2.32.0.orig/debian/patches/97_unmount_crash_2.patch +++ nautilus-2.32.0/debian/patches/97_unmount_crash_2.patch @@ -0,0 +1,32 @@ +From: Omer Akram +Author: Cosimo Cecchi +Subject: Pathbar: remove buttons only if the gone file is below the current. +Origin: http://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=c3b54e662b52ca15d1dcbe68386b8fa82b12adc5 +Bug: https://bugs.gnome.org/627901 +Bug-Ubuntu: https://launchpad.net/bugs/683972 + +--- a/src/nautilus-pathbar.c ++++ b/src/nautilus-pathbar.c +@@ -1571,10 +1571,12 @@ button_data_file_changed (NautilusFile *file, + } else if (nautilus_file_is_gone (file)) { + gint idx, position; + +- /* if the current location is gone, don't do anything, as the view ++ /* if the current or a parent location are gone, don't do anything, as the view + * will get the event too and call us back. + */ +- if (nautilus_file_compare_location (file, current_button_data->file) != 0) { ++ current_location = nautilus_file_get_location (current_button_data->file); ++ ++ if (g_file_has_prefix (location, current_location)) { + /* remove this and the following buttons */ + position = g_list_position (path_bar->button_list, + g_list_find (path_bar->button_list, button_data)); +@@ -1587,6 +1589,7 @@ button_data_file_changed (NautilusFile *file, + } + } + ++ g_object_unref (current_location); + g_object_unref (location); + return; + } only in patch2: unchanged: --- nautilus-2.32.0.orig/debian/patches/100_dont_treat_tilda_as_a_relative_path.patch +++ nautilus-2.32.0/debian/patches/100_dont_treat_tilda_as_a_relative_path.patch @@ -0,0 +1,27 @@ +From: Omer Akram +Author: Cosimo Cecchi +Subject: Location-entry: don't treat '~' as a relative path. +Origin: http://git.gnome.org/browse/nautilus/commit/?id=67d0cbaf0ed7a8f25b3a47abbbaf0feba990e404 +Bug: https://bugs.gnome.org/628802 +Bug-Ubuntu: https://launchpad.net/bugs/630512 + +--- a/src/nautilus-location-entry.c ++++ b/src/nautilus-location-entry.c +@@ -89,7 +89,7 @@ try_to_expand_path (gpointer callback_data) + user_location_length = g_utf8_strlen (user_location, -1); + entry->details->idle_id = 0; + +- if (!g_path_is_absolute (user_location)) { ++ if (!g_path_is_absolute (user_location) && user_location[0] != '~') { + absolute_location = g_build_filename (entry->details->current_directory, user_location, NULL); + suffix = g_filename_completer_get_completion_suffix (entry->details->completer, + absolute_location); +@@ -336,7 +336,7 @@ nautilus_location_entry_activate (GtkEntry *entry) + if (entry_text != NULL && *entry_text != '\0') { + uri_scheme = g_uri_parse_scheme (entry_text); + +- if (!g_path_is_absolute (entry_text) && uri_scheme == NULL) { ++ if (!g_path_is_absolute (entry_text) && uri_scheme == NULL && entry_text[0] != '~') { + /* Fix non absolute paths */ + full_path = g_build_filename (loc_entry->details->current_directory, entry_text, NULL); + gtk_entry_set_text (entry, full_path); only in patch2: unchanged: --- nautilus-2.32.0.orig/debian/patches/96_git_unmount_crash.patch +++ nautilus-2.32.0/debian/patches/96_git_unmount_crash.patch @@ -0,0 +1,39 @@ +From 1dc416887bf1e88c4b49bd1ac2101e0fb8460af8 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi +Date: Tue, 02 Nov 2010 18:01:13 +0000 +Subject: pathbar: fix crasher when unmounting volumes (#627901) + +--- +diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c +index a9e7adc..24478b9 100644 +--- a/src/nautilus-pathbar.c ++++ b/src/nautilus-pathbar.c +@@ -1571,14 +1571,19 @@ button_data_file_changed (NautilusFile *file, + } else if (nautilus_file_is_gone (file)) { + gint idx, position; + +- /* remove this and the following buttons */ +- position = g_list_position (path_bar->button_list, +- g_list_find (path_bar->button_list, button_data)); +- +- if (position != -1) { +- for (idx = 0; idx <= position; idx++) { +- gtk_container_remove (GTK_CONTAINER (path_bar), +- BUTTON_DATA (path_bar->button_list->data)->button); ++ /* if the current location is gone, don't do anything, as the view ++ * will get the event too and call us back. ++ */ ++ if (nautilus_file_compare_location (file, current_button_data->file) != 0) { ++ /* remove this and the following buttons */ ++ position = g_list_position (path_bar->button_list, ++ g_list_find (path_bar->button_list, button_data)); ++ ++ if (position != -1) { ++ for (idx = 0; idx <= position; idx++) { ++ gtk_container_remove (GTK_CONTAINER (path_bar), ++ BUTTON_DATA (path_bar->button_list->data)->button); ++ } + } + } + + only in patch2: unchanged: --- nautilus-2.32.0.orig/debian/patches/101_not-select-extension-on-rename.patch +++ nautilus-2.32.0/debian/patches/101_not-select-extension-on-rename.patch @@ -0,0 +1,44 @@ +--- nautilus-2.32.0.orig/src/file-manager/fm-list-view.c ++++ nautilus-2.32.0/src/file-manager/fm-list-view.c +@@ -1172,7 +1172,6 @@ + FMListView *list_view) + { + GtkEntry *entry; +- gint start_offset, end_offset; + + entry = GTK_ENTRY (editable); + list_view->details->editable_widget = editable; +@@ -1181,9 +1180,6 @@ + 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 @@ + FMListView *list_view; + GtkTreeIter iter; + GtkTreePath *path; ++ gint start_offset, end_offset; + + list_view = FM_LIST_VIEW (view); + +@@ -2679,6 +2676,15 @@ + 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); + } +