rpms/audacious/F-12 audacious-2.2-set_tuple_cb.patch, 1.1, 1.2 audacious.spec, 1.61, 1.62

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4333

Modified Files:
	audacious-2.2-set_tuple_cb.patch audacious.spec 
Log Message:
AUD-137

audacious-2.2-set_tuple_cb.patch:
 audacious/playback.c |    4 +++-
 libaudcore/tuple.c   |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

Index: audacious-2.2-set_tuple_cb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious-2.2-set_tuple_cb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-2.2-set_tuple_cb.patch	28 Jan 2010 13:03:46 -0000	1.1
+++ audacious-2.2-set_tuple_cb.patch	28 Jan 2010 22:17:24 -0000	1.2
@@ -15,16 +15,12 @@ diff -Nur audacious-2.2-orig/src/audacio
  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:


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- audacious.spec	28 Jan 2010 13:03:47 -0000	1.61
+++ audacious.spec	28 Jan 2010 22:17:24 -0000	1.62
@@ -23,7 +23,7 @@ Patch2: audacious-2.2-pkgconfig-libs.pat
 # 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)