/soc/2013/ankitkv/gobjectification: 68cfb4e93457: Merged soc.201...

[Ankit Vani]

Changeset: 68cfb4e9345731935a0aaf9ce87c586b835cd69f
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-20 16:44 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/68cfb4e93457

Description:

Merged soc.2013.gobjectification branch

diffstat:

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

diffs (48 lines):

diff --git a/libpurple/ciphers/aescipher.c b/libpurple/ciphers/aescipher.c
--- a/libpurple/ciphers/aescipher.c
+++ b/libpurple/ciphers/aescipher.c
@@ -301,7 +301,7 @@ purple_aes_cipher_nss_crypt(const guchar
 	CK_MECHANISM_TYPE cipher_mech = CKM_AES_CBC;
 	SECItem key_item, iv_item;
 	SECStatus ret;
-	size_t outlen = 0;
+	int outlen = 0;
 	unsigned int outlen_tmp = 0;
 
 	memset(&context, 0, sizeof(PurpleAESCipherNSSContext));
diff --git a/libpurple/plugins/debug_example.c b/libpurple/plugins/debug_example.c
--- a/libpurple/plugins/debug_example.c
+++ b/libpurple/plugins/debug_example.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "internal.h"
+#include <internal.h>
 
 /* This file defines PURPLE_PLUGINS and includes all the libpurple headers */
 #include <purple.h>
diff --git a/libpurple/plugins/helloworld.c b/libpurple/plugins/helloworld.c
--- a/libpurple/plugins/helloworld.c
+++ b/libpurple/plugins/helloworld.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "internal.h"
+#include <internal.h>
 
 /* This file defines PURPLE_PLUGINS and includes all the libpurple headers */
 #include <purple.h>
diff --git a/libpurple/plugins/notify_example.c b/libpurple/plugins/notify_example.c
--- a/libpurple/plugins/notify_example.c
+++ b/libpurple/plugins/notify_example.c
@@ -20,6 +20,8 @@
  *
  */
 
+#include <internal.h>
+
 /* This file defines PURPLE_PLUGINS and includes all the libpurple headers */
 #include <purple.h>