Merge lp:~om26er/ubuntu/maverick/nautilus/nautilus-fix-630512-maverick into lp:ubuntu/maverick-proposed/nautilus

[Omer Akram]

cherry picked from upstream git to fix bug 630512. although the issue is a very small one but it got media attention and is a regression-release

[Bilal Akhtar (bilalakhtar)]

Looks good, except for a few not-so-important problems with your patch:

1) Change the Origin: DEP-3 tag in debian/patches/dont_treat_tilda_as_a_relative_path.patch to Applied-Upstream:

2) In the changelog, (LP: 630512) is not likely to close the bug. Make it (LP: #630512).

3) I may be wrong, but the usual convention is to get the new patch apply the last in debian/patches/series. Moreover, the proper convention is to have a number at the beginning of the name of the patch, so in this case rename the patch to 100_dont_treat_tilda_as_a_relative_path.patch and make the same change in debian/patches/series as well.

[Bilal Akhtar (bilalakhtar)]

review: Needs Fixing

[Artur Rona (ari-tczew)]

1)'From' tag should show who sent a patch to Ubuntu, so please use yourself. For Cosimo please use tag ' Author'.

2) debian/changelog: Please move (LP: #630512) one line above, so it should be:
* debian/patches/dont_treat_tilda_as_a_relative_path.patch: (LP: #630512)
It prevents from too long lines.

3) As Bilal suggested, rename patch and move it at the end of series file.

review: Needs Fixing

[lp:~om26er/ubuntu/maverick/nautilus/nautilus-fix-630512-maverick]

205. By Omer Akram on 2011-01-09

* debian/patches/dont_treat_tilda_as_a_relative_path.patch: (LP: #630512)
  - Open the user's home dir when '~' is entered into the address bar.

206. By Omer Akram on 2011-01-09

debian/patches/100_dont_treat_tilda_as_a_relative_path.patch: (LP: #630512)

[Omer Akram (om26er)]

I have made the suggested changes. Thanks for the review.

[Artur Rona (ari-tczew)]

OK now looks good. Please any core-dev upload.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-05 11:09:49 +0000
+++ debian/changelog	2011-01-09 17:11:23 +0000
@@ -1,3 +1,10 @@
+nautilus (1:2.32.0-0ubuntu1.2) 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 <[e-mail]>  Mon, 03 Jan 2011 20:35:02 +0500
+
 nautilus (1:2.32.0-0ubuntu1.1) maverick-proposed; urgency=low
 
   * debian/patches/96_git_unmount_crash.patch: backport an upstream commit

=== added file 'debian/patches/100_dont_treat_tilda_as_a_relative_path.patch'
--- debian/patches/100_dont_treat_tilda_as_a_relative_path.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/100_dont_treat_tilda_as_a_relative_path.patch	2011-01-09 17:11:23 +0000
@@ -0,0 +1,27 @@
+From: Omer Akram <[e-mail]>
+Author: Cosimo Cecchi <[e-mail]>
+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);

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-05 11:09:49 +0000
+++ debian/patches/series	2011-01-09 17:11:23 +0000
@@ -14,4 +14,4 @@
 95_no-initial-fade.patch
 96_git_unmount_crash.patch
 99_ltmain_as-needed.patch
-
+100_dont_treat_tilda_as_a_relative_path.patch