Index: src/seahorse-pgp-public-key-properties.glade
===================================================================
RCS file: /cvs/gnome/seahorse/src/seahorse-pgp-public-key-properties.glade,v
retrieving revision 1.7
diff -p -u -u -p -r1.7 seahorse-pgp-public-key-properties.glade
--- src/seahorse-pgp-public-key-properties.glade	21 Mar 2006 01:14:25 -0000	1.7
+++ src/seahorse-pgp-public-key-properties.glade	21 Mar 2006 13:29:03 -0000
@@ -556,7 +556,7 @@
 		      <property name="n_rows">4</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">3</property>
+		      <property name="row_spacing">6</property>
 		      <property name="column_spacing">12</property>
 
 		      <child>
@@ -619,7 +619,7 @@
 			<widget class="GtkLabel" id="owner-name-label">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">(placeholder)</property>
+			  <property name="label">(placeholder)</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -647,7 +647,7 @@
 			<widget class="GtkLabel" id="owner-email-label">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">place@holder.com</property>
+			  <property name="label">place@holder.com</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -704,7 +704,7 @@
 			<widget class="GtkLabel" id="owner-comment-label">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">(placeholder)</property>
+			  <property name="label">(placeholder)</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -761,7 +761,7 @@
 			<widget class="GtkLabel" id="owner-keyid-label">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">PLACEHOL</property>
+			  <property name="label">PLACEHOL</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -917,7 +917,7 @@
 	      <child>
 		<widget class="GtkHBox" id="untrusted-area">
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">12</property>
 
 		  <child>
 		    <widget class="GtkImage" id="image29">
@@ -1117,7 +1117,7 @@
 	      <child>
 		<widget class="GtkHBox" id="trusted-signed-area">
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">12</property>
 
 		  <child>
 		    <widget class="GtkImage" id="image-good1">
@@ -1316,7 +1316,7 @@
 	      <child>
 		<widget class="GtkHBox" id="trusted-area">
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">12</property>
 
 		  <child>
 		    <widget class="GtkImage" id="image-good2">
@@ -1516,7 +1516,7 @@
 	      <child>
 		<widget class="GtkHBox" id="untrusted-overridden-area">
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">12</property>
 
 		  <child>
 		    <widget class="GtkImage" id="image38">
@@ -1614,17 +1614,41 @@
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
+		  <property name="expand">False</property>
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkFrame" id="signatures-area">
+		<widget class="GtkVBox" id="vbox31">
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="label99">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Other People Who _Trust this Key:&lt;/b&gt;</property>
+		      <property name="use_underline">True</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>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment20">
@@ -1633,9 +1657,9 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xscale">1</property>
 		      <property name="yscale">1</property>
-		      <property name="top_padding">6</property>
+		      <property name="top_padding">0</property>
 		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">24</property>
+		      <property name="left_padding">12</property>
 		      <property name="right_padding">0</property>
 
 		      <child>
@@ -1696,28 +1720,10 @@
 			</widget>
 		      </child>
 		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label99">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Other People Who _Trust this Key:&lt;/b&gt;</property>
-		      <property name="use_underline">True</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>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
 		    <packing>
-		      <property name="type">label_item</property>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
 		</widget>
@@ -1777,11 +1783,35 @@
 		      <property name="spacing">18</property>
 
 		      <child>
-			<widget class="GtkFrame" id="frame4">
+			<widget class="GtkVBox" id="vbox32">
 			  <property name="visible">True</property>
-			  <property name="label_xalign">0</property>
-			  <property name="label_yalign">0.5</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label108">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">&lt;b&gt;Technical Details:&lt;/b&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>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
 
 			  <child>
 			    <widget class="GtkAlignment" id="alignment29">
@@ -1790,7 +1820,7 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xscale">1</property>
 			      <property name="yscale">1</property>
-			      <property name="top_padding">6</property>
+			      <property name="top_padding">0</property>
 			      <property name="bottom_padding">0</property>
 			      <property name="left_padding">12</property>
 			      <property name="right_padding">0</property>
@@ -1801,7 +1831,7 @@
 				  <property name="n_rows">3</property>
 				  <property name="n_columns">2</property>
 				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">3</property>
+				  <property name="row_spacing">6</property>
 				  <property name="column_spacing">12</property>
 
 				  <child>
@@ -1836,7 +1866,7 @@
 				    <widget class="GtkLabel" id="details-id-label">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">(placeholder)</property>
+				      <property name="label">(placeholder)</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1920,7 +1950,7 @@
 				    <widget class="GtkLabel" id="details-algo-label">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">(placeholder)</property>
+				      <property name="label">(placeholder)</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1948,7 +1978,7 @@
 				    <widget class="GtkLabel" id="details-strength-label">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">(placeolder)</property>
+				      <property name="label">(placeolder)</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1974,18 +2004,36 @@
 				</widget>
 			      </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">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox33">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label108">
