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

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	amarok-2.0.96-old-libgpod.patch 
Log Message:
Yet another build fix to the patch.

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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- amarok-2.0.96-old-libgpod.patch	26 May 2009 22:05:27 -0000	1.4
+++ amarok-2.0.96-old-libgpod.patch	26 May 2009 22:22:16 -0000	1.5
@@ -33,7 +33,7 @@ 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-27 00:04:27.000000000 +0200
++++ amarok-2.0.96-old-libgpod/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-05-27 00:21:50.000000000 +0200
 @@ -1299,7 +1299,68 @@
      if( ipodtrack->has_artwork == 0x02 )
          return;
@@ -54,7 +54,7 @@ diff -ur amarok-2.0.96/src/collection/ip
 +
 +    if( thumb != NULL)
 +    {
-+        pixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
++        pixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( ipodtrack->itdb->device, thumb );
 +    }
 +    else
 +    {
@@ -96,8 +96,8 @@ diff -ur amarok-2.0.96/src/collection/ip
 +
 +        if( thumb != NULL)
 +        {
-+            thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) );
-+            pixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
++            thumbPath = QString::fromUtf8( itdb_thumb_get_filename( ipodtrack->itdb->device, thumb ) );
++            pixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( ipodtrack->itdb->device, thumb );
 +        }
 +    }
 +