aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--smime/ChangeLog12
-rw-r--r--smime/gui/cert-trust-dialog.c1
-rw-r--r--smime/gui/certificate-viewer.c1
-rw-r--r--smime/gui/component.c2
-rw-r--r--smime/lib/e-cert-db.c11
-rw-r--r--smime/lib/e-cert-db.h4
-rw-r--r--smime/lib/e-cert.c2
-rw-r--r--smime/lib/e-pkcs12.c2
8 files changed, 24 insertions, 11 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 3fa02b2fe8..1225cc3ed3 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,15 @@
+2006-01-29 Kjartan Maraas <kmaraas@gnome.org>
+
+ * gui/cert-trust-dialog.c: (ctd_response):
+ * gui/certificate-viewer.c: (fill_in_general):
+ * gui/component.c:
+ * lib/e-cert-db.c: (initialize_nss), (default_nickname):
+ * lib/e-cert-db.h:
+ * lib/e-cert.c: (create_tbs_certificate_asn1_struct):
+ * lib/e-pkcs12.c: (import_from_file_helper):
+ Remove unused code. Use #ifdef instead of #if some places.
+ Add missing header.
+
2006-01-27 Andre Klapper <a9016009@gmx.de>
* smime-ui.glade:
removed string "dialog1" from translation. Fixes bug 306118.
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 13c02e76b2..49efaea83c 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -83,6 +83,7 @@ ctd_response(GtkWidget *w, guint id, CertTrustDialogData *data)
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");
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 94799b7074..1090b5eff3 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -66,7 +66,6 @@ free_data (gpointer data, GObject *where_the_object_was)
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;
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 152d38fe3e..a603529459 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -25,6 +25,8 @@
#include <config.h>
#endif
+#include "component.h"
+
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 5e25c7cd0c..ea8e76ab36 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -133,7 +133,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,
@@ -210,7 +210,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
}
@@ -426,7 +426,7 @@ e_cert_db_find_cert_by_nickname (ECertDB *certdb,
}
}
-#if notyet
+#ifdef notyet
ECert*
e_cert_db_find_cert_by_key (ECertDB *certdb,
const char *db_key,
@@ -876,7 +876,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;
@@ -900,7 +900,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);
/*
@@ -1175,7 +1174,7 @@ e_cert_db_import_pkcs12_file (ECertDB *cert_db,
return TRUE;
}
-#if notyet
+#ifdef notyet
gboolean
e_cert_db_export_pkcs12_file (ECertDB *cert_db,
const char *file_path,
diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h
index 87683c6bf5..0172e8ae2b 100644
--- a/smime/lib/e-cert-db.h
+++ b/smime/lib/e-cert-db.h
@@ -72,7 +72,7 @@ ECert* e_cert_db_find_cert_by_nickname (ECertDB *certdb,
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_pkcs12_file (ECertDB *cert_db,
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,
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index a95f1b94ea..5403912afa 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -1102,7 +1102,7 @@ create_tbs_certificate_asn1_struct (ECert *cert, EASN1Object **seq)
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);
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index edb4286f73..55a5fe0cb4 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -285,7 +285,7 @@ import_from_file_helper (EPKCS12 *pkcs12, PK11SlotInfo *slot,
/* 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