changeset 1531:4319ae8c8f69 trunk

[svn] - ok, with this commit, loading now works =)
author nenolod
date Mon, 07 Aug 2006 23:49:36 -0700
parents bdb22d1e6302
children f74a6ba233c2
files ChangeLog Plugins/Visualization/paranormal/pn/pnvis.c
diffstat 2 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 07 23:27:43 2006 -0700
+++ b/ChangeLog	Mon Aug 07 23:49:36 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-08 06:27:43 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1974]
+  - don't peg the CPU
+  
+
+  Changes:        Modified:
+  +3 -0           trunk/Plugins/Visualization/paranormal/client.c  
+
+
 2006-08-08 06:25:46 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1972]
   - remove less noise
--- a/Plugins/Visualization/paranormal/pn/pnvis.c	Mon Aug 07 23:27:43 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnvis.c	Mon Aug 07 23:49:36 2006 -0700
@@ -175,21 +175,24 @@
     }
       
   /* get the root actuator's node */
-  actuator_node = actuators_node->xmlChildrenNode;
+  for (actuator_node = actuators_node->xmlChildrenNode; actuator_node != NULL && !g_strcasecmp(actuator_node->name, "text");
+	actuator_node = actuator_node->next);
   if (! actuator_node)
     goto done;
 
   /* Create a new actuator (reworked by nenolod) */
+#if 0
   for (tptr = actuator_node; tptr != NULL && root_actuator == NULL; tptr = tptr->next)
   {
      xmlNodePtr ttptr;
 
      for (ttptr = tptr; ttptr != NULL; ttptr = ttptr->xmlChildrenNode)
-        root_actuator = pn_actuator_factory_new_actuator_from_xml (ttptr);
   }
+#endif
 
+  root_actuator = pn_actuator_factory_new_actuator_from_xml (actuator_node);
   if (!root_actuator)
-    pn_error ("Unknown actuator \"%s\"", actuator_node->name);
+    pn_error ("Unknown actuator \"%s\" -> '%s'", actuator_node->name, actuator_node->content);
 
   pn_vis_set_root_actuator (vis, root_actuator);