ekiga r6515 - in trunk: . lib/engine/presence/local-roster

[jpuydt svn gnome org]

Author: jpuydt
Date: Fri Jul 25 21:25:20 2008
New Revision: 6515
URL: http://svn.gnome.org/viewvc/ekiga?rev=6515&view=rev

Log:
Made the local presentity code use the robust XML helper

Modified:
   trunk/ChangeLog
   trunk/lib/engine/presence/local-roster/local-presentity.cpp

Modified: trunk/lib/engine/presence/local-roster/local-presentity.cpp
==============================================================================
--- trunk/lib/engine/presence/local-roster/local-presentity.cpp	(original)
+++ trunk/lib/engine/presence/local-roster/local-presentity.cpp	Fri Jul 25 21:25:20 2008
@@ -41,7 +41,7 @@
 
 #include "form-request-simple.h"
 #include "local-cluster.h"
-
+#include "robust-xml.h"
 #include "local-presentity.h"
 
 
@@ -50,7 +50,7 @@
  */
 Local::Presentity::Presentity (Ekiga::ServiceCore &_core,
 			       xmlNodePtr _node) :
-  core(_core), node(_node), presence("presence-unknown")
+  core(_core), node(_node), name_node(NULL), presence("presence-unknown")
 {
   xmlChar *xml_str = NULL;
 
@@ -101,7 +101,7 @@
 			       const std::string _name,
 			       const std::string _uri,
 			       const std::set<std::string> _groups) :
-  core(_core), name(_name), uri(_uri),
+  core(_core), name_node(NULL), name(_name), uri(_uri),
   presence("presence-unknown"), groups(_groups)
 {
   presence_core = dynamic_cast<Ekiga::PresenceCore*>(core.get ("presence-core"));
@@ -256,9 +256,7 @@
       uri = new_uri;
       presence_core->fetch_presence (uri);
     }
-    xmlNodeSetContent (name_node,
-		       xmlEncodeSpecialChars(name_node->doc,
-					     BAD_CAST name.c_str ()));
+    robust_xmlNodeSetContent (node, &name_node, "name", name);
 
     // the first loop looks at groups we were in : are we still in ?
     for (std::map<std::string, xmlNodePtr>::const_iterator iter