# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1189261678 -10800
# Node ID 04ecdd1b0e1201188d5c5b33097eacedfdf8f380
# Parent  1319e83dad6a6081d1c1893cda9b05b922a1e0b0
Fixes.

diff -r 1319e83dad6a -r 04ecdd1b0e12 src/audacious/tuple.c
--- a/src/audacious/tuple.c	Sat Sep 08 06:47:15 2007 +0300
+++ b/src/audacious/tuple.c	Sat Sep 08 17:27:58 2007 +0300
@@ -49,6 +49,10 @@
     { "date",           TUPLE_STRING },
 };
 
+static mowgli_heap_t *tuple_heap = NULL;
+static mowgli_heap_t *tuple_value_heap = NULL;
+static mowgli_object_class_t tuple_klass;
+
 
 #define TUPLE_LOCKING
 //#define TUPLE_DEBUG
@@ -138,11 +142,11 @@
     realfn = g_filename_from_uri(filename, NULL, NULL);
 
     scratch = g_path_get_basename(realfn ? realfn : filename);
-    tuple_associate_string(tuple, "file-name", scratch);
+    tuple_associate_string(tuple, FIELD_FILE_NAME, NULL, scratch);
     g_free(scratch);
 
     scratch = g_path_get_dirname(realfn ? realfn : filename);
-    tuple_associate_string(tuple, "file-path", scratch);
+    tuple_associate_string(tuple, FIELD_FILE_PATH, NULL, scratch);
     g_free(scratch);
 
     g_free(realfn); realfn = NULL;
@@ -150,7 +154,7 @@
     ext = strrchr(filename, '.');
     if (ext != NULL) {
         ++ext;
-        tuple_associate_string(tuple, "file-ext", scratch);
+        tuple_associate_string(tuple, FIELD_FILE_EXT, NULL, scratch);
     }
 
     return tuple;
@@ -294,7 +298,7 @@
             type = value->type;
     } else {
         if (tuple->values[nfield])
-            value = tuple->values[nfield]->type;
+            type = tuple->values[nfield]->type;
     }
     
     TUPLE_UNLOCK_READ();