[evolution-patches] Cleanups for evolution/smime

[Kjartan Maraas <kmaraas broadpark no>]

More of the same...

Cheers
Kjartan

Index: gui/cert-trust-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/cert-trust-dialog.c,v
retrieving revision 1.2
diff -u -p -r1.2 cert-trust-dialog.c
--- gui/cert-trust-dialog.c	18 Aug 2004 02:28:55 -0000	1.2
+++ gui/cert-trust-dialog.c	10 Dec 2005 21:26:32 -0000
@@ -81,6 +81,7 @@ ctd_response(GtkWidget *w, guint id, Cer
 	case GTK_RESPONSE_ACCEPT: {
 		/* just *what on earth* was chris thinking here!?!?!  copied from certificate-manager.c */
 		GtkWidget *dialog = ca_trust_dialog_show (data->cacert, FALSE);
+		/* *icert is already declared earlier in this function? */
 		CERTCertificate *icert = e_cert_get_internal_cert (data->cacert);
 
 		g_signal_stop_emission_by_name(w, "response");
Index: gui/certificate-viewer.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/certificate-viewer.c,v
retrieving revision 1.8
diff -u -p -r1.8 certificate-viewer.c
--- gui/certificate-viewer.c	24 Mar 2004 22:27:00 -0000	1.8
+++ gui/certificate-viewer.c	10 Dec 2005 21:26:32 -0000
@@ -64,7 +64,6 @@ free_data (gpointer data, GObject *where
 static void
 fill_in_general (CertificateViewerData *cvm_data, ECert *cert)
 {
-	CERTCertificate *mcert = e_cert_get_internal_cert (cert);
 	GtkWidget *label;
 	const char *text;
 	char *markup;
Index: gui/component.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/component.c,v
retrieving revision 1.6
diff -u -p -r1.6 component.c
--- gui/component.c	23 Feb 2005 18:56:59 -0000	1.6
+++ gui/component.c	10 Dec 2005 21:26:32 -0000
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include "component.h"
+
 #include <gtk/gtk.h>
 
 #include <libgnome/gnome-i18n.h>
Index: lib/e-cert-db.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-cert-db.c,v
retrieving revision 1.18
diff -u -p -r1.18 e-cert-db.c
--- lib/e-cert-db.c	29 Jul 2005 04:38:40 -0000	1.18
+++ lib/e-cert-db.c	10 Dec 2005 21:26:32 -0000
@@ -130,7 +130,7 @@ e_cert_db_dispose (GObject *object)
 		G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-#if notyet
+#ifdef notyet
 PRBool
 ucs2_ascii_conversion_fn (PRBool toUnicode,
 			  unsigned char *inBuf,
@@ -207,7 +207,7 @@ initialize_nss (void)
 	SEC_PKCS12EnableCipher(PKCS12_DES_56, 1);
 	SEC_PKCS12EnableCipher(PKCS12_DES_EDE3_168, 1);
 	SEC_PKCS12SetPreferredCipher(PKCS12_DES_EDE3_168, 1);
-#if notyet
+#ifdef notyet
 	PORT_SetUCS2_ASCIIConversionFunction(ucs2_ascii_conversion_fn);
 #endif
 }
@@ -420,7 +420,7 @@ e_cert_db_find_cert_by_nickname (ECertDB
 	}
 }
 
-#if notyet
+#ifdef notyet
 ECert*
 e_cert_db_find_cert_by_key (ECertDB *certdb,
 			    const char *db_key,
@@ -870,7 +870,7 @@ default_nickname (CERTCertificate *cert)
 	char *nickname = NULL;
 	char *tmp = NULL;
 	int count;
-	char *nickFmt=NULL, *nickFmtWithNum = NULL;
+	char *nickFmt=NULL;
 	CERTCertificate *dummycert;
 	PK11SlotInfo *slot=NULL;
 	CK_OBJECT_HANDLE keyHandle;
@@ -894,7 +894,6 @@ default_nickname (CERTCertificate *cert)
 	count = 1;
 
 	nickFmt = "%1$s's %2$s ID";
-	nickFmtWithNum = "%1$s's %2$s ID #%3$d";
 
 	nickname = PR_smprintf(nickFmt, username, caname);
 	/*
@@ -1169,7 +1168,7 @@ e_cert_db_import_pkcs12_file (ECertDB *c
 	return TRUE;
 }
 
-#if notyet
+#ifdef notyet
 gboolean
 e_cert_db_export_pkcs12_file (ECertDB *cert_db,
 			      const char *file_path,
Index: lib/e-cert-db.h
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-cert-db.h,v
retrieving revision 1.5
diff -u -p -r1.5 e-cert-db.h
--- lib/e-cert-db.h	8 Jun 2004 20:20:00 -0000	1.5
+++ lib/e-cert-db.h	10 Dec 2005 21:26:32 -0000
@@ -72,7 +72,7 @@ ECert*               e_cert_db_find_cert
 						      const char *nickname,
 						      GError **error);
 
-#if notyet
+#ifdef notyet
 ECert*               e_cert_db_find_cert_by_key      (ECertDB *certdb,
 						      const char *db_key,
 						      GError **error);
@@ -126,7 +126,7 @@ gboolean             e_cert_db_import_pk
 						   const char *file_path,
 						   GError **error);
 
-#if notyet
+#ifdef notyet
 gboolean             e_cert_db_export_pkcs12_file (ECertDB *cert_db,
 						   const char *file_path,
 						   GList *certs,
Index: lib/e-cert.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-cert.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-cert.c
--- lib/e-cert.c	17 Jun 2005 15:20:31 -0000	1.11
+++ lib/e-cert.c	10 Dec 2005 21:26:32 -0000
@@ -1101,7 +1101,7 @@ create_tbs_certificate_asn1_struct (ECer
 	e_asn1_object_append_child (sequence, subitem);
 	g_object_unref (subitem);
 
-#if notyet
+#ifdef notyet
 	nsCOMPtr<nsIASN1Sequence> validitySequence = new nsNSSASN1Sequence();
 	nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertDumpValidity").get(),
 					    text);
Index: lib/e-pkcs12.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-pkcs12.c,v
retrieving revision 1.8
diff -u -p -r1.8 e-pkcs12.c
--- lib/e-pkcs12.c	23 Feb 2005 18:57:00 -0000	1.8
+++ lib/e-pkcs12.c	10 Dec 2005 21:26:32 -0000
@@ -283,7 +283,7 @@ import_from_file_helper (EPKCS12 *pkcs12
 	/* read input file and feed it to the decoder */
 	rv = input_to_decoder (dcx, path, &err);
 	if (!rv) {
-#if notyet
+#ifdef notyet
 		/* XXX we need this to check the gerror */
 		if (NS_ERROR_ABORT == rv) {
 			// inputToDecoder indicated a NSS error