[seahorse] Remove the 'trusted keys' tab and combine with 'other keys'.

[Stefan Walter <stefw src gnome org>]

commit 6d356c1b6c9b8dc239858191f316ac44147d6640
Author: Stef Walter <stef memberwebs com>
Date:   Fri Jul 10 21:19:43 2009 +0000

    Remove the 'trusted keys' tab and combine with 'other keys'.
    
    Also make 'passwords' tab first since that's what people seem
    to use the most.

 src/seahorse-key-manager.c     |   13 -------
 src/seahorse-key-manager.glade |   76 +++++----------------------------------
 2 files changed, 10 insertions(+), 79 deletions(-)
---
diff --git a/src/seahorse-key-manager.c b/src/seahorse-key-manager.c
index 15f3d1c..52fe669 100644
--- a/src/seahorse-key-manager.c
+++ b/src/seahorse-key-manager.c
@@ -66,7 +66,6 @@ enum  {
 
 enum  {
 	TAB_PUBLIC = 0,
-	TAB_TRUSTED,
 	TAB_PRIVATE,
 	TAB_PASSWORD,
 	TAB_NUM_TABS
@@ -79,17 +78,6 @@ static SeahorseObjectPredicate pred_public = {
 	SEAHORSE_LOCATION_LOCAL, 
 	SEAHORSE_USAGE_PUBLIC_KEY, 
 	0, 
-	SEAHORSE_FLAG_TRUSTED | SEAHORSE_FLAG_IS_VALID, 
-	NULL 
-};
-
-static SeahorseObjectPredicate pred_trusted = {
-	0, 
-	0, 
-	0, 
-	SEAHORSE_LOCATION_LOCAL, 
-	SEAHORSE_USAGE_PUBLIC_KEY, 
-	SEAHORSE_FLAG_TRUSTED | SEAHORSE_FLAG_IS_VALID, 
 	0, 
 	NULL
 };
@@ -969,7 +957,6 @@ seahorse_key_manager_constructor (GType type, guint n_props, GObjectConstructPar
 	
 	/* Initialize the tabs, and associate them up */
 	initialize_tab (self, "pub-key-tab", TAB_PUBLIC, "pub-key-list", &pred_public);
-	initialize_tab (self, "trust-key-tab", TAB_TRUSTED, "trust-key-list", &pred_trusted);
 	initialize_tab (self, "sec-key-tab", TAB_PRIVATE, "sec-key-list", &pred_private);
 	pred_password.tag = SEAHORSE_GKR_TYPE;
 	initialize_tab (self, "password-tab", TAB_PASSWORD, "password-list", &pred_password);
diff --git a/src/seahorse-key-manager.glade b/src/seahorse-key-manager.glade
index 5c66a0b..57ac297 100644
--- a/src/seahorse-key-manager.glade
+++ b/src/seahorse-key-manager.glade
@@ -73,7 +73,7 @@
 	  <property name="enable_popup">False</property>
 
 	  <child>
-	    <widget class="GtkScrolledWindow" id="sec-key-tab">
+	    <widget class="GtkScrolledWindow" id="password-tab">
 	      <property name="border_width">3</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
@@ -83,7 +83,7 @@
 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	      <child>
-		<widget class="GtkTreeView" id="sec-key-list">
+		<widget class="GtkTreeView" id="password-list">
 		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
@@ -107,9 +107,9 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="label26">
+	    <widget class="GtkLabel" id="label29">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">My _Personal Keys</property>
+	      <property name="label" translatable="yes">_Passwords</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -128,9 +128,9 @@
 	      <property name="type">tab</property>
 	    </packing>
 	  </child>
-
+	  
 	  <child>
-	    <widget class="GtkScrolledWindow" id="trust-key-tab">
+	    <widget class="GtkScrolledWindow" id="sec-key-tab">
 	      <property name="border_width">3</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
@@ -140,7 +140,7 @@
 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	      <child>
-		<widget class="GtkTreeView" id="trust-key-list">
+		<widget class="GtkTreeView" id="sec-key-list">
 		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
@@ -164,9 +164,9 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="label27">
+	    <widget class="GtkLabel" id="label26">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Trusted Keys</property>
+	      <property name="label" translatable="yes">My _Personal Keys</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -223,7 +223,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label28">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Other _Collected Keys</property>
+	      <property name="label" translatable="yes">_Other Keys</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -243,62 +243,6 @@
 	    </packing>
 	  </child>
 
-	  <child>
-	    <widget class="GtkScrolledWindow" id="password-tab">
-	      <property name="border_width">3</property>
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="password-list">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</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>
-		  <signal name="popup_menu" handler="key_list_popup_menu"/>
-		  <signal name="button_press_event" handler="key_list_button_pressed"/>
-		  <signal name="row_activated" handler="row_activated"/>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label29">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Passwords</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</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">3</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">tab</property>
-	    </packing>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>