rpms/amarok/F-10 amarok-2.0.96-old-libgpod.patch,1.3,1.4

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/amarok/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22303/F-10

Modified Files:
	amarok-2.0.96-old-libgpod.patch 
Log Message:
And rename gpixbuf back to pixbuf to match the new code.

amarok-2.0.96-old-libgpod.patch:

Index: amarok-2.0.96-old-libgpod.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-10/amarok-2.0.96-old-libgpod.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- amarok-2.0.96-old-libgpod.patch	26 May 2009 21:52:32 -0000	1.3
+++ amarok-2.0.96-old-libgpod.patch	26 May 2009 22:05:27 -0000	1.4
@@ -33,14 +33,14 @@ diff -ur amarok-2.0.96/src/collection/ip
 +endif (IPOD_FOUND AND WITH_Ipod)
 diff -ur amarok-2.0.96/src/collection/ipodcollection/handler/IpodHandler.cpp amarok-2.0.96-old-libgpod/src/collection/ipodcollection/handler/IpodHandler.cpp
 --- amarok-2.0.96/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-05-26 23:22:01.000000000 +0200
-+++ amarok-2.0.96-old-libgpod/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-05-26 23:51:52.000000000 +0200
++++ amarok-2.0.96-old-libgpod/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-05-27 00:04:27.000000000 +0200
 @@ -1299,7 +1299,68 @@
      if( ipodtrack->has_artwork == 0x02 )
          return;
  
 -    GdkPixbuf *pixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( ipodtrack->itdb->device, ipodtrack->artwork, -1, -1 );
 +    Itdb_Thumb *thumb = NULL;
-+    GdkPixbuf *gpixbuf = NULL;
++    GdkPixbuf *pixbuf = NULL;
 +    QString thumbPath;
 +
 +    // try small first