seahorse r2199 - in trunk: . src

[sadam svn gnome org]

Author: sadam
Date: Fri May  2 01:44:50 2008
New Revision: 2199
URL: http://svn.gnome.org/viewvc/seahorse?rev=2199&view=rev

Log:
2008-05-01  Adam Schreiber  <sadam clemson edu>

    * src/seahorse-key-properties.c:
    * src/seahorse-pgp-public-key-properties.glade: Change "trust model" 
used
    to match GPG.  Fixes bug #435278


Modified:
   trunk/ChangeLog
   trunk/src/seahorse-key-properties.c
   trunk/src/seahorse-pgp-public-key-properties.glade

Modified: trunk/src/seahorse-key-properties.c
==============================================================================
--- trunk/src/seahorse-key-properties.c	(original)
+++ trunk/src/seahorse-key-properties.c	Fri May  2 01:44:50 2008
@@ -84,10 +84,19 @@
     widget = glade_xml_get_widget (swidget->xml, name);
     if (!widget)
         return; 
-    
-    label = gtk_button_get_label (GTK_BUTTON (widget));
+
+    if (!GTK_IS_LABEL (widget))    
+        label = gtk_button_get_label (GTK_BUTTON (widget));
+    else
+        label = gtk_label_get_text (widget);
+        
     text = g_strdup_printf (label, str);
-    gtk_button_set_label (GTK_BUTTON (widget), text);
+    
+    if (!GTK_IS_LABEL (widget))
+        gtk_button_set_label (GTK_BUTTON (widget), text);
+    else
+        gtk_label_set_text (GTK_LABEL (widget), text);
+        
     g_free (text);
 }
 
@@ -1549,7 +1558,8 @@
         /* Fill in trust labels with name .This only happens once, so it sits here. */
         user = seahorse_pgp_key_get_userid_name (SEAHORSE_PGP_KEY (skey), 0);
         printf_glade_widget (swidget, "trust-marginal-check", user);
-        printf_glade_widget (swidget, "trust-complete-check", user);
+        printf_glade_widget (swidget, "trust-sign-label", user);
+        printf_glade_widget (swidget, "trust-revoke-label", user);
         g_free (user);
         
     } else {
@@ -1563,8 +1573,6 @@
 
     glade_xml_signal_connect_data (swidget->xml, "trust_marginal_toggled",
                                    G_CALLBACK (trust_marginal_toggled), swidget);
-    glade_xml_signal_connect_data (swidget->xml, "trust_complete_toggled",
-                                   G_CALLBACK (trust_complete_toggled), swidget);
                                    
     glade_xml_signal_connect_data (swidget->xml, "on_signatures_tree_row_activated",
                                    G_CALLBACK (signature_row_activated), swidget);
@@ -1607,7 +1615,6 @@
         show_glade_widget (swidget, "sign-area", FALSE);
         show_glade_widget (swidget, "revoke-area", FALSE);
         sensitive_glade_widget (swidget, "trust-marginal-check", FALSE);
-        sensitive_glade_widget (swidget, "trust-complete-check", FALSE);
         set_glade_image (swidget, "sign-image", SEAHORSE_STOCK_SIGN_UNKNOWN);
         
     /* Local keys */
@@ -1678,18 +1685,11 @@
             gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), trust != SEAHORSE_VALIDITY_UNKNOWN);
             g_signal_handlers_unblock_by_func (widget, trust_marginal_toggled, swidget);
         
-            widget = seahorse_widget_get_widget (swidget, "trust-complete-check");
-            g_return_if_fail (widget != NULL);
-            
-            g_signal_handlers_block_by_func (widget, trust_complete_toggled, swidget);
-            gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), trust == SEAHORSE_VALIDITY_FULL);
-            gtk_widget_set_sensitive (widget, trust != SEAHORSE_VALIDITY_UNKNOWN);
-            g_signal_handlers_unblock_by_func (widget, trust_complete_toggled, swidget);
         }
     
         /* Signing and revoking */
         sigpersonal = seahorse_pgp_key_have_signatures (pkey, SKEY_PGPSIG_PERSONAL);
-        show_glade_widget (swidget, "sign-area", !sigpersonal && trusted);
+        show_glade_widget (swidget, "sign-area", !sigpersonal);
         show_glade_widget (swidget, "revoke-area", sigpersonal);
         
         /* The image */

Modified: trunk/src/seahorse-pgp-public-key-properties.glade
==============================================================================
--- trunk/src/seahorse-pgp-public-key-properties.glade	(original)
+++ trunk/src/seahorse-pgp-public-key-properties.glade	Fri May  2 01:44:50 2008
@@ -1155,7 +1155,7 @@
 				    <widget class="GtkCheckButton" id="trust-marginal-check">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">I have checked that this key belongs to '%s'</property>
+				      <property name="label" translatable="yes">I trust signatures from '%s' on other keys</property>
 				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
 				      <property name="focus_on_click">True</property>
@@ -1170,27 +1170,6 @@
 				      <property name="fill">False</property>
 				    </packing>
 				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="trust-complete-check">
-				      <property name="visible">True</property>
-				      <property name="sensitive">False</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">I trust signatures from '%s' on other keys </property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <property name="active">False</property>
-				      <property name="inconsistent">False</property>
-				      <property name="draw_indicator">True</property>
-				      <signal name="toggled" handler="trust_complete_toggled" last_modification_time="Sun, 26 Mar 2006 23:05:29 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1206,10 +1185,10 @@
 				  <property name="spacing">12</property>
 
 				  <child>
-				    <widget class="GtkLabel" id="label22226">
+				    <widget class="GtkLabel" id="trust-sign-label">
 				      <property name="width_request">270</property>
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">To indicate your trust of this key to others, &lt;i&gt;sign&lt;/i&gt; this key:</property>
+				      <property name="label" translatable="yes">If you believe that the person that owns this key is '%s', &lt;i&gt;sign&lt;/i&gt; this key:</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">True</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1324,10 +1303,10 @@
 				  <property name="spacing">12</property>
 
 				  <child>
-				    <widget class="GtkLabel" id="label103">
+				    <widget class="GtkLabel" id="trust-revoke-label">
 				      <property name="width_request">270</property>
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">If you no longer trust this person's identity, &lt;i&gt;revoke&lt;/i&gt; your signature:</property>
+				      <property name="label" translatable="yes">If you no longer trust that '%s' owns this key, &lt;i&gt;revoke&lt;/i&gt; your signature:</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">True</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>