# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1186761099 18000
# Node ID 257c0d0c58068b30378cc0fdcaa3ddd5f0804f38
# Parent  dfbbad8d795335572fa3d80acf87feeae12229b3
use g_str_has_prefix() more.

diff -r dfbbad8d7953 -r 257c0d0c5806 src/audacious/tuple_formatter.c
--- a/src/audacious/tuple_formatter.c	Fri Aug 10 10:47:03 2007 -0500
+++ b/src/audacious/tuple_formatter.c	Fri Aug 10 10:51:39 2007 -0500
@@ -77,7 +77,7 @@
         /* if it's raw text, just copy the byte */
         if (*iter != '$' && *iter != '%')
             g_string_append_c(ctx->str, *iter);
-        else if (*iter == '$' && *(iter + 1) == '{')
+        else if (g_str_has_prefix(iter, "${") == TRUE)
         {
             GString *expression = g_string_new("");
             GString *argument = g_string_new("");
@@ -133,7 +133,7 @@
             if (*iter == '\0')
                 break;
         }
-        else if (*iter == '%' && *(iter + 1) == '{')
+        else if (g_str_has_prefix(iter, "%{") == TRUE)
         {
             GString *expression = g_string_new("");
             GString *argument = g_string_new("");