summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Mocanu <mocanu.geo98@gmail.com>2018-05-20 09:09:48 +0000
committerCarlos Soriano <csoriano1618@gmail.com>2018-10-31 10:25:54 +0000
commita9a75e510f5e2e26e156c2746f1ae34f49077958 (patch)
treeb792da0c36ceef47ba6745d785746b04df51d551
parent6e7af9ecface1c2288ec2b495abb7a60cb2b9c1a (diff)
downloadnautilus-a9a75e510f5e2e26e156c2746f1ae34f49077958.tar.gz
general: Fix the error dialog not showing
Since commit c1bb594d, a dialog error wouldn't be shown if there was an error when renaming a file or setting permissions to a file. The user should be informed through a error dialog if something went wrong in the above-mentioned use-cases. This patch solves the issue by using the parent, instead of NULL. Closes #705 (cherry picked from commit 569c1acecbe01815a98cd42cfca5a4840b0e2754)
-rw-r--r--src/nautilus-mime-actions.c2
-rw-r--r--src/nautilus-properties-window.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 00ea1b47a..b7174ab81 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -2120,7 +2120,7 @@ activation_mountable_started (NautilusFile *file,
{
show_dialog (_("Unable to start location"),
error->message,
- NULL,
+ parameters->parent_window,
GTK_MESSAGE_ERROR);
}
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index a809554c9..bf19263d0 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -3406,7 +3406,7 @@ permission_change_callback (NautilusFile *file,
end_long_operation (window);
/* Report the error if it's an error. */
- nautilus_report_error_setting_permissions (file, error, NULL);
+ nautilus_report_error_setting_permissions (file, error, GTK_WINDOW (window));
g_object_unref (window);
}