Modified Files: ChangeLog libnautilus-private/nautilus-program-chooser.c

Modified Files:
	ChangeLog libnautilus-private/nautilus-program-chooser.c
	src/nautilus-bookmarks-window.c
	src/nautilus-file-management-properties.c
	src/nautilus-property-browser.c src/nautilus-server-connect.c
	src/nautilus-window-menus.c src/nautilus-window.c
	src/file-manager/fm-desktop-icon-view.c
Change Close to OK for HIG compliance. Fixes bug #112207

11 files changed, 11 insertions, 11 deletions

diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index efd764e60..0ea488673 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -737,7 +737,7 @@ volume_ops_callback (BonoboUIComponent *component, gpointer data, const char *ve
 			status = egg_screen_execute_command_line_async (screen, command, &error);
 			if (!status) {
 				dialog = gtk_message_dialog_new (NULL, 0,
-								 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, 
+								 GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
 								 _("Error executing utility program '%s': %s"), command, error->message);
 				g_signal_connect (G_OBJECT (dialog), "response", 
 						  G_CALLBACK (gtk_widget_destroy), NULL);
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index d2a582202..473b27b03 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -142,7 +142,7 @@ nautilus_bookmarks_window_response_callback (GtkDialog *dialog,
 			err_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog),
 							     GTK_DIALOG_DESTROY_WITH_PARENT,
 							     GTK_MESSAGE_ERROR,
-							     GTK_BUTTONS_CLOSE,
+							     GTK_BUTTONS_OK,
 							     _("There was an error displaying help: \n%s"),
 							     error->message);
 
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 5955a4dd1..68d48e657 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -234,7 +234,7 @@ preferences_show_help (GtkWindow *parent,
 		dialog = gtk_message_dialog_new (GTK_WINDOW (parent),
 						 GTK_DIALOG_DESTROY_WITH_PARENT,
 						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_CLOSE,
+						 GTK_BUTTONS_OK,
 						 _("There was an error displaying help: \n%s"),
 						 error->message);
 
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 84f8bb386..454ac0842 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -765,7 +765,7 @@ help_menu_nautilus_manual_callback (BonoboUIComponent *component,
 		dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 						 GTK_DIALOG_MODAL,
 						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_CLOSE,
+						 GTK_BUTTONS_OK,
 						 _("There was an error displaying help: \n%s"),
 						 error->message);
 		g_signal_connect (G_OBJECT (dialog), "response",
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index b8623d152..dedf3b1ff 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -1909,7 +1909,7 @@ nautilus_window_display_error (NautilusWindow *window, const char *error_msg)
 	GtkWidget *dialog;
 	
 	dialog = gtk_message_dialog_new (GTK_WINDOW (window), 0, GTK_MESSAGE_ERROR,
-					 GTK_BUTTONS_CLOSE, error_msg, NULL);
+					 GTK_BUTTONS_OK, error_msg, NULL);
 	gtk_widget_show (dialog);
 }
 
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index b8623d152..dedf3b1ff 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -1909,7 +1909,7 @@ nautilus_window_display_error (NautilusWindow *window, const char *error_msg)
 	GtkWidget *dialog;
 	
 	dialog = gtk_message_dialog_new (GTK_WINDOW (window), 0, GTK_MESSAGE_ERROR,
-					 GTK_BUTTONS_CLOSE, error_msg, NULL);
+					 GTK_BUTTONS_OK, error_msg, NULL);
 	gtk_widget_show (dialog);
 }
 
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index c55a814d3..1fc9321ee 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -1440,7 +1440,7 @@ help_button_callback (GtkWidget *widget, GtkWidget *property_browser)
 		dialog = gtk_message_dialog_new (GTK_WINDOW (property_browser),
 						 GTK_DIALOG_DESTROY_WITH_PARENT,
 						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_CLOSE,
+						 GTK_BUTTONS_OK,
 						 _("There was an error displaying help: \n%s"),
 						 error->message);
 
diff --git a/src/nautilus-server-connect.c b/src/nautilus-server-connect.c
index 2a458ef80..858893c3e 100644
--- a/src/nautilus-server-connect.c
+++ b/src/nautilus-server-connect.c
@@ -52,7 +52,7 @@ error (char *msg)
 	dialog = gtk_message_dialog_new (NULL,
 			0,
 			GTK_MESSAGE_ERROR,
-			GTK_BUTTONS_CLOSE,
+			GTK_BUTTONS_OK,
 			msg,
 			NULL);
 	gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index b8623d152..dedf3b1ff 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -1909,7 +1909,7 @@ nautilus_window_display_error (NautilusWindow *window, const char *error_msg)
 	GtkWidget *dialog;
 	
 	dialog = gtk_message_dialog_new (GTK_WINDOW (window), 0, GTK_MESSAGE_ERROR,
-					 GTK_BUTTONS_CLOSE, error_msg, NULL);
+					 GTK_BUTTONS_OK, error_msg, NULL);
 	gtk_widget_show (dialog);
 }
 
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 84f8bb386..454ac0842 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -765,7 +765,7 @@ help_menu_nautilus_manual_callback (BonoboUIComponent *component,
 		dialog = gtk_message_dialog_new (GTK_WINDOW (window),
 						 GTK_DIALOG_MODAL,
 						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_CLOSE,
+						 GTK_BUTTONS_OK,
 						 _("There was an error displaying help: \n%s"),
 						 error->message);
 		g_signal_connect (G_OBJECT (dialog), "response",
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index b8623d152..dedf3b1ff 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1909,7 +1909,7 @@ nautilus_window_display_error (NautilusWindow *window, const char *error_msg)
 	GtkWidget *dialog;
 	
 	dialog = gtk_message_dialog_new (GTK_WINDOW (window), 0, GTK_MESSAGE_ERROR,
-					 GTK_BUTTONS_CLOSE, error_msg, NULL);
+					 GTK_BUTTONS_OK, error_msg, NULL);
 	gtk_widget_show (dialog);
 }