/soc/2013/ankitkv/gobjectification: 93fdec05493e: Merged default...

[Ankit Vani]

Changeset: 93fdec05493e3cdc75dafa6cce14764dec92c078
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-12-08 08:04 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/93fdec05493e

Description:

Merged default branch

diffstat:

 libpurple/plugins/perl/common/Purple.xs |   4 ++--
 libpurple/plugins/perl/perl-common.c    |   8 ++++++++
 libpurple/protocols/msn/msnutils.c      |  10 +++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diffs (105 lines):

diff --git a/libpurple/plugins/perl/common/Purple.xs b/libpurple/plugins/perl/common/Purple.xs
--- a/libpurple/plugins/perl/common/Purple.xs
+++ b/libpurple/plugins/perl/common/Purple.xs
@@ -7,12 +7,12 @@ PURPLE_PERL_BOOT_PROTO(Account__Option);
 PURPLE_PERL_BOOT_PROTO(Buddy__Icon);
 PURPLE_PERL_BOOT_PROTO(BuddyList);
 PURPLE_PERL_BOOT_PROTO(Certificate);
-PURPLE_PERL_BOOT_PROTO(Cipher);
 PURPLE_PERL_BOOT_PROTO(Cmd);
 PURPLE_PERL_BOOT_PROTO(Connection);
 PURPLE_PERL_BOOT_PROTO(Conversation);
 PURPLE_PERL_BOOT_PROTO(Core);
 PURPLE_PERL_BOOT_PROTO(Debug);
+PURPLE_PERL_BOOT_PROTO(Hash);
 PURPLE_PERL_BOOT_PROTO(Xfer);
 PURPLE_PERL_BOOT_PROTO(Idle);
 PURPLE_PERL_BOOT_PROTO(ImgStore);
@@ -48,12 +48,12 @@ BOOT:
 	PURPLE_PERL_BOOT(Buddy__Icon);
 	PURPLE_PERL_BOOT(BuddyList);
 	PURPLE_PERL_BOOT(Certificate);
-	PURPLE_PERL_BOOT(Cipher);
 	PURPLE_PERL_BOOT(Cmd);
 	PURPLE_PERL_BOOT(Connection);
 	PURPLE_PERL_BOOT(Conversation);
 	PURPLE_PERL_BOOT(Core);
 	PURPLE_PERL_BOOT(Debug);
+	PURPLE_PERL_BOOT(Hash);
 	PURPLE_PERL_BOOT(Xfer);
 	PURPLE_PERL_BOOT(Idle);
 	PURPLE_PERL_BOOT(ImgStore);
diff --git a/libpurple/plugins/perl/perl-common.c b/libpurple/plugins/perl/perl-common.c
--- a/libpurple/plugins/perl/perl-common.c
+++ b/libpurple/plugins/perl/perl-common.c
@@ -555,14 +555,22 @@ purple_perl_sv_from_vargs(GType type, va
 			return newSVuv((unsigned long)*copy_arg);
 
 		case G_TYPE_INT64:
+			/* XXX This yells and complains. */
+#if 0
 			*copy_arg = (void *)va_arg(*args, gint64);
 
 			return newSViv((gint64)*copy_arg);
+#endif
+			break;
 
 		case G_TYPE_UINT64:
+			/* XXX This also yells and complains. */
+#if 0
 			*copy_arg = (void *)va_arg(*args, guint64);
 
 			return newSVuv((guint64)*copy_arg);
+#endif
+			break;
 
 		case G_TYPE_STRING:
 			if ((*copy_arg = (void *)va_arg(*args, char *)) == NULL)
diff --git a/libpurple/protocols/msn/msnutils.c b/libpurple/protocols/msn/msnutils.c
--- a/libpurple/protocols/msn/msnutils.c
+++ b/libpurple/protocols/msn/msnutils.c
@@ -52,6 +52,7 @@ msn_parse_format(const char *mime, char 
 	char *cur;
 	GString *pre  = g_string_new(NULL);
 	GString *post = g_string_new(NULL);
+	unsigned int colors[3];
 
 	if (pre_ret  != NULL) *pre_ret  = NULL;
 	if (post_ret != NULL) *post_ret = NULL;
@@ -94,9 +95,8 @@ msn_parse_format(const char *mime, char 
 	if (cur && (*(cur = cur + 3) != ';'))
 	{
 		int i;
-		guint8 colors[3];
 
-		i = sscanf(cur, "%02hhx%02hhx%02hhx;", &colors[0], &colors[1], &colors[2]);
+		i = sscanf(cur, "%02x%02x%02x;", &colors[0], &colors[1], &colors[2]);
 
 		if (i > 0)
 		{
@@ -109,7 +109,7 @@ msn_parse_format(const char *mime, char 
 			}
 			else if (i == 2)
 			{
-				guint8 temp = colors[0];
+				unsigned int temp = colors[0];
 
 				colors[0] = colors[1];
 				colors[1] = temp;
@@ -117,14 +117,14 @@ msn_parse_format(const char *mime, char 
 			}
 			else if (i == 3)
 			{
-				guint8 temp = colors[2];
+				unsigned int temp = colors[2];
 
 				colors[2] = colors[0];
 				colors[0] = temp;
 			}
 
 			g_snprintf(tag, sizeof(tag),
-				"<FONT COLOR=\"#%02hhx%02hhx%02hhx\">",
+				"<FONT COLOR=\"#%02x%02x%02x\">",
 				colors[0] & 0xFF, colors[1] & 0xFF,
 				colors[2] & 0xFF);