Attachment 306187 Details for Bug 447624 – Patch that reverts to the old behaviour

[patch] Patch that reverts to the old behaviour

nautilus-2.22.2-no_link_to.patch (text/plain), 1.05 KB, created by Nils Philippsen on 2008-05-20 21:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nils Philippsen

Created: 2008-05-20 21:00:00 UTC

Size: 1.05 KB

patch

obsolete

>diff -up nautilus-2.22.2/libnautilus-private/nautilus-file-operations.c.no_link_to nautilus-2.22.2/libnautilus-private/nautilus-file-operations.c
>--- nautilus-2.22.2/libnautilus-private/nautilus-file-operations.c.no_link_to	2008-05-20 22:29:14.000000000 +0200
>+++ nautilus-2.22.2/libnautilus-private/nautilus-file-operations.c	2008-05-20 22:51:12.000000000 +0200
>@@ -240,9 +240,9 @@ get_link_name (const char *name, int cou
> 	
> 	g_assert (name != NULL);
> 
>-	if (count < 1) {
>+	if (count < 0) {
> 		g_warning ("bad count in get_link_name");
>-		count = 1;
>+		count = 0;
> 	}
> 
> 	if (count <= 2) {
>@@ -253,6 +253,10 @@ get_link_name (const char *name, int cou
> 		default:
> 			g_assert_not_reached ();
> 			/* fall through */
>+        case 0:
>+            /* leave it as it is */
>+            format = ("%s");
>+            break;
> 		case 1:
> 			/* appended to new link file */
> 			format = _("Link to %s");
>@@ -4290,7 +4294,7 @@ link_file (CopyMoveJob *job,
> 
> 	common = (CommonJob *)job;
> 
>-	count = 1;
>+	count = 0;
> 
> 	dest = get_target_file_for_link (src, dest_dir, count);
>

Actions: View | Diff

Attachments on bug 447624: 306187