/soc/2013/ankitkv/gobjectification: b9fe2b6801d4: Merged soc.201...

[Ankit Vani]

Changeset: b9fe2b6801d49f009b81d16851bd23596fd29ec0
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-24 16:04 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/b9fe2b6801d4

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/plugins/perl/common/typemap |  2 --
 libpurple/xmlnode.c                   |  2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diffs (24 lines):

diff --git a/libpurple/plugins/perl/common/typemap b/libpurple/plugins/perl/common/typemap
--- a/libpurple/plugins/perl/common/typemap
+++ b/libpurple/plugins/perl/common/typemap
@@ -34,8 +34,6 @@ GData **				T_PTR
 const unsigned char *			T_PV
 struct tm *				T_PTR
 const struct tm *			T_PTR
-xmlnode *				T_PTR
-const xmlnode *				T_PTR
 gssize					T_IV
 const void *				T_PTR
 GValue *				T_PTR
diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c
--- a/libpurple/xmlnode.c
+++ b/libpurple/xmlnode.c
@@ -974,7 +974,7 @@ purple_xmlnode_get_type(void)
 	static GType type = 0;
 
 	if (type == 0) {
-		type = g_boxed_type_register_static("xmlnode",
+		type = g_boxed_type_register_static("PurpleXmlNode",
 				(GBoxedCopyFunc)purple_xmlnode_copy,
 				(GBoxedFreeFunc)purple_xmlnode_free);
 	}