Index: libseahorse/seahorse-add-keyserver.glade
===================================================================
RCS file: /cvs/gnome/seahorse/libseahorse/seahorse-add-keyserver.glade,v
retrieving revision 1.1
diff -p -u -u -p -r1.1 seahorse-add-keyserver.glade
--- libseahorse/seahorse-add-keyserver.glade	25 Apr 2005 00:28:05 -0000	1.1
+++ libseahorse/seahorse-add-keyserver.glade	26 Feb 2006 19:48:47 -0000
@@ -5,6 +5,7 @@
 <requires lib="gnome"/>
 
 <widget class="GtkDialog" id="add-keyserver">
+  <property name="border_width">5</property>
   <property name="title" translatable="yes">Add Key Server</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
@@ -17,13 +18,15 @@
   <property name="skip_pager_hint">True</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">2</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -70,13 +73,13 @@
 
       <child>
 	<widget class="GtkTable" id="table1">
-	  <property name="border_width">12</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="n_rows">2</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">12</property>
-	  <property name="column_spacing">6</property>
+	  <property name="row_spacing">6</property>
+	  <property name="column_spacing">12</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="label2">
@@ -91,6 +94,10 @@
 	      <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="left_attach">0</property>
@@ -106,6 +113,8 @@
 	    <widget class="GtkComboBox" id="keyserver-type">
 	      <property name="visible">True</property>
 	      <property name="items" translatable="yes">initial temp item</property>
+	      <property name="add_tearoffs">False</property>
+	      <property name="focus_on_click">True</property>
 	      <signal name="changed" handler="on_uri_changed" last_modification_time="Sun, 24 Apr 2005 00:43:05 GMT"/>
 	    </widget>
 	    <packing>
@@ -130,6 +139,10 @@
 	      <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="left_attach">0</property>
@@ -158,7 +171,7 @@
 		  <property name="max_length">0</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">True</property>
 		  <signal name="changed" handler="on_uri_changed" last_modification_time="Sun, 24 Apr 2005 00:42:44 GMT"/>
 		</widget>
@@ -188,6 +201,10 @@
 		      <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>
@@ -206,7 +223,7 @@
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char" translatable="yes">*</property>
+		      <property name="invisible_char">*</property>
 		      <property name="activates_default">True</property>
 		      <property name="width_chars">5</property>
 		      <signal name="changed" handler="on_uri_changed" last_modification_time="Sun, 24 Apr 2005 00:42:50 GMT"/>
Index: libseahorse/seahorse-prefs.glade
===================================================================
RCS file: /cvs/gnome/seahorse/libseahorse/seahorse-prefs.glade,v
retrieving revision 1.13
diff -p -u -u -p -r1.13 seahorse-prefs.glade
--- libseahorse/seahorse-prefs.glade	24 Dec 2005 00:24:28 -0000	1.13
+++ libseahorse/seahorse-prefs.glade	26 Feb 2006 19:48:47 -0000
@@ -5,6 +5,7 @@
 <requires lib="gnome"/>
 
 <widget class="GtkDialog" id="prefs">
+  <property name="border_width">5</property>
   <property name="title" translatable="yes">Encryption Preferences</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -25,7 +26,7 @@
     <widget class="GtkVBox" id="mainbox">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">2</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -71,7 +72,7 @@
 
       <child>
 	<widget class="GtkNotebook" id="notebook">
-	  <property name="border_width">6</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
 	  <property name="show_tabs">True</property>
@@ -231,7 +232,7 @@
 		<widget class="GtkVBox" id="vbox11">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
+		  <property name="spacing">6</property>
 
 		  <child>
 		    <widget class="GtkCheckButton" id="use-cache">
@@ -247,7 +248,7 @@
 		      <signal name="toggled" handler="use_cache_toggled" last_modification_time="Sun, 03 Oct 2004 01:45:13 GMT"/>
 		    </widget>
 		    <packing>
-		      <property name="padding">6</property>
+		      <property name="padding">0</property>
 		      <property name="expand">False</property>
 		      <property name="fill">False</property>
 		    </packing>
@@ -262,14 +263,14 @@
 		      <property name="yscale">0</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>
 			<widget class="GtkVBox" id="cache-options">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
+			  <property name="spacing">6</property>
 
 			  <child>
 			    <widget class="GtkHBox" id="hbox1">
@@ -342,7 +343,7 @@
 			      </child>
 			    </widget>
 			    <packing>
-			      <property name="padding">6</property>
+			      <property name="padding">0</property>
 			      <property name="expand">False</property>
 			      <property name="fill">False</property>
 			    </packing>
@@ -833,7 +834,7 @@ it to the Session manager. </property>
 		  <property name="can_focus">True</property>
 		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
 		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		  <child>
