/soc/2013/ankitkv/gobjectification: 469f275425e4: Merged soc.201...

[Ankit Vani]

Changeset: 469f275425e4680c43fe1daf85b629a0c5b45f54
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-22 01:49 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/469f275425e4

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/ciphers/hmaccipher.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/libpurple/ciphers/hmaccipher.c b/libpurple/ciphers/hmaccipher.c
--- a/libpurple/ciphers/hmaccipher.c
+++ b/libpurple/ciphers/hmaccipher.c
@@ -156,7 +156,7 @@ purple_hmac_cipher_set_key(PurpleCipher 
 								size_t key_len)
 {
 	PurpleHMACCipherPrivate *priv = PURPLE_HMAC_CIPHER_GET_PRIVATE(cipher);
-	gsize blocksize, i;
+	gsize block_size, i;
 	guchar *full_key;
 
 	g_return_if_fail(priv->hash);