changeset 3323:c4402812b3e3 trunk

Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme-project.org>
date Fri, 10 Aug 2007 19:43:31 -0500
parents de29bf952b77 (diff) a6a76ab7ce0a (current diff)
children e5cc5e8b7021
files
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/tuple_formatter.c	Sat Aug 11 00:33:09 2007 +0200
+++ b/src/audacious/tuple_formatter.c	Fri Aug 10 19:43:31 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;