Attachment 945380 Details for Bug 1147357 – Suggested fix

Suggested fix

0001-application-Restore-new-window-functionality.patch (text/plain), 1.61 KB, created by Lubomir Rintel on 2014-10-09 15:57:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Rintel

Created: 2014-10-09 15:57:41 UTC

Size: 1.61 KB

patch

obsolete

>From 0650db052e4bec92ed195ca8853b7bf53a9e9407 Mon Sep 17 00:00:00 2001
>From: Lubomir Rintel <lkundrak@v3.sk>
>Date: Thu, 9 Oct 2014 17:38:44 +0200
>Subject: [PATCH] application: Restore --new-window functionality
>
>In case of no further arguments, open home folder. Commit
>[4e192481] "application: minimal port to handle_local_options()"
>removed this, presumably accidentally. It makes clicking the "Files"
>from favorites do nothing if Nautilus is already running (and it
>always is running in classic mode as it handles desktop).
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1147357
>---
> src/nautilus-application.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
>diff --git a/src/nautilus-application.c b/src/nautilus-application.c
>index 88ed0f5..d86dc39 100644
>--- a/src/nautilus-application.c
>+++ b/src/nautilus-application.c
>@@ -844,15 +844,17 @@ nautilus_application_handle_file_args (NautilusApplication *self,
> 
> 	g_variant_dict_lookup (options, G_OPTION_REMAINING, "^a&s", &remaining);
> 
>-	if (remaining == NULL) {
>-		return -1;
>-	}
>-
> 	/* Convert args to GFiles */
> 	file_array = g_ptr_array_new_full (0, g_object_unref);
> 
>-	for (idx = 0; remaining[idx] != NULL; idx++) {
>-		file = g_file_new_for_commandline_arg (remaining[idx]);
>+	if (remaining) {
>+		for (idx = 0; remaining[idx] != NULL; idx++) {
>+			file = g_file_new_for_commandline_arg (remaining[idx]);
>+			g_ptr_array_add (file_array, file);
>+		}
>+	} else if (!self->priv->no_default_window &&
>+            !g_variant_dict_contains (options, "select")) {
>+		file = g_file_new_for_path (g_get_home_dir ());
> 		g_ptr_array_add (file_array, file);
> 	}
> 
>-- 
>1.9.3
>

Actions: View

Attachments on bug 1147357: 945380