seahorse r2190 - in plugins/trunk: . plugins/applet

[sadam svn gnome org]

Author: sadam
Date: Mon Apr 21 19:01:48 2008
New Revision: 2190
URL: http://svn.gnome.org/viewvc/seahorse?rev=2190&view=rev

Log:
2008-04-21  Adam Schreiber  <sadam clemson edu>

    * plugins/applet/seahorse-applet.c:
    * plugins/applet/seahorse-applet-preferences.glade: Separate 
preferences for
    displaying text after signing and verifying.  Fixes bug #515178


Modified:
   plugins/trunk/ChangeLog
   plugins/trunk/plugins/applet/seahorse-applet-preferences.glade
   plugins/trunk/plugins/applet/seahorse-applet.c

Modified: plugins/trunk/plugins/applet/seahorse-applet-preferences.glade
==============================================================================
--- plugins/trunk/plugins/applet/seahorse-applet-preferences.glade	(original)
+++ plugins/trunk/plugins/applet/seahorse-applet-preferences.glade	Mon Apr 21 19:01:48 2008
@@ -20,7 +20,7 @@
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
-  <signal name="delete_event" handler="delete_event" last_modification_time="Sun, 25 Fed 2006 00:13:37 GMT"/>
+  <signal name="delete_event" handler="delete_event"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -165,7 +165,26 @@
 			    <widget class="GtkCheckButton" id="display-decrypted-clipboard">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Decrypting or verifying the clipboard</property>
+			      <property name="label" translatable="yes">_Decrypting the clipboard</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>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="display-verified-clipboard">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">_Verifying the clipboard</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>

Modified: plugins/trunk/plugins/applet/seahorse-applet.c
==============================================================================
--- plugins/trunk/plugins/applet/seahorse-applet.c	(original)
+++ plugins/trunk/plugins/applet/seahorse-applet.c	Mon Apr 21 19:01:48 2008
@@ -40,6 +40,7 @@
 #define SHOW_CLIPBOARD_STATE_KEY      APPLET_SCHEMAS "/show_clipboard_state"
 #define DISPLAY_CLIPBOARD_ENC_KEY     APPLET_SCHEMAS "/display_encrypted_clipboard"
 #define DISPLAY_CLIPBOARD_DEC_KEY     APPLET_SCHEMAS "/display_decrypted_clipboard"
+#define DISPLAY_CLIPBOARD_VER_KEY     APPLET_SCHEMAS "/display_verified_clipboard"
 
 /* -----------------------------------------------------------------------------
  * Initialize Crypto 
@@ -595,8 +596,10 @@
         gtk_clipboard_set_text (board, rawtext, strlen (rawtext));
         detect_received (board, rawtext, sapplet);
         
-        if (seahorse_gconf_get_boolean (DISPLAY_CLIPBOARD_DEC_KEY) == TRUE)
-        {
+        if (((type == SEAHORSE_TEXT_TYPE_MESSAGE) && 
+             (seahorse_gconf_get_boolean (DISPLAY_CLIPBOARD_DEC_KEY) == TRUE)) || 
+            ((type == SEAHORSE_TEXT_TYPE_SIGNED) && 
+             (seahorse_gconf_get_boolean (DISPLAY_CLIPBOARD_VER_KEY) == TRUE))) {
             /* TRANSLATORS: This means 'The text that was decrypted' */
             display_text (_("Decrypted Text"), rawtext, TRUE);
         }
@@ -653,6 +656,10 @@
     widget = glade_xml_get_widget (swidget->xml, "display-decrypted-clipboard");
     if (widget && GTK_IS_CHECK_BUTTON (widget))
         seahorse_check_button_gconf_attach (GTK_CHECK_BUTTON (widget), DISPLAY_CLIPBOARD_DEC_KEY);
+        
+    widget = glade_xml_get_widget (swidget->xml, "display-verified-clipboard");
+    if (widget && GTK_IS_CHECK_BUTTON (widget))
+        seahorse_check_button_gconf_attach (GTK_CHECK_BUTTON (widget), DISPLAY_CLIPBOARD_VER_KEY);    
     
     seahorse_widget_show (swidget);
 }