+			    <widget class="GtkLabel" id="label113">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Technical Details:&lt;/b&gt;</property>
+			      <property name="label" translatable="yes">&lt;b&gt;Fingerprint:&lt;/b&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.5</property>
+			      <property name="xalign">0</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
@@ -1995,23 +2043,11 @@
 			      <property name="angle">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>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkFrame" id="frame7">
-			  <property name="visible">True</property>
-			  <property name="label_xalign">0</property>
-			  <property name="label_yalign">0.5</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 			  <child>
 			    <widget class="GtkAlignment" id="alignment32">
@@ -2020,7 +2056,7 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xscale">1</property>
 			      <property name="yscale">1</property>
-			      <property name="top_padding">6</property>
+			      <property name="top_padding">0</property>
 			      <property name="bottom_padding">0</property>
 			      <property name="left_padding">12</property>
 			      <property name="right_padding">0</property>
@@ -2029,7 +2065,7 @@
 				<widget class="GtkLabel" id="details-fingerprint-label">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">PLAC EHOL DER0 9023 435F 
+				  <property name="label">PLAC EHOL DER0 9023 435F 
 B4C3 4349 0932 7854 3452</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">True</property>
@@ -2047,34 +2083,16 @@ B4C3 4349 0932 7854 3452</property>
 				</widget>
 			      </child>
 			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label113">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Fingerprint:&lt;/b&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.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
 			    <packing>
-			      <property name="type">label_item</property>
+			      <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="expand">False</property>
 			  <property name="fill">True</property>
 			</packing>
 		      </child>
@@ -2093,11 +2111,35 @@ B4C3 4349 0932 7854 3452</property>
 		      <property name="spacing">18</property>
 
 		      <child>
-			<widget class="GtkFrame" id="frame5">
+			<widget class="GtkVBox" id="vbox34">
 			  <property name="visible">True</property>
-			  <property name="label_xalign">0</property>
-			  <property name="label_yalign">0.5</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label110">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">&lt;b&gt;Dates:&lt;/b&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>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
 
 			  <child>
 			    <widget class="GtkAlignment" id="alignment30">
@@ -2106,7 +2148,7 @@ B4C3 4349 0932 7854 3452</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xscale">1</property>
 			      <property name="yscale">1</property>
-			      <property name="top_padding">6</property>
+			      <property name="top_padding">0</property>
 			      <property name="bottom_padding">0</property>
 			      <property name="left_padding">12</property>
 			      <property name="right_padding">0</property>
@@ -2117,7 +2159,7 @@ B4C3 4349 0932 7854 3452</property>
 				  <property name="n_rows">2</property>
 				  <property name="n_columns">2</property>
 				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">3</property>
+				  <property name="row_spacing">6</property>
 				  <property name="column_spacing">12</property>
 
 				  <child>
@@ -2180,7 +2222,7 @@ B4C3 4349 0932 7854 3452</property>
 				    <widget class="GtkLabel" id="details-created-label">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">6/24/04 (placeholder)</property>
+				      <property name="label">6/24/04 (placeholder)</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2208,7 +2250,7 @@ B4C3 4349 0932 7854 3452</property>
 				    <widget class="GtkLabel" id="details-expires-label">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">6/28/10 (placeholder)</property>
+				      <property name="label">6/28/10 (placeholder)</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2234,18 +2276,36 @@ B4C3 4349 0932 7854 3452</property>
 				</widget>
 			      </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">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox35">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label110">
+			    <widget class="GtkLabel" id="label111">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Dates:&lt;/b&gt;</property>
+			      <property name="label" translatable="yes">&lt;b&gt;Indicate Trust:&lt;/b&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.5</property>
+			      <property name="xalign">0</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
@@ -2255,23 +2315,11 @@ B4C3 4349 0932 7854 3452</property>
 			      <property name="angle">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>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkFrame" id="frame6">
-			  <property name="visible">True</property>
-			  <property name="label_xalign">0</property>
-			  <property name="label_yalign">0.5</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 			  <child>
 			    <widget class="GtkAlignment" id="alignment31">
@@ -2280,7 +2328,7 @@ B4C3 4349 0932 7854 3452</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xscale">1</property>
 			      <property name="yscale">1</property>
-			      <property name="top_padding">6</property>
+			      <property name="top_padding">0</property>
 			      <property name="bottom_padding">0</property>
 			      <property name="left_padding">12</property>
 			      <property name="right_padding">0</property>
@@ -2330,35 +2378,17 @@ Ultimately</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
 				    </packing>
 				  </child>
 				</widget>
 			      </child>
 			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label111">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Indicate Trust:&lt;/b&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.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
 			    <packing>
-			      <property name="type">label_item</property>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
@@ -2385,7 +2415,6 @@ Ultimately</property>
 
 	      <child>
 		<widget class="GtkExpander" id="subkey-expander">
-		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="expanded">False</property>
@@ -2405,7 +2434,7 @@ Ultimately</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xscale">1</property>
 			  <property name="yscale">1</property>
-			  <property name="top_padding">3</property>
+			  <property name="top_padding">6</property>
 			  <property name="bottom_padding">0</property>
 			  <property name="left_padding">12</property>
 			  <property name="right_padding">0</property>
