banshee r3893 - in trunk/banshee: . src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage src/Dap/Banshee.Dap/Banshee.Dap

[gburt svn gnome org]

Author: gburt
Date: Tue May  6 17:20:56 2008
New Revision: 3893
URL: http://svn.gnome.org/viewvc/banshee?rev=3893&view=rev

Log:
2008-05-06  Gabriel Burt  <gabriel burt gmail com>

	* src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:
	Fix bug just introduced with mass storage support via .is_a_p files.

	* src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs: Get rid of silly non-DAP
	fallbacks for generic name and icons.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs	Tue May  6 17:20:56 2008
@@ -60,11 +60,11 @@
             // TODO set up a ui for selecting volumes we want mounted/shown within Banshee
             // (so people don't have to touch .is_audio_player, and so we can give them a harddrive icon
             // instead of pretending they are DAPs).
-            if (!HasMediaCapabilities)
+            if (!HasMediaCapabilities && !HasIsAudioPlayerFile)
                 throw new InvalidDeviceException ();
 
             // Ignore iPods, except ones with .is_audio_player files
-            if (MediaCapabilities.IsType ("ipod")) {
+            if (MediaCapabilities != null && MediaCapabilities.IsType ("ipod")) {
                 if (HasIsAudioPlayerFile) {
                     Log.Information (
                         "Mass Storage Support Loading iPod",
@@ -108,10 +108,6 @@
             get { return mount_point; }
         }
 
-        protected override bool HasMediaCapabilities {
-            get { return base.HasMediaCapabilities || HasIsAudioPlayerFile; }
-        }
-
         private bool HasIsAudioPlayerFile {
             get { return File.Exists (new SafeUri (IsAudioPlayerPath)); }
         }

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	Tue May  6 17:20:56 2008
@@ -102,9 +102,7 @@
             });
 
             if (String.IsNullOrEmpty (GenericName)) {
-                GenericName = HasMediaCapabilities 
-                    ? Catalog.GetString ("Media Player") 
-                    : Catalog.GetString ("Storage Device");
+                GenericName = Catalog.GetString ("Media Player");
             }
             
             if (String.IsNullOrEmpty (Name)) {
@@ -258,7 +256,7 @@
         }
         
         private string FallbackIcon {
-            get { return HasMediaCapabilities ? "multimedia-player" : "harddrive"; }
+            get { return "multimedia-player"; }
         }
 
         protected virtual bool HasMediaCapabilities {