Index: gedit/gedit-utils.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/gedit-utils.c,v
retrieving revision 1.48
diff -u -p -r1.48 gedit-utils.c
--- gedit/gedit-utils.c	29 Dec 2003 23:06:13 -0000	1.48
+++ gedit/gedit-utils.c	1 Jan 2004 20:22:39 -0000
@@ -36,6 +36,7 @@
 #include <glib/gunicode.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomevfs/gnome-vfs.h>
+#include <eel/eel-gtk-extensions.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-string.h>
 
@@ -250,54 +251,6 @@ gedit_utils_is_uri_read_only (const gcha
 	return res;	
 }
 
-GtkWidget* 
-gedit_button_new_with_stock_image (const gchar* text, const gchar* stock_id)
-{
-	GtkWidget *button;
-	GtkStockItem item;
-	GtkWidget *label;
-	GtkWidget *image;
-	GtkWidget *hbox;
-	GtkWidget *align;
-
-	button = gtk_button_new ();
-
- 	if (GTK_BIN (button)->child)
-    		gtk_container_remove (GTK_CONTAINER (button),
-				      GTK_BIN (button)->child);
-
-  	if (gtk_stock_lookup (stock_id, &item))
-    	{
-      		label = gtk_label_new_with_mnemonic (text);
-
-		gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-      
-		image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
-      		hbox = gtk_hbox_new (FALSE, 2);
-
-      		align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-      
-      		gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-      		gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-      
-      		gtk_container_add (GTK_CONTAINER (button), align);
-      		gtk_container_add (GTK_CONTAINER (align), hbox);
-      		gtk_widget_show_all (align);
-
-      		return button;
-    	}
-
-      	label = gtk_label_new_with_mnemonic (text);
-      	gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-  
-  	gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-
-  	gtk_widget_show (label);
-  	gtk_container_add (GTK_CONTAINER (button), label);
-
-	return button;
-}
-
 GtkWidget*
 gedit_dialog_add_button (GtkDialog *dialog, const gchar* text, const gchar* stock_id,
 			 gint response_id)
@@ -308,7 +261,7 @@ gedit_dialog_add_button (GtkDialog *dial
 	g_return_val_if_fail (text != NULL, NULL);
 	g_return_val_if_fail (stock_id != NULL, NULL);
 
-	button = gedit_button_new_with_stock_image (text, stock_id);
+	button = eel_gtk_button_new_with_stock_icon (text, stock_id);
 	g_return_val_if_fail (button != NULL, NULL);
 
 	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
@@ -1298,10 +1251,18 @@ gedit_utils_get_stdin (void)
 }
 
 void 
