Index: gedit/gedit-mdi.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/gedit-mdi.c,v
retrieving revision 1.74
diff -u -p -r1.74 gedit-mdi.c
--- gedit/gedit-mdi.c	23 Oct 2003 20:51:12 -0000	1.74
+++ gedit/gedit-mdi.c	21 Dec 2003 17:27:55 -0000
@@ -59,6 +59,8 @@
 #include "recent-files/egg-recent-model.h"
 #include "gedit-languages-manager.h"
 
+#include <eel/eel-alert-dialog.h>
+
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-control.h>
 
@@ -965,11 +967,11 @@ gedit_mdi_remove_child_handler (BonoboMD
 			deleted = !gedit_utils_uri_exists (raw_uri);
 	}
 	g_free (raw_uri);
-				
+
 	if (gedit_document_get_modified (doc) || deleted)
 	{
 		GtkWidget *msgbox, *w;
-		gchar *fname = NULL, *msg = NULL;
+		gchar *fname = NULL, *msg = NULL, *msg2 = NULL;
 		gint ret;
 		gboolean exiting;
 
@@ -985,20 +987,6 @@ gedit_mdi_remove_child_handler (BonoboMD
 			bonobo_mdi_set_active_view (mdi, w);
 		}
 
-		fname = gedit_document_get_short_name (doc);
-
-		msgbox = gtk_message_dialog_new (GTK_WINDOW (bonobo_mdi_get_active_window (mdi)),
-				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-				GTK_MESSAGE_QUESTION,
-				GTK_BUTTONS_NONE,
-				_("Do you want to save the changes you made to the document \"%s\"? \n\n"
-				  "Your changes will be lost if you don't save them."),
-				fname);
-
-		gedit_dialog_add_button (GTK_DIALOG (msgbox),
-				_("Do_n't save"), GTK_STOCK_NO,
-				GTK_RESPONSE_NO);
-
 		if (gedit_close_x_button_pressed)
 			exiting = FALSE;
 		else if (gedit_exit_button_pressed)
@@ -1012,37 +1000,46 @@ gedit_mdi_remove_child_handler (BonoboMD
 				exiting = FALSE;
 		}
 
+		fname = gedit_document_get_short_name (doc);
+		msg = g_strdup_printf (_("Do you want to save the changes you made to the document \"%s\"?"),
+					fname);
+		msg2  = g_strdup (_("Your changes will be lost if you don't save them."));
+
+		msgbox = eel_alert_dialog_new (GTK_WINDOW (bonobo_mdi_get_active_window (mdi)),
+				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+				GTK_MESSAGE_QUESTION,
+				GTK_BUTTONS_NONE,
+				msg,
+				msg2,
+				NULL);
+		g_free (msg);
+		g_free (msg2);
+		g_free (fname);
+
 #if 0		
 		if (exiting)
 			gedit_dialog_add_button (GTK_DIALOG (msgbox),
-					_("_Don't quit"), GTK_STOCK_CANCEL,
-                	             	GTK_RESPONSE_CANCEL);
+					_("_Don't quit"), GTK_STOCK_NO,
+                	             	GTK_RESPONSE_NO);
 		else
 			gedit_dialog_add_button (GTK_DIALOG (msgbox),
-					_("_Don't close"), GTK_STOCK_CANCEL,
-                	             	GTK_RESPONSE_CANCEL);
+					_("_Don't close"), GTK_STOCK_NO,
+                	             	GTK_RESPONSE_NO);
 #endif
-		
-		gtk_dialog_add_button (GTK_DIALOG (msgbox), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+		gedit_dialog_add_button (GTK_DIALOG (msgbox),
+				_("Do_n't save"), GTK_STOCK_NO,
+				GTK_RESPONSE_NO);
 
-		gtk_dialog_add_button (GTK_DIALOG (msgbox),
-			       	GTK_STOCK_SAVE,
-				GTK_RESPONSE_YES);
+		gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
+					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					GTK_STOCK_SAVE, GTK_RESPONSE_YES, NULL);
 
 		gtk_dialog_set_default_response	(GTK_DIALOG (msgbox), GTK_RESPONSE_YES);
 
-		gtk_window_set_resizable (GTK_WINDOW (msgbox), FALSE);
-
 		gtk_widget_show (msgbox);
 		gtk_window_present (GTK_WINDOW (msgbox));
 
 		ret = gtk_dialog_run (GTK_DIALOG (msgbox));
-		
-		gtk_widget_destroy (msgbox);
-
-		g_free (fname);
-		g_free (msg);
-		
 		switch (ret)
 		{
 			case GTK_RESPONSE_YES:
@@ -1054,6 +1051,7 @@ gedit_mdi_remove_child_handler (BonoboMD
 			default:
 				close = FALSE;
 		}
+		gtk_widget_destroy (msgbox);
 
 		gedit_debug (DEBUG_MDI, "CLOSE: %s", close ? "TRUE" : "FALSE");
 	}
