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, 150 insertions, 35 deletions

diff --git a/mail/mail-security.glade b/mail/mail-security.glade
index 5dfbed673e..dfe490a7e5 100644
--- a/mail/mail-security.glade
+++ b/mail/mail-security.glade
@@ -2,8 +2,10 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
 <widget class="GtkDialog" id="message_security_dialog">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Security Information</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -11,13 +13,13 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox2">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">6</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area2">
@@ -46,6 +48,7 @@
 
       <child>
 	<widget class="GtkNotebook" id="notebook1">
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
 	  <property name="show_tabs">True</property>
@@ -56,35 +59,48 @@
 
 	  <child>
 	    <widget class="GtkVBox" id="vbox161">
-	      <property name="border_width">6</property>
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+
+	      <child>
+		<widget class="GtkVBox" id="frame5">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkFrame" id="frame5">
+		    <widget class="GtkLabel" id="label464">
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Digital Signature&lt;/span&gt;</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 
 		  <child>
-		    <widget class="GtkVBox" id="signature_vbox">
-		      <property name="border_width">6</property>
+		    <widget class="GtkHBox" id="hbox170">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<placeholder/>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label475">
+			<widget class="GtkLabel" id="label465">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Digital Signature</property>
+			  <property name="label" translatable="yes"></property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -92,31 +108,27 @@
 		      <property name="selectable">False</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
+			  <property name="xpad">12</property>
 		      <property name="ypad">0</property>
 		    </widget>
 		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkFrame" id="frame6">
+			<widget class="GtkTable" id="table10">
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+			  <property name="n_rows">1</property>
+			  <property name="n_columns">1</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">2</property>
+			  <property name="column_spacing">6</property>
 
 		  <child>
-		    <widget class="GtkVBox" id="encryption_vbox">
-		      <property name="border_width">6</property>
+			    <widget class="GtkVBox" id="signature_vbox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
@@ -125,12 +137,72 @@
 			<placeholder/>
 		      </child>
 		    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkVBox" id="frame6">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="label477">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Encryption&lt;/span&gt;</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="label476">
+		    <widget class="GtkHBox" id="hbox171">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Encryption</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkLabel" id="label478">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes"></property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -138,11 +210,40 @@
 		      <property name="selectable">False</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
+			  <property name="xpad">12</property>
 		      <property name="ypad">0</property>
 		    </widget>
 		    <packing>
-		      <property name="type">label_item</property>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkTable" id="table11">
+			  <property name="visible">True</property>
+			  <property name="n_rows">1</property>
+			  <property name="n_columns">1</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">2</property>
+			  <property name="column_spacing">6</property>
+
+			  <child>
+			    <widget class="GtkVBox" id="encryption_vbox">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<placeholder/>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
 		    </packing>
 		  </child>
 		</widget>
@@ -154,6 +255,20 @@
 	      </child>
 	    </widget>
 	    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
 	      <property name="tab_expand">False</property>
 	      <property name="tab_fill">True</property>
 	    </packing>