/soc/2013/ankitkv/gobjectification: 545149898f9a: Merged default...

[Ankit Vani]

Changeset: 545149898f9a5b23d803da8b6ef51efaaa5efd02
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-13 14:03 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/545149898f9a

Description:

Merged default branch

diffstat:

 libpurple/ciphers/aescipher.c   |  4 +---
 libpurple/plugins/ssl/ssl-nss.c |  4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (31 lines):

diff --git a/libpurple/ciphers/aescipher.c b/libpurple/ciphers/aescipher.c
--- a/libpurple/ciphers/aescipher.c
+++ b/libpurple/ciphers/aescipher.c
@@ -268,9 +268,7 @@ purple_aes_cipher_gnutls_decrypt(const g
 	return TRUE;
 }
 
-#endif /* PURPLE_AES_USE_GNUTLS */
-
-#ifdef PURPLE_AES_USE_NSS
+#elif defined(PURPLE_AES_USE_NSS)
 
 typedef struct {
 	PK11SlotInfo *slot;
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -984,11 +984,11 @@ x509_display_string(PurpleCertificate *c
 		activation = expiration = 0;
 	}
 #if GLIB_CHECK_VERSION(2,26,0)
-	act_dt = g_date_time_new_from_unix_local(expiration);
+	act_dt = g_date_time_new_from_unix_local(activation);
 	activ_str = g_date_time_format(act_dt, "%c");
 	g_date_time_unref(act_dt);
 
-	exp_dt = g_date_time_new_from_unix_local(activation);
+	exp_dt = g_date_time_new_from_unix_local(expiration);
 	expir_str = g_date_time_format(exp_dt, "%c");
 	g_date_time_unref(exp_dt);
 #else