Don't need to pass a path to camel_gpg_context_new () anymore.

2002-10-16  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-format.c (handle_multipart_signed): Don't need to pass a
	path to camel_gpg_context_new () anymore.
	(mail_get_message_body): Same here.
	(handle_multipart_encrypted): Use camel_gpg_context_new () instead
	of mail_crypto_get_pgp_cipher_context ().

	* mail-preferences.c (mail_preferences_construct): There's no
	security tab anymore.
	(mail_preferences_apply): No need to save any pgp config data,
	there's nothing to configure!

	* mail-crypto.c (mail_crypto_get_pgp_cipher_context): Updated to
	not pass a pgp path into camel_gpg_context_new ().

	* mail-config.c (mail_config_clear): No need to free a pgp_path
	variable anymore, we don't need one.
	(config_read): Don't read in a pgp-path or pgp-type anymore.
	(mail_config_write_on_exit): Don't save a pgp-path or pgp-type
	anymore, we don't use them.
	(pgpopen): Removed.
	(pgpclose): Removed.
	(mail_config_pgp_type_detect_from_path): Removed.
	(auto_detect_pgp_variables): Removed.
	(mail_config_get_pgp_type): Removed.
	(mail_config_set_pgp_type): Removed.
	(mail_config_get_pgp_path): Removed.
	(mail_config_set_pgp_path): Removed.

svn path=/trunk/; revision=18384

1 files changed, 0 insertions, 21 deletions

diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c
index 7fab3c1567..758f9cd540 100644
--- a/mail/mail-preferences.c
+++ b/mail/mail-preferences.c
@@ -309,16 +309,6 @@ mail_preferences_construct (MailPreferences *prefs)
 	gtk_signal_connect (GTK_OBJECT (prefs->prompt_unwanted_html), "toggled",
 			    toggle_button_toggled, prefs);
 	
-	/* Security tab */
-	
-	/* Pretty Good Privacy */
-	prefs->pgp_path = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "filePgpPath"));
-	text = mail_config_get_pgp_path ();
-	gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (prefs->pgp_path)), text ? text : "");
-	gnome_file_entry_set_default_path (prefs->pgp_path, mail_config_get_pgp_path ());
-	gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (prefs->pgp_path)), "changed",
-			    entry_changed, prefs);
-	
 	/* Labels and Colours tab */
 	for (i = 0; i < 5; i++) {
 		char *widget_name;
@@ -360,7 +350,6 @@ void
 mail_preferences_apply (MailPreferences *prefs)
 {
 	GtkWidget *entry, *menu;
-	int pgp_type;
 	char *string;
 	guint32 rgb;
 	int i, val;
@@ -414,16 +403,6 @@ mail_preferences_apply (MailPreferences *prefs)
 	
 	mail_config_set_confirm_unwanted_html (gtk_toggle_button_get_active (prefs->prompt_unwanted_html));
 	
-	/* Security */
-	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (prefs->pgp_path));
-	string = gtk_entry_get_text (GTK_ENTRY (entry));
-	
-	pgp_type = string && *string ? mail_config_pgp_type_detect_from_path (string) : MAIL_CONFIG_PGP_TYPE_NONE;
-	if (pgp_type == MAIL_CONFIG_PGP_TYPE_GPG) {
-		mail_config_set_pgp_path (string && *string ? string : NULL);
-		mail_config_set_pgp_type (pgp_type);
-	}
-	
 	/* Labels and Colours */
 	for (i = 0; i < 5; i++) {
 		/* save the label... */