[nautilus/gnome-2-32: 33/283] Always set the parent window in dialogs (#573788).



commit 66846cd9d2ca172fefcd971623d41a458affdf9e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 26 17:05:05 2010 +0200

    Always set the parent window in dialogs (#573788).

 eel/eel-stock-dialogs.c                     |    2 +-
 libnautilus-private/nautilus-mime-actions.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c
index 34712c8..b6fe6b6 100644
--- a/eel/eel-stock-dialogs.c
+++ b/eel/eel-stock-dialogs.c
@@ -195,7 +195,7 @@ timed_wait_callback (gpointer callback_data)
 
 	/* Put up the timed wait window. */
 	button = wait->cancel_callback != NULL ? GTK_STOCK_CANCEL : GTK_STOCK_OK;
-	dialog = GTK_DIALOG (eel_alert_dialog_new (NULL,
+	dialog = GTK_DIALOG (eel_alert_dialog_new (wait->parent_window,
 		                                   0,
 		                                   GTK_MESSAGE_INFO,
 		                                   GTK_BUTTONS_NONE,
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index 77d933a..b97ca7c 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -1922,7 +1922,7 @@ activation_mount_not_mounted_callback (GObject *source_object,
 		     error->code != G_IO_ERROR_FAILED_HANDLED &&
 		     error->code != G_IO_ERROR_ALREADY_MOUNTED)) {
 			eel_show_error_dialog (_("Unable to mount location"),
-					       error->message, NULL);
+					       error->message, parameters->parent_window);
 		}
 
 		if (error->domain != G_IO_ERROR ||
@@ -2195,7 +2195,7 @@ activation_mountable_mounted (NautilusFile  *file,
 		     error->code != G_IO_ERROR_FAILED_HANDLED &&
 		     error->code != G_IO_ERROR_ALREADY_MOUNTED)) {
 			eel_show_error_dialog (_("Unable to mount location"),
-					       error->message, NULL);
+					       error->message, parameters->parent_window);
 		}
 
 		if (error->code == G_IO_ERROR_CANCELLED) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]