# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1186793005 18000
# Node ID de29bf952b77a0655e89a2bb625cea671d63daef
# Parent  6e3ae4fd65f1604c0a4a929495a4bb2fbae04e29
fix recursion and combination of functions and expressions too

diff -r 6e3ae4fd65f1 -r de29bf952b77 src/audacious/tuple_formatter.c
--- a/src/audacious/tuple_formatter.c	Fri Aug 10 12:52:15 2007 -0500
+++ b/src/audacious/tuple_formatter.c	Fri Aug 10 19:43:25 2007 -0500
@@ -121,6 +121,7 @@
                         rewind = *(iter - 1) == '}' && *iter != '}';
                         break;
                     }
+                    g_string_append_c(sel, *iter);
                 }
                 else if (*iter == '}' && ((sel != argument)))
                     break;
@@ -164,7 +165,13 @@
                 if (*iter == ':')
                 {
 		    level++;
-                    sel = argument;
+                    if (sel != argument)
+                    {
+                        sel = argument;
+                        continue;
+                    }
+                    else
+                        g_string_append_c(sel, *iter);
                     continue;
                 }
 
@@ -185,6 +192,7 @@
                         rewind = *(iter - 1) == '}' && *iter != '}';
                         break;
                     }
+                    g_string_append_c(sel, *iter);
                 }
                 else if (*iter == '}' && ((sel != argument)))
                     break;