-gedit_warning (gchar *str, GtkWindow *parent)
+gedit_warning (GtkWindow *parent, gchar *format, ...)
 {
+	va_list args;
+	gchar *str;
 	GtkWidget *dialog;
 
+	g_return_if_fail (format != NULL);
+
+	va_start (args, format);
+	str = g_strdup_vprintf (format, args);
+	va_end (args);
+
 	dialog = gtk_message_dialog_new (
 			parent,
 			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1312,10 +1273,13 @@ gedit_warning (gchar *str, GtkWindow *pa
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 
 	gtk_dialog_run (GTK_DIALOG (dialog));
 
 	gtk_widget_destroy (dialog);
+
+	g_free (str);
 }
 
 
Index: gedit/gedit-utils.h
===================================================================
RCS file: /cvs/gnome/gedit/gedit/gedit-utils.h,v
retrieving revision 1.25
diff -u -p -r1.25 gedit-utils.h
--- gedit/gedit-utils.h	12 Jun 2003 18:00:00 -0000	1.25
+++ gedit/gedit-utils.h	1 Jan 2004 20:22:39 -0000
@@ -44,9 +44,6 @@ void	gedit_utils_flash_va  (gchar *forma
 gboolean gedit_utils_is_uri_read_only (const gchar* uri);
 gboolean gedit_utils_uri_has_file_scheme (const gchar *uri);
 
-GtkWidget *gedit_button_new_with_stock_image (const gchar* text, 
-					      const gchar* stock_id);
-
 GtkWidget *gedit_dialog_add_button (GtkDialog *dialog, 
 				    const gchar* text, 
 				    const gchar* stock_id, 
@@ -84,7 +81,7 @@ gboolean gedit_utils_create_empty_file (
 
 gchar *gedit_utils_get_stdin (void);
 
-void gedit_warning (gchar *str, GtkWindow *parent);
+void gedit_warning (GtkWindow *parent, gchar *format, ...);
 
 #endif /* __GEDIT_UTILS_H__ */
 
Index: gedit/dialogs/gedit-dialog-goto-line.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-dialog-goto-line.c,v
retrieving revision 1.17
diff -u -p -r1.17 gedit-dialog-goto-line.c
--- gedit/dialogs/gedit-dialog-goto-line.c	23 Aug 2003 15:32:48 -0000	1.17
+++ gedit/dialogs/gedit-dialog-goto-line.c	1 Jan 2004 20:22:39 -0000
@@ -131,30 +131,33 @@ dialog_goto_line_get_dialog (void)
 	GladeXML *gui;
 	GtkWindow *window;
 	GtkWidget *content;
-	GtkWidget *button;
 
 	gedit_debug (DEBUG_SEARCH, "");
 
+	window = GTK_WINDOW (bonobo_mdi_get_active_window
+			     (BONOBO_MDI (gedit_mdi)));
+
 	if (dialog != NULL)
 	{
+		gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
+					      GTK_WINDOW (window));
 		gtk_window_present (GTK_WINDOW (dialog->dialog));
-		gtk_widget_grab_focus (dialog->dialog);
+		gtk_widget_grab_focus (dialog->entry);
 
 		return dialog;
 	}
 
 	gui = glade_xml_new (GEDIT_GLADEDIR "goto-line.glade2",
 			     "goto_line_dialog_content", NULL);
-
-	if (!gui) {
-		g_warning
-		    ("Could not find goto-line.glade2, reinstall gedit.\n");
+	if (!gui)
+	{
+		/* Translators: %s is a file path */
+		gedit_warning (window,
+			       _("Could not find \"%s\", reinstall gedit.\n"),
+			       GEDIT_GLADEDIR "goto-line.glade2");
 		return NULL;
 	}
 
-	window = GTK_WINDOW (bonobo_mdi_get_active_window
-			     (BONOBO_MDI (gedit_mdi)));
-
 	dialog = g_new0 (GeditDialogGotoLine, 1);
 
 	dialog->dialog = gtk_dialog_new_with_buttons (_("Go to Line"),
@@ -166,30 +169,28 @@ dialog_goto_line_get_dialog (void)
 
 	g_return_val_if_fail (dialog->dialog != NULL, NULL);
 
-	/* Add Goto Line button */
-	button = gedit_button_new_with_stock_image (_("_Go to Line"), GTK_STOCK_JUMP_TO);
-	g_return_val_if_fail (button != NULL, NULL);
-
-	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
 
-	gtk_widget_show (button);
+	gedit_dialog_add_button (GTK_DIALOG (dialog->dialog),
+				 _("_Go to Line"), GTK_STOCK_JUMP_TO,
+				 GTK_RESPONSE_OK);
 
-	gtk_dialog_add_action_widget (GTK_DIALOG (dialog->dialog), 
-				      button, GTK_RESPONSE_OK);
-	
 	content = glade_xml_get_widget (gui, "goto_line_dialog_content");
 
 	dialog->entry = glade_xml_get_widget (gui, "entry");
 
-	if (!dialog->entry) {
-		g_warning (
-			_("Could not find the required widgets inside %s."),
-			"goto-line.glade2");
+	if (!dialog->entry)
+	{
+		/* Translators: %s is a file path */
+		gedit_warning (window,
+			       _("Could not find the required widgets inside \"%s\"."),
+			       GEDIT_GLADEDIR "goto-line.glade2");
 		g_object_unref (gui);
 		g_free (dialog);
 		return NULL;
 	}
-	
+
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox),
 			    content, FALSE, FALSE, 0);
 
@@ -213,12 +214,9 @@ dialog_goto_line_get_dialog (void)
 
 	g_object_unref (gui);
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-
 	return dialog;
 }
 
-
 void
 gedit_dialog_goto_line (void)
 {
@@ -227,17 +225,7 @@ gedit_dialog_goto_line (void)
 	gedit_debug (DEBUG_SEARCH, "");
 
 	dialog = dialog_goto_line_get_dialog ();
-	if (dialog == NULL) {
-		g_warning ("Could not create the Goto Line dialog");
-		return;
-	}
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
-				      GTK_WINDOW
-				      (bonobo_mdi_get_active_window
-				       (BONOBO_MDI (gedit_mdi))));
-
-	gtk_widget_grab_focus (dialog->entry);
+	g_return_if_fail (dialog);
 
 	if (!GTK_WIDGET_VISIBLE (dialog->dialog))
 		gtk_widget_show (dialog->dialog);
Index: gedit/dialogs/gedit-dialog-replace.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-dialog-replace.c,v
retrieving revision 1.31
diff -u -p -r1.31 gedit-dialog-replace.c
--- gedit/dialogs/gedit-dialog-replace.c	29 Dec 2003 23:06:14 -0000	1.31
+++ gedit/dialogs/gedit-dialog-replace.c	1 Jan 2004 20:22:42 -0000
@@ -238,13 +238,17 @@ dialog_replace_get_dialog (void)
 	GladeXML *gui;
 	GtkWindow *window;
 	GtkWidget *content;
-	GtkWidget *button;
 	GtkWidget *replace_with_label;
 	
 	gedit_debug (DEBUG_SEARCH, "");
 	
+	window = GTK_WINDOW (bonobo_mdi_get_active_window
+			     (BONOBO_MDI (gedit_mdi)));
+
 	if (dialog != NULL)
 	{
+		gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
+					      GTK_WINDOW (window));
 		gtk_window_present (GTK_WINDOW (dialog->dialog));
 		gtk_widget_grab_focus (dialog->dialog);
 
@@ -253,16 +257,15 @@ dialog_replace_get_dialog (void)
 
 	gui = glade_xml_new ( GEDIT_GLADEDIR "replace.glade2",
 			     "replace_dialog_content", NULL);
-
-	if (!gui) {
-		g_warning
-		    ("Could not find replace.glade2, reinstall gedit.\n");
+	if (!gui)
+	{
+		/* Translators: %s is a file path */
+		gedit_warning (window,
+			       _("Could not find \"%s\", reinstall gedit.\n"),
+			       GEDIT_GLADEDIR "replace.glade2");
 		return NULL;
 	}
 
-	window = GTK_WINDOW (bonobo_mdi_get_active_window
-			     (BONOBO_MDI (gedit_mdi)));
-
 	dialog = g_new0 (GeditDialogReplace, 1);
 
 	dialog->dialog = gtk_dialog_new_with_buttons (_("Replace"),
@@ -274,22 +277,16 @@ dialog_replace_get_dialog (void)
 
 	g_return_val_if_fail (dialog->dialog != NULL, NULL);
 
-	/* Add Replace All button */
+	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
+
 	gtk_dialog_add_button (GTK_DIALOG (dialog->dialog), 
 			       _("Replace _All"), GEDIT_RESPONSE_REPLACE_ALL);
-	
-	/* Add Replace button */
-	button = gedit_button_new_with_stock_image (_("_Replace"), GTK_STOCK_FIND_AND_REPLACE);
-	g_return_val_if_fail (button != NULL, NULL);
-
-	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-
-	gtk_widget_show (button);
 
-	gtk_dialog_add_action_widget (GTK_DIALOG (dialog->dialog), 
-				      button, GEDIT_RESPONSE_REPLACE);
+	gedit_dialog_add_button (GTK_DIALOG (dialog->dialog),
+				 _("_Replace"), GTK_STOCK_FIND_AND_REPLACE,
+				 GEDIT_RESPONSE_REPLACE);
 
-	/* Add Find button */
 	gtk_dialog_add_button (GTK_DIALOG (dialog->dialog), 
 			       GTK_STOCK_FIND, GEDIT_RESPONSE_FIND);
 
@@ -315,8 +312,10 @@ dialog_replace_get_dialog (void)
 	    !dialog->wrap_around_checkbutton 	||
 	    !dialog->search_backwards_checkbutton)
 	{
-		g_print
-		    ("Could not find the required widgets inside replace.glade2.\n");
+		/* Translators: %s is a file path */
+		gedit_warning (window,
+			       _("Could not find the required widgets inside \"%s\".\n"),
+			       GEDIT_GLADEDIR "replace.glade2");
 		return NULL;
 	}
 
@@ -347,8 +346,6 @@ dialog_replace_get_dialog (void)
 
 	g_object_unref (G_OBJECT (gui));
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-	
 	return dialog;
 }
 
@@ -381,8 +378,13 @@ dialog_find_get_dialog (void)
 	
 	gedit_debug (DEBUG_SEARCH, "");
 
+	window = GTK_WINDOW (bonobo_mdi_get_active_window
+			     (BONOBO_MDI (gedit_mdi)));
+
 	if (dialog != NULL)
 	{
+		gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
+					      GTK_WINDOW (window));
 		gtk_window_present (GTK_WINDOW (dialog->dialog));
 		gtk_widget_grab_focus (dialog->dialog);
 
@@ -391,16 +393,15 @@ dialog_find_get_dialog (void)
 
 	gui = glade_xml_new (GEDIT_GLADEDIR "replace.glade2",
 			     "replace_dialog_content", NULL);
-
-	if (!gui) {
-		g_warning
-		    ("Could not find replace.glade2, reinstall gedit.\n");
+	if (!gui)
+	{
+		/* Translators: %s is a file path */
+		gedit_warning (window,
+			       _("Could not find \"%s\", reinstall gedit.\n"),
+			       GEDIT_GLADEDIR "replace.glade2");
 		return NULL;
 	}
 
-	window = GTK_WINDOW (bonobo_mdi_get_active_window
-			     (BONOBO_MDI (gedit_mdi)));
-
 	dialog = g_new0 (GeditDialogFind, 1);
 
 	dialog->dialog = gtk_dialog_new_with_buttons (_("Find"),
@@ -414,6 +415,9 @@ dialog_find_get_dialog (void)
 
 	g_return_val_if_fail (dialog->dialog != NULL, NULL);
 
+	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
+
 	content = glade_xml_get_widget (gui, "replace_dialog_content");
 
 	dialog->search_entry       = glade_xml_get_widget (gui, "search_for_text_entry");
@@ -440,11 +444,13 @@ dialog_find_get_dialog (void)
 	    !dialog->wrap_around_checkbutton	||
 	    !dialog->search_backwards_checkbutton)
 	{
-		g_print
-		    ("Could not find the required widgets inside replace.glade2.\n");
+		/* Translators: %s is a file path */
+		gedit_warning (window,
+			       _("Could not find the required widgets inside \"%s\".\n"),
+			       GEDIT_GLADEDIR "replace.glade2");
 		return NULL;
 	}
-	
+
 	gtk_widget_hide (replace_with_label);
 	gtk_widget_hide (replace_entry);
 
@@ -470,8 +476,6 @@ dialog_find_get_dialog (void)
 
 	g_object_unref (G_OBJECT (gui));
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-	
 	return dialog;
 }
 
@@ -557,7 +561,6 @@ insert_text_handler (GtkEditable *editab
 	g_free (escaped_text);
 }
 
-
 void
 gedit_dialog_find (void)
 {
@@ -576,15 +579,7 @@ gedit_dialog_find (void)
 	gedit_debug (DEBUG_SEARCH, "");
 
 	dialog = dialog_find_get_dialog ();
-	if (dialog == NULL) {
-		g_warning ("Cannot create the Find dialog");
-		return;
-	}
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
-				      GTK_WINDOW
-				      (bonobo_mdi_get_active_window
-				       (BONOBO_MDI (gedit_mdi))));
+	g_return_if_fail (dialog);
 
 	if (GTK_WIDGET_VISIBLE (dialog->dialog))
 		return;
@@ -689,15 +684,7 @@ gedit_dialog_replace (void)
 	gedit_debug (DEBUG_SEARCH, "");
 
 	dialog = dialog_replace_get_dialog ();
-	if (dialog == NULL) {
-		g_warning ("Cannot create the Replace dialog");
-		return;
-	}
-
-	gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
-				      GTK_WINDOW
-				      (bonobo_mdi_get_active_window
-				       (BONOBO_MDI (gedit_mdi))));
+	g_return_if_fail (dialog);
 
 	if (GTK_WIDGET_VISIBLE (dialog->dialog))
 		return;
@@ -1072,7 +1059,6 @@ replace_dlg_replace_button_pressed (Gedi
 	gedit_debug (DEBUG_SEARCH, "END");
 }
 
-
 static void
 replace_dlg_replace_all_button_pressed (GeditDialogReplace *dialog)
 {
Index: gedit/dialogs/gedit-dialog-uri.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-dialog-uri.c,v
retrieving revision 1.11
diff -u -p -r1.11 gedit-dialog-uri.c
--- gedit/dialogs/gedit-dialog-uri.c	6 Jun 2003 16:26:08 -0000	1.11
+++ gedit/dialogs/gedit-dialog-uri.c	1 Jan 2004 20:22:42 -0000
@@ -70,18 +70,20 @@ dialog_open_uri_get_dialog (void)
 	if (dialog != NULL)
 		return dialog;
 
+	window = GTK_WINDOW (bonobo_mdi_get_active_window
+			     (BONOBO_MDI (gedit_mdi)));
+
 	gui = glade_xml_new (GEDIT_GLADEDIR "uri.glade2",
 			     "open_uri_dialog_content", NULL);
-
-	if (!gui) {
-		g_warning
-		    ("Could not find uri.glade2, reinstall gedit.\n");
+	if (!gui)
+	{
+		/* Translators: %s is a file path */
+		gedit_warning (window,
+			       _("Could not find \"%s\", reinstall gedit.\n"),
+		    	       GEDIT_GLADEDIR "uri.glade2");
 		return NULL;
 	}
 
-	window = GTK_WINDOW (bonobo_mdi_get_active_window
-			     (BONOBO_MDI (gedit_mdi)));
-
 	dialog = g_new0 (GeditDialogOpenUri, 1);
 
 	dialog->dialog = gtk_dialog_new_with_buttons (_("Open Location"),
@@ -97,6 +99,9 @@ dialog_open_uri_get_dialog (void)
 
 	g_return_val_if_fail (dialog->dialog != NULL, NULL);
 
+	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog->dialog), FALSE);
+
 	content = glade_xml_get_widget (gui, "open_uri_dialog_content");
 
 	dialog->uri = glade_xml_get_widget (gui, "uri");
@@ -106,7 +111,10 @@ dialog_open_uri_get_dialog (void)
 	
 	if (!dialog->uri || !dialog->uri_list || !encoding_label || !encoding_hbox) 
 	{
-		g_print ("Could not find the required widgets inside uri.glade.\n");
+		/* Translators: %s is a file path */
+		gedit_warning (window,
+			       _("Could not find the required widgets inside \"%s\"."),
+			       GEDIT_GLADEDIR "uri.glade2");
 		return NULL;
 	}
 
@@ -131,8 +139,6 @@ dialog_open_uri_get_dialog (void)
 
 	g_object_unref (gui);
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-
 	return dialog;
 }
 
Index: gedit/dialogs/gedit-page-setup-dialog.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-page-setup-dialog.c,v
retrieving revision 1.3
diff -u -p -r1.3 gedit-page-setup-dialog.c
--- gedit/dialogs/gedit-page-setup-dialog.c	21 Oct 2003 16:04:09 -0000	1.3
+++ gedit/dialogs/gedit-page-setup-dialog.c	1 Jan 2004 20:22:44 -0000
@@ -106,7 +106,6 @@ dialog_response_handler (GtkDialog *dlg,
 	}
 }
 
-
 static void
 syntax_checkbutton_toggled (GtkToggleButton *button, GeditPageSetupDialog *dlg)
 {
@@ -570,31 +569,21 @@ get_page_setup_dialog (GtkWindow *parent
 
 	if (dialog != NULL)
 	{
-
-		gtk_window_present (GTK_WINDOW (dialog->dialog));
-
 		gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
 					      parent);
+		gtk_window_present (GTK_WINDOW (dialog->dialog));
 
 		return dialog;
 	}
 
 	gui = glade_xml_new (GEDIT_GLADEDIR "page-setup-dialog.glade2",
 			     "dialog", NULL);
-
 	if (!gui)
 	{
-		gchar *tmp;
-		
 		/* Translators: %s is a file path */
-		tmp = g_strdup_printf (
-			_("Could not find '%s'.\n\nPlease, reinstall gedit"),
-			GEDIT_GLADEDIR "page-setup-dialog.glade2");
-
-		gedit_warning (tmp, parent);
-
-		g_free (tmp);
-
+		gedit_warning (parent,
+			       _("Could not find \"%s\", reinstall gedit.\n"),
+			       GEDIT_GLADEDIR "page-setup-dialog.glade2");
 		return NULL;
 	}
 
@@ -634,17 +623,10 @@ get_page_setup_dialog (GtkWindow *parent
 	    !dialog->numbers_font_label		||
 	    !dialog->restore_button)
 	{
-		gchar *tmp;
-		
 		/* Translators: %s is a file path */
-		tmp = g_strdup_printf (
-			_("Could not find the required widgets inside '%s'.\n\n"
-			  "Please, reinstall gedit."),
-			GEDIT_GLADEDIR "page-setup-dialog.glade2");
-
-		gedit_warning (tmp, parent);
-
-		g_free (tmp);
+		gedit_warning (parent,
+			       _("Could not find the required widgets inside \"%s\".\n"),
+			       GEDIT_GLADEDIR "page-setup-dialog.glade2");
 
 		if (!dialog->dialog)
 			gtk_widget_destroy (dialog->dialog);
@@ -655,7 +637,7 @@ get_page_setup_dialog (GtkWindow *parent
 
 		return NULL;
 	}
-	
+
 	setup_general_page (dialog);
 	setup_font_page (dialog);
 	
@@ -686,9 +668,7 @@ gedit_show_page_setup_dialog (GtkWindow 
 	g_return_if_fail (parent != NULL);
 
 	dialog = get_page_setup_dialog (parent);
-	
-	if (dialog == NULL) 
-		return;
+	g_return_if_fail (dialog != NULL);
 
 	if (!GTK_WIDGET_VISIBLE (dialog->dialog))
 		gtk_widget_show_all (dialog->dialog);
Index: gedit/dialogs/gedit-plugin-program-location-dialog.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-plugin-program-location-dialog.c,v
retrieving revision 1.7
diff -u -p -r1.7 gedit-plugin-program-location-dialog.c
--- gedit/dialogs/gedit-plugin-program-location-dialog.c	26 Sep 2003 15:19:23 -0000	1.7
+++ gedit/dialogs/gedit-plugin-program-location-dialog.c	1 Jan 2004 20:22:44 -0000
@@ -76,10 +76,12 @@ gedit_plugin_program_location_dialog (co
 	
 	gui = glade_xml_new (GEDIT_GLADEDIR "program-location-dialog.glade2",
 			     "dialog_content", NULL);
-
-	if (!gui) {
-		gedit_warning (
-		    "Could not find program-location-dialog.glade2, reinstall gedit.", parent);
+	if (!gui)
+	{
+		/* Translators: %s is a file path */
+		gedit_warning (parent,
+			       _("Could not find \"%s\", reinstall gedit.\n"),
+			       GEDIT_GLADEDIR "program-location-dialog.glade2");
 		return NULL;
 	}
 
@@ -105,8 +107,10 @@ gedit_plugin_program_location_dialog (co
 
 	if (!content || !program_location_entry || !label || !logo)
 	{
-		g_warning (_("Could not find the required widgets inside %s."),
-			     "program-location-dialog.glade2");
+		/* Translators: %s is a file path */
+		gedit_warning (parent,
+			       _("Could not find the required widgets inside \"%s\"."),
+			       GEDIT_GLADEDIR "program-location-dialog.glade2");
 		return NULL;
 	}
 	
@@ -184,8 +188,7 @@ gedit_plugin_program_location_dialog (co
 	
 				if (error != NULL)
 				{
-					gedit_warning (error->message, GTK_WINDOW (dialog));
-	
+					gedit_warning (GTK_WINDOW (dialog), error->message);
 					g_error_free (error);
 				}
 
Index: gedit/dialogs/gedit-preferences-dialog.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-preferences-dialog.c,v
retrieving revision 1.56
diff -u -p -r1.56 gedit-preferences-dialog.c
--- gedit/dialogs/gedit-preferences-dialog.c	18 Sep 2003 18:44:26 -0000	1.56
+++ gedit/dialogs/gedit-preferences-dialog.c	1 Jan 2004 20:22:48 -0000
@@ -1153,22 +1153,21 @@ get_preferences_dialog (GtkWindow *paren
 
 	if (dialog != NULL)
 	{
-
-		gtk_window_present (GTK_WINDOW (dialog->dialog));
-
 		gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
 					      parent);
+		gtk_window_present (GTK_WINDOW (dialog->dialog));
 
 		return dialog;
 	}
 
 	gui = glade_xml_new (GEDIT_GLADEDIR "gedit-preferences.glade2",
 			     "preferences_dialog", NULL);
-
 	if (!gui)
 	{
-		gedit_warning (_("Could not find '" GEDIT_GLADEDIR "gedit-preferences.glade2'.\n\n"
-			       "Reinstall gedit."), parent);
+		/* Translators: %s is a file path */
+		gedit_warning (parent,
+			       _("Could not find \"%s\", reinstall gedit.\n"),
+			       GEDIT_GLADEDIR "gedit-preferences.glade2");
 		return NULL;
 	}
 
@@ -1271,9 +1270,10 @@ get_preferences_dialog (GtkWindow *paren
 	    !dialog->background_colorpicker_2 ||
 	    !dialog->reset_button)
 	{
-		gedit_warning (_("Could not find the required widgets inside '" 
-			       GEDIT_GLADEDIR "gedit-preferences.glade2'.\n\n"
-			       "Reinstall gedit."), parent);
+		/* Translators: %s is a file path */
+		gedit_warning (parent,
+			       _("Could not find the required widgets inside \"%s\".\n"),
+			       GEDIT_GLADEDIR "gedit-preferences.glade2");
 
 		if (!dialog->dialog)
 			gtk_widget_destroy (dialog->dialog);
Index: plugins/time/time.c
===================================================================
RCS file: /cvs/gnome/gedit/plugins/time/time.c,v
retrieving revision 1.40
diff -u -p -r1.40 time.c
--- plugins/time/time.c	26 Sep 2003 15:19:25 -0000	1.40
+++ plugins/time/time.c	1 Jan 2004 20:22:51 -0000
@@ -951,7 +951,7 @@ help_button_pressed (TimeConfigureDialog
 
 	if (error != NULL)
 	{
-		gedit_warning (error->message, GTK_WINDOW (dialog->dialog));
+		gedit_warning (GTK_WINDOW (dialog->dialog), error->message);
 
 		g_error_free (error);
 	}