Index: libseahorse/seahorse-progress.glade
===================================================================
RCS file: /cvs/gnome/seahorse/libseahorse/seahorse-progress.glade,v
retrieving revision 1.2
diff -p -u -u -p -r1.2 seahorse-progress.glade
--- libseahorse/seahorse-progress.glade	5 Apr 2005 23:39:24 -0000	1.2
+++ libseahorse/seahorse-progress.glade	26 Feb 2006 19:48:48 -0000
@@ -5,6 +5,7 @@
 <requires lib="gnome"/>
 
 <widget class="GtkDialog" id="progress">
+  <property name="border_width">5</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Progress Title</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -19,13 +20,14 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">2</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -55,7 +57,7 @@
 
       <child>
 	<widget class="GtkVBox" id="vbox1">
-	  <property name="border_width">12</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
Index: libseahorse/seahorse-recipients.glade
===================================================================
RCS file: /cvs/gnome/seahorse/libseahorse/seahorse-recipients.glade,v
retrieving revision 1.7
diff -p -u -u -p -r1.7 seahorse-recipients.glade
--- libseahorse/seahorse-recipients.glade	16 Apr 2005 17:51:49 -0000	1.7
+++ libseahorse/seahorse-recipients.glade	26 Feb 2006 19:48:48 -0000
@@ -5,7 +5,7 @@
 <requires lib="gnome"/>
 
 <widget class="GtkDialog" id="recipients">
-  <property name="visible">False</property>
+  <property name="border_width">5</property>
   <property name="title" translatable="yes">Choose Recipients</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -19,13 +19,15 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">2</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -84,7 +86,7 @@
 
       <child>
 	<widget class="GtkVBox" id="vbox1">
-	  <property name="border_width">12</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
@@ -93,7 +95,7 @@
 	    <widget class="GtkHBox" id="hbox1">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">12</property>
 
 	      <child>
 		<widget class="GtkComboBox" id="mode">
@@ -102,6 +104,8 @@
 		  <property name="items" translatable="yes">All Keys
 Selected Recipients
 Search Results</property>
+		  <property name="add_tearoffs">False</property>
+		  <property name="focus_on_click">True</property>
 		  <signal name="changed" handler="on_mode_changed" last_modification_time="Thu, 07 Oct 2004 00:32:28 GMT"/>
 		</widget>
 		<packing>
@@ -125,6 +129,10 @@ Search Results</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">filter</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>
@@ -144,7 +152,7 @@ Search Results</property>
 		  <property name="max_length">256</property>
 		  <property name="text" translatable="yes"></property>
 		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="invisible_char">*</property>
 		  <property name="activates_default">False</property>
 		  <signal name="changed" handler="on_filter_changed" last_modification_time="Thu, 07 Oct 2004 00:32:33 GMT"/>
 		  <signal name="activate" handler="on_filter_activate" last_modification_time="Sat, 16 Apr 2005 17:43:47 GMT"/>
@@ -171,7 +179,7 @@ Search Results</property>
 	      <property name="can_focus">True</property>
 	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	      <child>
@@ -182,6 +190,9 @@ Search Results</property>
 		  <property name="rules_hint">True</property>
 		  <property name="reorderable">False</property>
 		  <property name="enable_search">True</property>
+		  <property name="fixed_height_mode">False</property>
+		  <property name="hover_selection">False</property>
+		  <property name="hover_expand">False</property>
 		</widget>
 	      </child>
 	    </widget>
@@ -226,7 +237,7 @@ Search Results</property>
 		<widget class="GtkHBox" id="hbox2">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">12</property>
 
 		  <child>
 		    <widget class="GtkLabel" id="label2">
@@ -241,6 +252,10 @@ Search Results</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>
Index: libseahorse/seahorse-signer.glade
===================================================================
RCS file: /cvs/gnome/seahorse/libseahorse/seahorse-signer.glade,v
retrieving revision 1.2
diff -p -u -u -p -r1.2 seahorse-signer.glade
--- libseahorse/seahorse-signer.glade	17 Feb 2005 19:36:47 -0000	1.2
+++ libseahorse/seahorse-signer.glade	26 Feb 2006 19:48:48 -0000
@@ -5,26 +5,28 @@
 <requires lib="gnome"/>
 
 <widget class="GtkDialog" id="signer">
-  <property name="visible">False</property>
+  <property name="border_width">5</property>
   <property name="title" translatable="yes">Choose Signing Key</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
   <property name="default_width">400</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">2</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -69,7 +71,7 @@
 
       <child>
 	<widget class="GtkVBox" id="vbox1">
-	  <property name="border_width">12</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
@@ -87,6 +89,10 @@
 	      <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>
