[Banshee-List] compiling from svn



Hello,

I tried compiling from svn earlier today, and ran into a handful of issues. I've attached a diff report below in hopes that it is useful for a) identifying issues with the current build to those that really are able to make the appropriate corrections, and b) a way to work around these until they are more appropriately fixed.


Thanks,
Mike




Index: src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs
===================================================================
--- src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs	(revision 4449)
+++ src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs	(working copy)
@@ -70,7 +70,7 @@
             toplevel.SizeAllocated += OnToplevelSizeAllocated;
         }

-        private bool can_hide;
+        private bool can_hide = false;
         public bool CanHide {
             get { return can_hide; }
         }
Index: src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs
===================================================================
--- src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs	(revision 4449)
+++ src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs	(working copy)
@@ -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) {
-                owner_update = ownerEntry.Text;
-            }
+            //if(ownerEntry != null) {
+            //    owner_update = ownerEntry.Text;
+            //}

             if(nameEntry != null) {
                 name_update = nameEntry.Text;
@@ -178,10 +178,10 @@
             }
         }

-        public string UpdatedOwner {
-            get {
-                return owner_update;
-            }
-        }
+        //public string UpdatedOwner {
+        //    get {
+        //        return owner_update;
+        //    }
+        //}
     }
 }
Index: src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
===================================================================
--- src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs	(revision 4449)
+++ src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs	(working copy)
@@ -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);
         }
Index: src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs
===================================================================
--- src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs	(revision 4449)
+++ src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CellEditEntry.cs	(working copy)
@@ -33,8 +33,8 @@
 {
     internal class EditedEventArgs : EventArgs
     {
-        public TreePath path;
-        public string text;
+        //public TreePath path;
+        //public string text;
     }

     internal delegate void EditedEventHandler (object o, EditedEventArgs args);
Index: src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs
===================================================================
--- src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs	(revision 4449)
+++ src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs	(working copy)
@@ -142,6 +142,7 @@

         protected void SetupMainView<T> (ListView<T> main_view)
         {
+	    this.main_view = main_view;
             main_scrolled_window = SetupView (main_view);
         }

Index: src/Core/Banshee.Services/Banshee.Hardware/IVolume.cs
===================================================================
--- src/Core/Banshee.Services/Banshee.Hardware/IVolume.cs	(revision 4449)
+++ src/Core/Banshee.Services/Banshee.Hardware/IVolume.cs	(working copy)
@@ -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; }
Index: src/Backends/Banshee.Hal/Banshee.HalBackend/CdromDevice.cs
===================================================================
--- src/Backends/Banshee.Hal/Banshee.HalBackend/CdromDevice.cs	(revision 4449)
+++ src/Backends/Banshee.Hal/Banshee.HalBackend/CdromDevice.cs	(working copy)
@@ -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);
Index: src/Backends/Banshee.Hal/Banshee.HalBackend/DiskDevice.cs
===================================================================
--- src/Backends/Banshee.Hal/Banshee.HalBackend/DiskDevice.cs	(revision 4449)
+++ src/Backends/Banshee.Hal/Banshee.HalBackend/DiskDevice.cs	(working copy)
@@ -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);
Index: src/Libraries/Hyena/Hyena.Query/QueryOrder.cs
===================================================================
--- src/Libraries/Hyena/Hyena.Query/QueryOrder.cs	(revision 4449)
+++ src/Libraries/Hyena/Hyena.Query/QueryOrder.cs	(working copy)
@@ -61,6 +61,7 @@
             this.name = name;
             this.label = label;
             this.order_sql = order_sql;
+	    this.field = field;
         }

         public string ToSql ()
Index: src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelProvider.cs
===================================================================
--- src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelProvider.cs	(revision 4449)
+++ src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelProvider.cs	(working copy)
@@ -574,7 +574,7 @@
         protected virtual HyenaSqliteCommand SelectRangeCommand {
             get {
                 if (select_range_command == null) {
-                    select_command = new HyenaSqliteCommand (
+                    select_range_command = new HyenaSqliteCommand (
                         String.Format (
                             "SELECT {0} FROM {1}{2}{3} LIMIT ?, ?",
                             Select, From,
Index: src/Libraries/Migo/Migo.Syndication/Feed.cs
===================================================================
--- src/Libraries/Migo/Migo.Syndication/Feed.cs	(revision 4449)
+++ src/Libraries/Migo/Migo.Syndication/Feed.cs	(working copy)
@@ -499,6 +499,7 @@
         public void Update ()
         {
             Manager.QueueUpdate (this);
+	    updating = true;
         }

         public void Delete ()
@@ -515,6 +516,7 @@

                 if (updating) {
                     Manager.CancelUpdate (this);
+		    updating = false;
                 }

                 foreach (FeedItem item in Items) {
@@ -522,6 +524,8 @@
                 }

                 Provider.Delete (this);
+
+		deleted = true;
             }

             //updatingHandle.WaitOne ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]