From 4bebf41c6cd2179f39f615909a5d00694dcd4de7 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jan 28 2010 22:09:12 +0000
Subject: AUD-137


---

diff --git a/audacious-2.2-set_tuple_cb.patch b/audacious-2.2-set_tuple_cb.patch
index ba91730..1485515 100644
--- a/audacious-2.2-set_tuple_cb.patch
+++ b/audacious-2.2-set_tuple_cb.patch
@@ -15,16 +15,12 @@ diff -Nur audacious-2.2-orig/src/audacious/playback.c audacious-2.2/src/audaciou
  void ip_set_info (const gchar * title, gint length, gint bitrate, gint
 diff -Nur audacious-2.2-orig/src/libaudcore/tuple.c audacious-2.2/src/libaudcore/tuple.c
 --- audacious-2.2-orig/src/libaudcore/tuple.c	2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/libaudcore/tuple.c	2010-01-28 13:51:04.000000000 +0100
-@@ -236,9 +236,11 @@
++++ audacious-2.2/src/libaudcore/tuple.c	2010-01-28 23:01:53.000000000 +0100
+@@ -234,6 +234,7 @@
+     if (src == NULL) return NULL;
+ 
      res = mowgli_heap_alloc(tuple_value_heap);
++    res->type = src->type;
      switch (src->type) {
      case TUPLE_STRING:
-+        res->type = TUPLE_STRING;
          res->value.string = stringpool_get(src->value.string);
-         break;
-     case TUPLE_INT:
-+        res->type = TUPLE_INT;
-         res->value.integer = src->value.integer;
-         break;
-     default:
diff --git a/audacious.spec b/audacious.spec
index eae5c06..24aee84 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -23,7 +23,7 @@ Patch2: audacious-2.2-pkgconfig-libs.patch
 # for a problem that is known upstream, but 2.3-alpha1 doesn't fixed it yet
 # iplugin sorting order is important, too
 Patch3: audacious-2.2-multiple-decoders-per-ext.patch
-#
+# 2nd half fixed upstream (and revised)
 Patch4: audacious-2.2-set_tuple_cb.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)