diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2010-02-16 09:10:33 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2010-02-16 09:10:33 +0100 |
| commit | df6a5c9a9d99c75dee6bbdcdc39081e810cf4d10 (patch) | |
| tree | 6c641cd832bee776184410e91615ff8a8c7fc93e | |
| parent | f730b0bf4fc9cc694b18c42523bc4a711061e884 (diff) | |
| download | cornucopia-df6a5c9a9d99c75dee6bbdcdc39081e810cf4d10.tar.gz cornucopia-df6a5c9a9d99c75dee6bbdcdc39081e810cf4d10.tar.bz2 cornucopia-df6a5c9a9d99c75dee6bbdcdc39081e810cf4d10.zip | |
mdbus2: fix "last entry missing" for dictionaries
| -rw-r--r-- | tools/mdbus2/src/main.vala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/mdbus2/src/main.vala b/tools/mdbus2/src/main.vala index 814f038b..c835a207 100644 --- a/tools/mdbus2/src/main.vala +++ b/tools/mdbus2/src/main.vala @@ -70,18 +70,22 @@ public string formatResult( DBus.RawMessageIter iter, int depth = 0 ) */ if ( signature[0] == 'a' && signature[1] == '{' ) { +#if DEBUG + debug( "dict" ); +#endif DBus.RawMessageIter subiter = DBus.RawMessageIter(); iter.recurse( subiter ); var result = "{ "; - do + var next = true; + while ( next ) { result += formatResult( subiter, depth+1 ); if ( subiter.has_next() ) { result += ", "; } - subiter.next(); - } while ( subiter.has_next() ); + next = subiter.next(); + } result += " }"; return result; } |