changeset 19155:53ad073898d0

merge of '71460fdbdf27e2233f9157851787002b09ead2c6' and '98ddd79cda6d7d93f0534fc4df38b302f850b47e'

--- a/libpurple/prefs.c	Wed Jul 11 17:36:15 2007 +0000
+++ b/libpurple/prefs.c	Wed Jul 11 18:41:02 2007 +0000
@@ -35,7 +35,6 @@
 #include "prefs.h"
 #include "debug.h"
 #include "util.h"
-#include "xmlnode.h"
 
 #ifdef _WIN32
 #include "win32dep.h"
@@ -127,7 +126,6 @@
 	xmlnode_set_attrib(node, "name", pref->name);
 
 	/* Set the type of this node (if type == PURPLE_PREF_NONE then do nothing) */
-	/* XXX: Why aren't we using a switch here? */
 	if (pref->type == PURPLE_PREF_INT) {
 		xmlnode_set_attrib(node, "type", "int");
 		snprintf(buf, sizeof(buf), "%d", pref->value.integer);
@@ -1327,37 +1325,6 @@
 	disco_callback_helper_handle(&prefs, handle);
 }
 
-static xmlnode*
-single_pref_to_xmlnode(const struct purple_pref *pref)
-{
-	xmlnode *node;
-	struct purple_pref *child;
-
-	node = xmlnode_new("pref");
-	xmlnode_set_attrib(node,"name",pref->name);
-
-	for(child = pref->first_child; child != NULL; child = child->sibling)
-		pref_to_xmlnode(node, child);
-
-	return node;
-}
-
-GList *
-purple_prefs_get_children_names(const char *name)
-{
-	struct purple_pref *pref = find_pref(name);
-	xmlnode * node = single_pref_to_xmlnode(pref);
-	xmlnode * child = node->child;
-	GList * list = NULL;
-
-	for(child = node->child;child;child = child->next){
-		list = g_list_append(list,xmlnode_get_attrib(child,"name"));
-	}
-	xmlnode_free(node);
-	return list;
-
-}
-
 void
 purple_prefs_update_old()
 {

--- a/libpurple/prefs.h	Wed Jul 11 17:36:15 2007 +0000
+++ b/libpurple/prefs.h	Wed Jul 11 18:41:02 2007 +0000
@@ -281,14 +281,6 @@
  */
 GList *purple_prefs_get_path_list(const char *name);
 
-/*
- * Returns a list of children for a pref
- *
- * @param name The parent pref
- * @return A list of strings denoting the names of the children, NULL if there are no children or if pref doesn't exist.  Be sure to free this list when your done with it.
- *
- */
-GList *purple_prefs_get_children_names(const char *name);
 
 /**
  * Add a callback to a pref (and its children)