=== modified file 'TODO'
--- TODO	2009-09-19 17:41:18 +0000
+++ TODO	2009-09-29 02:54:35 +0000
@@ -76,8 +76,9 @@
   arguments.
 
 * mandos-monitor
-** D-Bus mail loop w/ signal receiver
-** Snack/Newt client data displayer
+** D-Bus main loop w/ signal receiver
+** Urwid client data displayer
+*** Urwid scaffolding
 *** Client Widgets
 *** Properties popup
 

=== modified file 'mandos'
--- mandos	2009-09-23 20:31:47 +0000
+++ mandos	2009-09-29 02:54:35 +0000
@@ -626,7 +626,7 @@
         """Standard D-Bus method, overloaded to insert property tags.
         """
         xmlstring = dbus.service.Object.Introspect(self, object_path,
-                                           connection)
+                                                   connection)
         document = xml.dom.minidom.parseString(xmlstring)
         del xmlstring
         def make_tag(document, name, prop):
@@ -642,6 +642,21 @@
                         if prop._dbus_interface
                         == if_tag.getAttribute(u"name")):
                 if_tag.appendChild(tag)
+            # Add the names to the return values for the
+            # "org.freedesktop.DBus.Properties" methods
+            if (if_tag.getAttribute(u"name")
+                == u"org.freedesktop.DBus.Properties"):
+                for cn in if_tag.getElementsByTagName(u"method"):
+                    if cn.getAttribute(u"name") == u"Get":
+                        for arg in cn.getElementsByTagName(u"arg"):
+                            if (arg.getAttribute(u"direction")
+                                == u"out"):
+                                arg.setAttribute(u"name", u"value")
+                    elif cn.getAttribute(u"name") == u"GetAll":
+                        for arg in cn.getElementsByTagName(u"arg"):
+                            if (arg.getAttribute(u"direction")
+                                == u"out"):
+                                arg.setAttribute(u"name", u"props")
         xmlstring = document.toxml(u"utf-8")
         document.unlink()
         return xmlstring