*** amarok-1.4.4/amarok/src/mediadevice/mtp/mtpmediadevice.cpp.orig	2006-10-26 16:40:20.000000000 -0400
--- amarok-1.4.4/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2006-12-10 15:18:49.000000000 -0500
***************
*** 323,336 ****
      debug() << "Parent id : " << parent_id << endl;
  
      m_critical_mutex.lock();
!     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
      int ret = LIBMTP_Send_Track_From_File(
!         m_device, bundle.url().path().utf8(), trackmeta,
! #ifdef LIBMTP_CALLBACKS
!         progressCallback, this, parent_id  // callbacks only in libmtp >= 0.0.15
! #else
!         0, 0, parent_id
! #endif
      );
      m_critical_mutex.unlock();
  
--- 323,332 ----
      debug() << "Parent id : " << parent_id << endl;
  
      m_critical_mutex.lock();
!     debug() << "Sending track... " << bundle.url().path().latin1() << endl;
      int ret = LIBMTP_Send_Track_From_File(
!         m_device, bundle.url().path().latin1(), trackmeta,
!         progressCallback, this, parent_id
      );
      m_critical_mutex.unlock();
  
***************
*** 1319,1325 ****
          while( playlists != 0 )
          {
              MtpMediaItem *playlist = new MtpMediaItem( m_playlistItem, this );
!             playlist->setText( 0, playlists->name );
              playlist->setType( MediaItem::PLAYLIST );
              playlist->setPlaylist( new MtpPlaylist() );
              playlist->playlist()->setId( playlists->playlist_id );
--- 1315,1321 ----
          while( playlists != 0 )
          {
              MtpMediaItem *playlist = new MtpMediaItem( m_playlistItem, this );
!             playlist->setText( 0, QString::fromUtf8( playlists->name ) );
              playlist->setType( MediaItem::PLAYLIST );
              playlist->setPlaylist( new MtpPlaylist() );
              playlist->playlist()->setId( playlists->playlist_id );
***************
*** 1371,1385 ****
      MetaBundle *bundle = new MetaBundle();
  
      if( track->genre != 0 )
!         bundle->setGenre( AtomicString( qstrdup( track->genre ) ) );
      if( track->artist != 0 )
!         bundle->setArtist( AtomicString( qstrdup( track->artist ) ) );
      if( track->album != 0 )
!         bundle->setAlbum( AtomicString( qstrdup( track->album ) ) );
      if( track->title != 0 )
!         bundle->setTitle( AtomicString( qstrdup( track->title ) ) );
      if( track->filename != 0 )
!         bundle->setPath( AtomicString( qstrdup( track->filename ) ) );
  
      // translate codecs to file types
      if( track->filetype == LIBMTP_FILETYPE_MP3 )
--- 1367,1381 ----
      MetaBundle *bundle = new MetaBundle();
  
      if( track->genre != 0 )
!         bundle->setGenre( AtomicString( QString::fromUtf8( track->genre ) ) );
      if( track->artist != 0 )
!         bundle->setArtist( AtomicString( QString::fromUtf8( track->artist ) ) );
      if( track->album != 0 )
!         bundle->setAlbum( AtomicString( QString::fromUtf8( track->album ) ) );
      if( track->title != 0 )
!         bundle->setTitle( AtomicString( QString::fromUtf8( track->title ) ) );
      if( track->filename != 0 )
!         bundle->setPath( AtomicString( QString::fromUtf8( track->filename ) ) );
  
      // translate codecs to file types
      if( track->filetype == LIBMTP_FILETYPE_MP3 )
***************
*** 1392,1398 ****
          bundle->setFileType( MetaBundle::other );
  
      if( track->date != 0 )
!         bundle->setYear( QString( qstrdup( track->date ) ).mid( 0, 4 ).toUInt() );
      if( track->tracknumber > 0 )
          bundle->setTrack( track->tracknumber );
      if( track->duration > 0 )
--- 1388,1394 ----
          bundle->setFileType( MetaBundle::other );
  
      if( track->date != 0 )
!         bundle->setYear( QString( QString::fromUtf8( track->date ) ).mid( 0, 4 ).toUInt() );
      if( track->tracknumber > 0 )
          bundle->setTrack( track->tracknumber );
      if( track->duration > 0 )