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	31 Dec 2003 15:27:42 -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);
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	31 Dec 2003 15:27:42 -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, 
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	31 Dec 2003 15:27:43 -0000
@@ -131,7 +131,6 @@ dialog_goto_line_get_dialog (void)
 	GladeXML *gui;
 	GtkWindow *window;
 	GtkWidget *content;
-	GtkWidget *button;
 
 	gedit_debug (DEBUG_SEARCH, "");
 
@@ -145,8 +144,8 @@ dialog_goto_line_get_dialog (void)
 
 	gui = glade_xml_new (GEDIT_GLADEDIR "goto-line.glade2",
 			     "goto_line_dialog_content", NULL);
-
-	if (!gui) {
+	if (!gui)
+	{
 		g_warning
 		    ("Could not find goto-line.glade2, reinstall gedit.\n");
 		return NULL;
@@ -166,22 +165,19 @@ 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) {
+	if (!dialog->entry)
+	{
 		g_warning (
 			_("Could not find the required widgets inside %s."),
 			"goto-line.glade2");
@@ -213,8 +209,6 @@ dialog_goto_line_get_dialog (void)
 
 	g_object_unref (gui);
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-
 	return 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	31 Dec 2003 15:27:45 -0000
@@ -238,7 +238,6 @@ dialog_replace_get_dialog (void)
 	GladeXML *gui;
 	GtkWindow *window;
 	GtkWidget *content;
-	GtkWidget *button;
 	GtkWidget *replace_with_label;
 	
 	gedit_debug (DEBUG_SEARCH, "");
@@ -254,7 +253,8 @@ dialog_replace_get_dialog (void)
 	gui = glade_xml_new ( GEDIT_GLADEDIR "replace.glade2",
 			     "replace_dialog_content", NULL);
 
-	if (!gui) {
+	if (!gui)
+	{
 		g_warning
 		    ("Could not find replace.glade2, reinstall gedit.\n");
 		return NULL;
@@ -274,22 +274,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);
+	gedit_dialog_add_button (GTK_DIALOG (dialog->dialog),
+				 _("_Replace"), GTK_STOCK_FIND_AND_REPLACE,
+				 GEDIT_RESPONSE_REPLACE);
 
-	gtk_widget_show (button);
-
-	gtk_dialog_add_action_widget (GTK_DIALOG (dialog->dialog), 
-				      button, GEDIT_RESPONSE_REPLACE);
-
-	/* Add Find button */
 	gtk_dialog_add_button (GTK_DIALOG (dialog->dialog), 
 			       GTK_STOCK_FIND, GEDIT_RESPONSE_FIND);
 
@@ -347,8 +341,6 @@ dialog_replace_get_dialog (void)
 
 	g_object_unref (G_OBJECT (gui));
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-	
 	return dialog;
 }
 
@@ -392,7 +384,8 @@ dialog_find_get_dialog (void)
 	gui = glade_xml_new (GEDIT_GLADEDIR "replace.glade2",
 			     "replace_dialog_content", NULL);
 
-	if (!gui) {
+	if (!gui)
+	{
 		g_warning
 		    ("Could not find replace.glade2, reinstall gedit.\n");
 		return NULL;
@@ -414,6 +407,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");
@@ -470,8 +466,6 @@ dialog_find_get_dialog (void)
 
 	g_object_unref (G_OBJECT (gui));
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-	
 	return 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	31 Dec 2003 15:27:46 -0000
@@ -97,6 +97,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");
@@ -131,8 +134,6 @@ dialog_open_uri_get_dialog (void)
 
 	g_object_unref (gui);
 
-	gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-
 	return dialog;
 }
 
