changeset 3519:ae0b80004a41 trunk

Backed out changeset fd4fce547558 This has negative side effects. *hmm*.
author William Pitcock <nenolod@atheme.org>
date Wed, 12 Sep 2007 03:37:47 -0500
parents 3a2ee00bc962
children 46a0eb1426f6
files src/audacious/tuple_formatter.c
diffstat 1 files changed, 2 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/tuple_formatter.c	Wed Sep 12 00:22:52 2007 -0500
+++ b/src/audacious/tuple_formatter.c	Wed Sep 12 03:37:47 2007 -0500
@@ -379,32 +379,11 @@
     tuple_formatter_func_list = g_list_append(tuple_formatter_func_list, expr);
 }
 
-/* builtin-keyword: ${?arg}, returns TRUE if <arg> exists and is not empty. */
+/* builtin-keyword: ${?arg}, returns TRUE if <arg> exists. */
 static gboolean
 tuple_formatter_expression_exists(Tuple *tuple, const gchar *expression)
 {
-    gboolean ret = FALSE;
-    TupleValueType type = tuple_get_value_type(tuple, -1, expression);
-    const gchar *iter;
-
-    if (type == TUPLE_UNKNOWN)
-        return FALSE;
-
-    /* TBD: check if zero? --nenolod */
-    if (type == TUPLE_INT)
-        return TRUE;
-
-    iter = tuple_get_string(tuple, -1, expression);
-
-    while (ret && *iter != '\0')
-    {
-        if (*iter == ' ')
-            iter++;
-        else
-            ret = TRUE;
-    }
-
-    return ret;
+    return (tuple_get_value_type(tuple, -1, expression) != TUPLE_UNKNOWN) ? TRUE : FALSE;
 }
 
 /* builtin-keyword: ${==arg1,arg2}, returns TRUE if <arg1> and <arg2> match.