[Pkg-mono-svn-commits] rev 3382 - in non-group/banshee/trunk/debian: . patches

[Sebastian Dröge]

Author: slomo
Date: 2007-09-25 17:15:49 +0000 (Tue, 25 Sep 2007)
New Revision: 3382

Added:
   non-group/banshee/trunk/debian/patches/09_search-by-crash.patch
Modified:
   non-group/banshee/trunk/debian/changelog
Log:
* debian/patches/09_search-by-crash.patch:
  + Don't crash when searching by artist/album/genre if that field is empty.
    Patch from http://bugzilla.gnome.org/show_bug.cgi?id=479237
    (Closes: #443555).

Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog	2007-09-25 17:11:53 UTC (rev 3381)
+++ non-group/banshee/trunk/debian/changelog	2007-09-25 17:15:49 UTC (rev 3382)
@@ -4,6 +4,10 @@
     + Only recommend gnome-volume-manager and hal to make it possible to
       build banshee plugin packages on the buildds. Also banshee works without
       them with basic features, thus this should be recommends anyway.
+  * debian/patches/09_search-by-crash.patch:
+    + Don't crash when searching by artist/album/genre if that field is empty.
+      Patch from http://bugzilla.gnome.org/show_bug.cgi?id=479237
+      (Closes: #443555).
 
  -- Sebastian Dröge <slomo at debian.org>  Tue, 25 Sep 2007 19:09:30 +0200
 

Added: non-group/banshee/trunk/debian/patches/09_search-by-crash.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/09_search-by-crash.patch	                        (rev 0)
+++ non-group/banshee/trunk/debian/patches/09_search-by-crash.patch	2007-09-25 17:15:49 UTC (rev 3382)
@@ -0,0 +1,85 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(Revision 2497)
++++ ChangeLog	(Arbeitskopie)
+@@ -1,3 +1,9 @@
++2007-09-22  Sebastian Dröge  <slomo at circular-chaos.org>
++
++	* src/Core/Banshee/PlayerInterface.cs: Don't filter by
++	Artist/Album/Genre if the relevant field is empty or null. If it was
++	null Banshee crashed before (BGO #479237)
++
+ 2007-09-19  Sebastian Dröge  <slomo at circular-chaos.org>
+ 
+ 	* src/Core/Banshee.Base/Banshee.Library/Import.cs:
+Index: src/Core/Banshee/PlayerInterface.cs
+===================================================================
+--- src/Core/Banshee/PlayerInterface.cs	(Revision 2497)
++++ src/Core/Banshee/PlayerInterface.cs	(Arbeitskopie)
+@@ -2023,7 +2023,7 @@
+             string playlist_uri = null;
+             int response = chooser.Run();            
+ 
+-            if(response == (int) ResponseType.Ok) {            	
++            if(response == (int) ResponseType.Ok) {                    
+                 playlist_uri = SafeUri.UriToFilename(chooser.Uri);              
+                 chooser.Destroy(); 
+             } else {
+@@ -2034,8 +2034,8 @@
+ 
+             // Read the contents of the playlist.
+             string[] uris = null;
+-            try {            	
+-                uris = PlaylistFileUtil.ImportPlaylist(playlist_uri);            	
++            try {                    
++                uris = PlaylistFileUtil.ImportPlaylist(playlist_uri);                    
+             } catch (Exception e) {
+                 HigMessageDialog md = new HigMessageDialog(WindowPlayer, 
+                     DialogFlags.DestroyWithParent, 
+@@ -2052,7 +2052,7 @@
+             // Import the tracks specified in the playlist.
+             if (uris != null) {
+                 ImportPlaylistWorker worker = new ImportPlaylistWorker(uris);
+-                Thread t = new Thread(new ThreadStart(worker.Import));		        
++                Thread t = new Thread(new ThreadStart(worker.Import));                        
+                 t.Start();
+             } else {
+                 HigMessageDialog md = new HigMessageDialog(WindowPlayer, 
+@@ -2081,7 +2081,7 @@
+             string uri = null;
+             PlaylistFormatDescription format = null;
+             int response = chooser.Run();            
+-            if(response == (int) ResponseType.Ok) {            	
++            if(response == (int) ResponseType.Ok) {                    
+                 uri = chooser.Uri;
+                 // Get the format that the user selected.
+                 format = chooser.GetExportFormat();
+@@ -2494,16 +2494,22 @@
+ 
+             switch(criteria) {
+                 case SearchTrackCriteria.Album:
+-                    searchEntry.ActivateFilter((int)TrackFilterType.AlbumTitle);
+-                    searchEntry.Query = track.Album;
++                    if (track.Album != null && track.Album != String.Empty) {
++                        searchEntry.ActivateFilter((int)TrackFilterType.AlbumTitle);
++                        searchEntry.Query = track.Album;
++                    }
+                     break;
+                 case SearchTrackCriteria.Artist:
+-                    searchEntry.ActivateFilter((int)TrackFilterType.ArtistName);
+-                    searchEntry.Query = track.Artist;
++                    if (track.Artist != null && track.Artist != String.Empty) {
++                        searchEntry.ActivateFilter((int)TrackFilterType.ArtistName);
++                        searchEntry.Query = track.Artist;
++                    }
+                     break;
+                 case SearchTrackCriteria.Genre:
+-                    searchEntry.ActivateFilter((int)TrackFilterType.Genre);
+-                    searchEntry.Query = track.Genre;
++                    if (track.Genre != null && track.Genre != String.Empty) {
++                      searchEntry.ActivateFilter((int)TrackFilterType.Genre);
++                      searchEntry.Query = track.Genre;
++                    }
+                     break;
+             }
+