5 files changed, 4 insertions, 14 deletions
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index d0f4873503..df2fb96208 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -14,7 +14,6 @@ libessmime_la_CPPFLAGS =				\
 	-DPREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
 	$(CERT_UI_CFLAGS)
 
 libessmime_la_SOURCES = 	\
@@ -33,7 +32,6 @@ libessmime_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)			\
-	$(CAMEL_LIBS)				\
 	$(CERT_UI_LIBS)
 
 libessmime_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c
index 28c3aa7c85..4dd519e2d4 100644
--- a/smime/lib/e-asn1-object.c
+++ b/smime/lib/e-asn1-object.c
@@ -129,7 +129,6 @@ e_asn1_object_get_type (void)
 	return asn1_object_type;
 }
 
-
 /* This function is used to interpret an integer that
  * was encoded in a DER buffer. This function is used
  * when converting a DER buffer into a nsIASN1Object
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 7fdd20f6e7..6006168e20 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -616,8 +616,6 @@ e_cert_db_get_type (void)
 	return cert_type;
 }
 
-
-
 GStaticMutex init_mutex = G_STATIC_MUTEX_INIT;
 static ECertDB *cert_db = NULL;
 
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index e7aecc10c8..930dd65474 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -194,8 +194,6 @@ e_cert_get_type (void)
 	return cert_type;
 }
 
-
-
 static void
 e_cert_populate (ECert *cert)
 {
@@ -286,8 +284,6 @@ e_cert_new_from_der (gchar *data,
 	return e_cert_new (cert);
 }
 
-
-
 CERTCertificate *
 e_cert_get_internal_cert (ECert *cert)
 {
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 959924e69d..5f7a73ce65 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -143,8 +143,6 @@ e_pkcs12_get_type (void)
 	return pkcs12_type;
 }
 
-
-
 EPKCS12 *
 e_pkcs12_new (void)
 {
@@ -205,9 +203,10 @@ prompt_for_password (gchar *title,
 {
 	gchar *passwd;
 
-	passwd = e_passwords_ask_password (title, NULL, "", prompt,
-					   E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET, NULL,
-					   NULL);
+	passwd = e_passwords_ask_password (
+		title, NULL, "", prompt,
+		E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET,
+		NULL, NULL);
 
 	if (passwd) {
 		gsize len = strlen (passwd);