# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1186766222 18000
# Node ID 6ce62683e8c4043cb59d231b2a435e714b781145
# Parent  848999871ae8bcb62d8180dd0d70fbe4a97ea728
test nesting

diff -r 848999871ae8 -r 6ce62683e8c4 src/audacious/tuple_formatter.c
--- a/src/audacious/tuple_formatter.c	Fri Aug 10 12:10:24 2007 -0500
+++ b/src/audacious/tuple_formatter.c	Fri Aug 10 12:17:02 2007 -0500
@@ -94,7 +94,13 @@
                 if (*iter == ':')
                 {
 		    level++;
-                    sel = argument;
+                    if (sel != argument)
+                    {
+                        sel = argument;
+                        continue;
+                    }
+                    else
+                        g_string_append_c(sel, *iter);
                     continue;
                 }
 
diff -r 848999871ae8 -r 6ce62683e8c4 src/tests/tuple_formatter_test.c
--- a/src/tests/tuple_formatter_test.c	Fri Aug 10 12:10:24 2007 -0500
+++ b/src/tests/tuple_formatter_test.c	Fri Aug 10 12:17:02 2007 -0500
@@ -114,6 +114,14 @@
     }
     g_free(tstr);
 
+    tstr = tuple_formatter_process_string(tuple, "${?splork:${?splork:${splork}} - }${splork}");
+    if (g_ascii_strcasecmp(tstr, "moo - moo"))
+    {
+        g_print("fail 11: '%s'\n", tstr);
+        return EXIT_FAILURE;
+    }
+    g_free(tstr);
+
     mowgli_object_unref(tuple);
 
     return EXIT_SUCCESS;