Use gtk_window_present instead of doing a show then raise, as this also

2004-03-25  Rodney Dawes  <dobey@ximian.com>

	* em-composer-prefs.c (sig_edit_cb):
	(sig_add_script_cb): Use gtk_window_present instead of doing a show
	then raise, as this also puts the window on the current workspace
	(em_composer_prefs_construct): Fix the border widths for the dialog
	vbox and action area to be HIG-compliant, and realize the window
	Remove the dialog separator
	Use a box_pack_start, rather than box_pack_start_defaults which causes
	some weird behaviour when changing the border widths
	* em-subscribe-editor.c (em_subscribe_editor_new): Realize the dialog
	and set the border widths for its vbox and action area to be compliant
	with the HIG
	* local-config.glade: Removed this file as it is no longer used
	* mail-account-editor.c (construct): Realize the dialog, remove its
	separator, and set the border widths for its vbox and action area to
	be HIG-compliant
	* mail-account-editor.c (source_type_changed):
	(transport_type_changed): Fix the showing and hiding of the widgets
	related to the SSL options
	(mail_account_gui_new): Get the transport/source frames for the SSL
	options, and hide them by default
	Show the default folder buttons by default here
	(mail_account_gui_setup): Only call _show not _show_all here, so we
	don't mess up the shown/hidden state of things
	* mail-account-gui.h: Add ssl_frame widget to the MailAccountGuiService
	* mail-config.glade:
	* mail-search.glade:
	* mail-security.glade: HIG-compliance fixes for the glade dialogs
	* message-tag-followup.c (construct): Don't set border_width on the
	dialog itself
	Remove the separator from the dialog
	Set the border_widths for the dialog's vbox and action areas to be
	compliant with the HIG
	* message-tags.glade:
	* subscribe-dialog.glade: HIG-compliance fixes for these dialogs

	Original patch from Martyn Russell

svn path=/trunk/; revision=25183

1 files changed, 9 insertions, 5 deletions

diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index e4b68b9b3d..0276decfc8 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -242,8 +242,7 @@ sig_edit_cb (GtkWidget *widget, EMComposerPrefs *prefs)
 		
 		g_object_set_data ((GObject *) entry, "script", sig);
 		
-		gtk_widget_show (prefs->sig_script_dialog);
-		gdk_window_raise (prefs->sig_script_dialog->window);
+		gtk_window_present ((GtkWindow *) prefs->sig_script_dialog);
 	}
 }
 
@@ -354,8 +353,7 @@ sig_add_script_cb (GtkWidget *widget, EMComposerPrefs *prefs)
 	
 	g_object_set_data ((GObject *) entry, "script", NULL);
 	
-	gtk_widget_show (prefs->sig_script_dialog);
-	gdk_window_raise (prefs->sig_script_dialog->window);
+	gtk_window_present ((GtkWindow *) prefs->sig_script_dialog);
 }
 
 static void
@@ -916,13 +914,19 @@ em_composer_prefs_construct (EMComposerPrefs *prefs)
 	
 	/* Signatures */
 	dialog = (GtkDialog *) gtk_dialog_new ();
+
+	gtk_widget_realize ((GtkWidget *) dialog);
+	gtk_container_set_border_width ((GtkContainer *)dialog->action_area, 12);
+	gtk_container_set_border_width ((GtkContainer *)dialog->vbox, 0);
+
 	prefs->sig_script_dialog = (GtkWidget *) dialog;
 	gtk_dialog_add_buttons (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+	gtk_dialog_set_has_separator (dialog, FALSE);
 	gtk_window_set_title ((GtkWindow *) dialog, _("Add script signature"));
 	g_signal_connect (dialog, "response", G_CALLBACK (sig_add_script_response), prefs);
 	widget = glade_xml_get_widget (prefs->sig_script_gui, "vbox_add_script_signature");
-	gtk_box_pack_start_defaults ((GtkBox *) dialog->vbox, widget);
+	gtk_box_pack_start ((GtkBox *) dialog->vbox, widget, TRUE, TRUE, 0);
 	
 	prefs->sig_add = GTK_BUTTON (glade_xml_get_widget (gui, "cmdSignatureAdd"));
 	g_signal_connect (prefs->sig_add, "clicked", G_CALLBACK (sig_add_cb), prefs);