# HG changeset patch # User Elliott Sales de Andrade # Date 1314997442 0 # Node ID 67addaf8677fccafdc8d5385cd63854662027906 # Parent 60d8798069644f5e4008143c449b9f8f5adca1df Remove deprecated xmlnode functions. diff -r 60d879806964 -r 67addaf8677f ChangeLog.API --- a/ChangeLog.API Fri Sep 02 19:50:58 2011 +0000 +++ b/ChangeLog.API Fri Sep 02 21:04:02 2011 +0000 @@ -141,6 +141,8 @@ * struct _PurpleRoomlist * struct _PurpleRoomlistField * struct _PurpleRoomlistRoom + * xmlnode_set_attrib_with_namespace + * xmlnode_set_attrib_with_prefix version 2.10.0: libpurple: diff -r 60d879806964 -r 67addaf8677f libpurple/xmlnode.c --- a/libpurple/xmlnode.c Fri Sep 02 19:50:58 2011 +0000 +++ b/libpurple/xmlnode.c Fri Sep 02 21:04:02 2011 +0000 @@ -191,18 +191,6 @@ } void -xmlnode_set_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns, const char *value) -{ - xmlnode_set_attrib_full(node, attr, xmlns, NULL, value); -} - -void -xmlnode_set_attrib_with_prefix(xmlnode *node, const char *attr, const char *prefix, const char *value) -{ - xmlnode_set_attrib_full(node, attr, NULL, prefix, value); -} - -void xmlnode_set_attrib_full(xmlnode *node, const char *attr, const char *xmlns, const char *prefix, const char *value) { xmlnode *attrib_node; diff -r 60d879806964 -r 67addaf8677f libpurple/xmlnode.h --- a/libpurple/xmlnode.h Fri Sep 02 19:50:58 2011 +0000 +++ b/libpurple/xmlnode.h Fri Sep 02 21:04:02 2011 +0000 @@ -157,42 +157,14 @@ */ void xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value); -#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_XMLNODE_C_) -/** - * Sets a prefixed attribute for a node - * - * @param node The node to set an attribute for. - * @param attr The name of the attribute to set - * @param prefix The prefix of the attribute to ste - * @param value The value of the attribute - * - * @deprecated Use xmlnode_set_attrib_full instead. - */ -void xmlnode_set_attrib_with_prefix(xmlnode *node, const char *attr, const char *prefix, const char *value); - -/** - * Sets a namespaced attribute for a node - * - * @param node The node to set an attribute for. - * @param attr The name of the attribute to set - * @param xmlns The namespace of the attribute to ste - * @param value The value of the attribute - * - * @deprecated Use xmlnode_set_attrib_full instead. - */ -void xmlnode_set_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns, const char *value); -#endif /* PURPLE_DISABLE_DEPRECATED */ - /** * Sets a namespaced attribute for a node * * @param node The node to set an attribute for. * @param attr The name of the attribute to set - * @param xmlns The namespace of the attribute to ste - * @param prefix The prefix of the attribute to ste + * @param xmlns The namespace of the attribute to set + * @param prefix The prefix of the attribute to set * @param value The value of the attribute - * - * @since 2.6.0 */ void xmlnode_set_attrib_full(xmlnode *node, const char *attr, const char *xmlns, const char *prefix, const char *value); @@ -273,8 +245,6 @@ * @param child The child node. * * @return The parent or NULL. - * - * @since 2.6.0 */ xmlnode *xmlnode_get_parent(const xmlnode *child); @@ -343,8 +313,6 @@ * the category for debugging. * * @return The new node or NULL if an error occurred. - * - * @since 2.6.0 */ xmlnode *xmlnode_from_file(const char *dir, const char *filename, const char *description, const char *process); @@ -354,3 +322,4 @@ #endif #endif /* _PURPLE_XMLNODE_H_ */ +