pidgin: b9f39d21: Remove deprecated xmlnode functions.

qulogic at pidgin.im qulogic at pidgin.im
Fri Sep 2 23:05:57 EDT 2011


----------------------------------------------------------------------
Revision: b9f39d21519e68620399ba9e93122b994d25daea
Parent:   563dd65de5943f4fc7591a0db23ec411c545169e
Author:   qulogic at pidgin.im
Date:     09/02/11 17:04:02
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b9f39d21519e68620399ba9e93122b994d25daea

Changelog: 

Remove deprecated xmlnode functions.

Changes against parent 563dd65de5943f4fc7591a0db23ec411c545169e

  patched  ChangeLog.API
  patched  libpurple/xmlnode.c
  patched  libpurple/xmlnode.h

-------------- next part --------------
============================================================
--- libpurple/xmlnode.c	62f65e9ad8e60c0016637ebe74f8d6e37dcae5c5
+++ libpurple/xmlnode.c	bbd9ea0b506dedb3aa734d0fb4ea162fa6de7d08
@@ -191,18 +191,6 @@ void
 }
 
 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;
============================================================
--- libpurple/xmlnode.h	716b906f1214ba3bcbe0de955e09cc068a716e72
+++ libpurple/xmlnode.h	c9149d3cf014760cca6561de58ac2834c5e833b0
@@ -157,42 +157,14 @@ void xmlnode_set_attrib(xmlnode *node, c
  */
 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 @@ const char *xmlnode_get_prefix(const xml
  * @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 @@ void xmlnode_free(xmlnode *node);
  * 			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 @@ xmlnode *xmlnode_from_file(const char *d
 #endif
 
 #endif /* _PURPLE_XMLNODE_H_ */
+
============================================================
--- ChangeLog.API	3c705248248585e62126b6890f21746f32ffae46
+++ ChangeLog.API	d259bbac2e9b752031c5c099237566de39e375cc
@@ -141,6 +141,8 @@ version 3.0.0 (??/??/????):
 		* struct _PurpleRoomlist
 		* struct _PurpleRoomlistField
 		* struct _PurpleRoomlistRoom
+		* xmlnode_set_attrib_with_namespace
+		* xmlnode_set_attrib_with_prefix
 
 version 2.10.0:
 	libpurple:


More information about the Commits mailing list