[Pkg-cli-apps-commits] r4102 - in /packages/banshee/trunk/debian: changelog patches/03_now-playing-cover-crash.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu Aug 14 08:43:49 2008
New Revision: 4102

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4102
Log:
* debian/patches/03_now-playing-cover-crash.patch:
  + Fix crash in the "Now playing" source if the current song
    has no cover art. Patch from upstream SVN/Bugzilla.

Added:
    packages/banshee/trunk/debian/patches/03_now-playing-cover-crash.patch
Modified:
    packages/banshee/trunk/debian/changelog

Modified: packages/banshee/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/changelog?rev=4102&op=diff
==============================================================================
--- packages/banshee/trunk/debian/changelog (original)
+++ packages/banshee/trunk/debian/changelog Thu Aug 14 08:43:49 2008
@@ -1,3 +1,11 @@
+banshee (1.2.1-2) experimental; urgency=low
+
+  * debian/patches/03_now-playing-cover-crash.patch:
+    + Fix crash in the "Now playing" source if the current song
+      has no cover art. Patch from upstream SVN/Bugzilla.
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 14 Aug 2008 10:43:05 +0200
+
 banshee (1.2.1-1) experimental; urgency=low
 
   * New upstream bugfix release:

Added: packages/banshee/trunk/debian/patches/03_now-playing-cover-crash.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/patches/03_now-playing-cover-crash.patch?rev=4102&op=file
==============================================================================
--- packages/banshee/trunk/debian/patches/03_now-playing-cover-crash.patch (added)
+++ packages/banshee/trunk/debian/patches/03_now-playing-cover-crash.patch Thu Aug 14 08:43:49 2008
@@ -1,0 +1,31 @@
+Index: src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/VideoDisplay.cs
+===================================================================
+--- src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/VideoDisplay.cs	(revision 4363)
++++ src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/VideoDisplay.cs	(working copy)
+@@ -103,15 +103,22 @@
+             
+             Gdk.Pixbuf display_pixbuf = null;
+             
+-            if (track.ArtworkId == last_coverart_id) {
++            if (track.ArtworkId == last_coverart_id && last_coverart_pixbuf != null) {
+                 display_pixbuf = last_coverart_pixbuf;
+             } else if (Banshee.Base.CoverArtSpec.CoverExists (track.ArtworkId)) {
+                 if (last_coverart_pixbuf != null) {
+                     last_coverart_pixbuf.Dispose ();
+                 }
+                 last_coverart_id = track.ArtworkId;
+-                display_pixbuf = last_coverart_pixbuf = new Gdk.Pixbuf (Banshee.Base.CoverArtSpec.GetPath (last_coverart_id));
+-            } else {
++                try {
++                    display_pixbuf = last_coverart_pixbuf = new Gdk.Pixbuf (Banshee.Base.CoverArtSpec.GetPath (last_coverart_id));
++                } catch {
++                    last_coverart_id = null;
++                    display_pixbuf = null;
++                }
++            }
++
++            if (display_pixbuf == null) {
+                 return false;
+             }
+             
+