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

[abock svn gnome org]

Author: abock
Date: Tue Nov 11 00:08:13 2008
New Revision: 4833
URL: http://svn.gnome.org/viewvc/banshee?rev=4833&view=rev

Log:
* banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs:
  Return the device name simply as what's in the VendorProductInfo
  object

* banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml:
  Change to Android G1 Phone, detaching from T-Mobile

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml	Tue Nov 11 00:08:13 2008
@@ -26,7 +26,7 @@
   <!-- Any devices we wish to special case and support out of the box -->
   <Extension path="/Banshee/Dap/MassStorage/Device">
     <MassStorageDevice class="Banshee.Dap.MassStorage.AndroidDevice" 
-        vendor-name="HTC" product-name="T-Mobile G1"
+        vendor-name="HTC" product-name="Android G1 Phone"
         vendor-id="0x0bb4" product-id="0x0c01,0x0c02"/>
   </Extension>
 

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs	Tue Nov 11 00:08:13 2008
@@ -76,18 +76,8 @@
             return true;
         }
         
-        private string name;
         public override string Name {
-            get { 
-                if (name == null) {
-                    name = Source.UsbDevice.Name;
-                    if (String.IsNullOrEmpty (Name)) {
-                        name = base.Name ?? "Android Phone";
-                    }
-                }
-                
-                return name;
-            }
+            get { return VendorProductInfo.ProductName; }
         }
         
         public override string [] AudioFolders {