banshee r4955 - in trunk/banshee: . src/Backends/Banshee.Hal/Banshee.HalBackend src/Core/Banshee.Core/Banshee.Streaming src/Core/Banshee.Services/Banshee.Hardware src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs src/Core/Banshee.ThickClient/Banshee.Sources.Gui src/Dap/Banshee.Dap/Banshee.Dap.Gui src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying src/Libraries/Hyena.Gui/Hyena.Widgets src/Libraries/Hyena/Hyena

[gburt svn gnome org]

Author: gburt
Date: Sun Jan 25 20:14:32 2009
New Revision: 4955
URL: http://svn.gnome.org/viewvc/banshee?rev=4955&view=rev

Log:
2009-01-25  Gabriel Burt  <gabriel burt gmail com>

	* src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs:
	* src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs:
	* src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs:
	* src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:
	* src/Core/Banshee.Services/Banshee.Hardware/IVolume.cs:
	* src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs:
	* src/Backends/Banshee.Hal/Banshee.HalBackend/CdromDevice.cs:
	* src/Backends/Banshee.Hal/Banshee.HalBackend/UsbDevice.cs:
	* src/Backends/Banshee.Hal/Banshee.HalBackend/DiskDevice.cs:
	* src/Libraries/Hyena/Hyena/Log.cs:
	* src/Libraries/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs: Fix compilation
	issues when building with Mono 2.2



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/CdromDevice.cs
   trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/DiskDevice.cs
   trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/UsbDevice.cs
   trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Hardware/IVolume.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs
   trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs
   trunk/banshee/src/Libraries/Hyena/Hyena/Log.cs

Modified: trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/CdromDevice.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/CdromDevice.cs	(original)
+++ trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/CdromDevice.cs	Sun Jan 25 20:14:32 2009
@@ -36,7 +36,7 @@
 {
     public class CdromDevice : BlockDevice, ICdromDevice
     {
-        public new static CdromDevice Resolve (Hal.Manager manager, Hal.Device device)
+        public static CdromDevice Resolve (Hal.Manager manager, Hal.Device device)
         {
             if (device["storage.drive_type"] == "cdrom") {
                 return new CdromDevice (manager, device);

Modified: trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/DiskDevice.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/DiskDevice.cs	(original)
+++ trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/DiskDevice.cs	Sun Jan 25 20:14:32 2009
@@ -36,7 +36,7 @@
 {
     public class DiskDevice : BlockDevice, IDiskDevice
     {
-        public new static DiskDevice Resolve (Hal.Manager manager, Hal.Device device)
+        public static DiskDevice Resolve (Hal.Manager manager, Hal.Device device)
         {
             if (device["storage.drive_type"] == "disk") {
                 return new DiskDevice (manager, device);

Modified: trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/UsbDevice.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/UsbDevice.cs	(original)
+++ trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/UsbDevice.cs	Sun Jan 25 20:14:32 2009
@@ -34,7 +34,7 @@
 {
     public class UsbDevice : Device, IUsbDevice
     {
-        public new static UsbDevice Resolve (Hal.Manager manager, Hal.Device device)
+        public static UsbDevice Resolve (Hal.Manager manager, Hal.Device device)
         {
             if (device["info.subsystem"] == "usb_device" && 
                 device.PropertyExists ("usb_device.product_id") && 

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs	Sun Jan 25 20:14:32 2009
@@ -53,7 +53,8 @@
                     throw new TagLib.UnsupportedFormatException ("File does not contain video or audio");
                 }
                 return file;
-            } catch (Exception) {
+            } catch (Exception e) {
+                Hyena.Log.DebugException (e);
                 return null;
             }
         }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Hardware/IVolume.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Hardware/IVolume.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Hardware/IVolume.cs	Sun Jan 25 20:14:32 2009
@@ -37,7 +37,7 @@
         bool IsReadOnly { get; }
         ulong Capacity { get; }
         long Available { get; }
-        new IBlockDevice Parent { get; }
+        IBlockDevice Parent { get; }
 
         bool ShouldIgnore { get; }
         string FileSystem { get; }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs	Sun Jan 25 20:14:32 2009
@@ -78,7 +78,7 @@
             AddButton (message, response, false);
         }
         
-        public new void AddStockButton (string stock, ResponseType response)
+        public void AddStockButton (string stock, ResponseType response)
         {
             AddStockButton (stock, response, false);
         }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs	Sun Jan 25 20:14:32 2009
@@ -31,14 +31,6 @@
 
 namespace Banshee.Sources.Gui
 {
-    internal class EditedEventArgs : EventArgs
-    {
-        public TreePath path;
-        public string text;
-    }
-    
-    internal delegate void EditedEventHandler (object o, EditedEventArgs args);
-    
     internal class CellEditEntry : Entry, CellEditable
     {
         public string path;

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs	Sun Jan 25 20:14:32 2009
@@ -144,6 +144,7 @@
         
         protected void SetupMainView<T> (ListView<T> main_view)
         {
+            this.main_view = main_view;
             main_scrolled_window = SetupView (main_view);
         }
         

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs	Sun Jan 25 20:14:32 2009
@@ -43,10 +43,10 @@
     {
         private DapSource source;
         private Entry nameEntry;
-        private Entry ownerEntry;
+        //private Entry ownerEntry;
         
         private string name_update;
-        private string owner_update;
+        //private string owner_update;
         
         private bool edited;
         
@@ -155,9 +155,9 @@
         
         private void OnEntryChanged(object o, EventArgs args)
         {
-            if(ownerEntry != null) {
+            /*if(ownerEntry != null) {
                 owner_update = ownerEntry.Text;
-            }
+            }*/
             
             if(nameEntry != null) {
                 name_update = nameEntry.Text;
@@ -180,7 +180,7 @@
         
         public string UpdatedOwner {
             get {
-                return owner_update;
+                return null; //owner_update;
             }
         }
     }

Modified: trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs	Sun Jan 25 20:14:32 2009
@@ -70,9 +70,8 @@
             toplevel.SizeAllocated += OnToplevelSizeAllocated;
         }
         
-        private bool can_hide;
         public bool CanHide {
-            get { return can_hide; }
+            get { return false; }
         }
         
         protected override void OnRealized ()

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/SegmentedBar.cs	Sun Jan 25 20:14:32 2009
@@ -385,7 +385,10 @@
             ImageSurface s = new ImageSurface (Format.Argb32, w, h);
             Context cr = new Context (s);
             RenderBar (cr, w, h, h / 2);
+// TODO Implement the new ctor - see http://bugzilla.gnome.org/show_bug.cgi?id=561394
+#pragma warning disable 0618 
             Pattern pattern = new Pattern (s);
+#pragma warning restore 0618 
             s.Destroy ();
             ((IDisposable)cr).Dispose ();
             return pattern;

Modified: trunk/banshee/src/Libraries/Hyena/Hyena/Log.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena/Log.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena/Log.cs	Sun Jan 25 20:14:32 2009
@@ -370,6 +370,13 @@
         
         #region Public Exception Methods
         
+        public static void DebugException (Exception e)
+        {
+            if (Debugging) {
+                Exception (e);
+            }
+        }
+
         public static void Exception (Exception e)
         {
             Exception (null, e);