banshee r3401 - in branches/banshee/stable: . src/Core/Banshee src/Core/Banshee.Base src/Core/Banshee.Base/Gui src/Core/Banshee.Widgets src/Plugins/Banshee.Plugins.Radio

[abock svn gnome org]

Author: abock
Date: Sun Mar  9 23:58:45 2008
New Revision: 3401
URL: http://svn.gnome.org/viewvc/banshee?rev=3401&view=rev

Log:
2008-03-09  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.Base/ActionManager.cs:
    * src/Core/Banshee.Widgets/ActionButton.cs:
    * src/Core/Banshee/PlayerInterface.cs:
    * src/Plugins/Banshee.Plugins.Radio/RadioSource.cs: Force 'Action' to
    mean 'Gtk.Action' since now there is an API in .NET called 'System.Action'
    and the compiler could not resolve which 'Action' to use

    * src/Core/Banshee.Base/Gui/SourceView.cs:
    * src/Core/Banshee.Base/Gui/LogCoreDialog.cs: Fix some syntax bugs
    exposed by newer C# 2.0 compilers in Mono



Modified:
   branches/banshee/stable/ChangeLog
   branches/banshee/stable/src/Core/Banshee.Base/ActionManager.cs
   branches/banshee/stable/src/Core/Banshee.Base/Gui/LogCoreDialog.cs
   branches/banshee/stable/src/Core/Banshee.Base/Gui/SourceView.cs
   branches/banshee/stable/src/Core/Banshee.Widgets/ActionButton.cs
   branches/banshee/stable/src/Core/Banshee/PlayerInterface.cs
   branches/banshee/stable/src/Plugins/Banshee.Plugins.Radio/RadioSource.cs

Modified: branches/banshee/stable/src/Core/Banshee.Base/ActionManager.cs
==============================================================================
--- branches/banshee/stable/src/Core/Banshee.Base/ActionManager.cs	(original)
+++ branches/banshee/stable/src/Core/Banshee.Base/ActionManager.cs	Sun Mar  9 23:58:45 2008
@@ -31,6 +31,8 @@
 using Gtk;
 using Mono.Unix;
 
+using Action = Gtk.Action;
+
 namespace Banshee.Base
 {
     public class ActionManager : IEnumerable

Modified: branches/banshee/stable/src/Core/Banshee.Base/Gui/LogCoreDialog.cs
==============================================================================
--- branches/banshee/stable/src/Core/Banshee.Base/Gui/LogCoreDialog.cs	(original)
+++ branches/banshee/stable/src/Core/Banshee.Base/Gui/LogCoreDialog.cs	Sun Mar  9 23:58:45 2008
@@ -99,7 +99,7 @@
                 } catch(Exception) {
                     (cell as CellRendererText).Text = "";
                 }
-            } as TreeCellDataFunc);
+            });
             date_column.SortColumnId = 1;
             
             log_tree.AppendColumn(date_column);

Modified: branches/banshee/stable/src/Core/Banshee.Base/Gui/SourceView.cs
==============================================================================
--- branches/banshee/stable/src/Core/Banshee.Base/Gui/SourceView.cs	(original)
+++ branches/banshee/stable/src/Core/Banshee.Base/Gui/SourceView.cs	Sun Mar  9 23:58:45 2008
@@ -214,7 +214,7 @@
             
             if(source is ChildSource) {
                 ChildSource child = source as ChildSource;
-                if(child.Parent.AutoExpand) {
+                if(child.Parent.AutoExpand != null && child.Parent.AutoExpand.Value) {
                     Expand(FindSource(child.Parent));
                 }
             }

Modified: branches/banshee/stable/src/Core/Banshee.Widgets/ActionButton.cs
==============================================================================
--- branches/banshee/stable/src/Core/Banshee.Widgets/ActionButton.cs	(original)
+++ branches/banshee/stable/src/Core/Banshee.Widgets/ActionButton.cs	Sun Mar  9 23:58:45 2008
@@ -31,6 +31,8 @@
 using System.Collections;
 using Gtk;
 
+using Action = Gtk.Action;
+
 namespace Banshee.Widgets
 {
     public class ActionButton : Button

Modified: branches/banshee/stable/src/Core/Banshee/PlayerInterface.cs
==============================================================================
--- branches/banshee/stable/src/Core/Banshee/PlayerInterface.cs	(original)
+++ branches/banshee/stable/src/Core/Banshee/PlayerInterface.cs	Sun Mar  9 23:58:45 2008
@@ -40,6 +40,8 @@
 using Gdk;
 using Glade;
 
+using Action = Gtk.Action;
+
 using Banshee.Widgets;
 using Banshee.Base;
 using Banshee.MediaEngine;

Modified: branches/banshee/stable/src/Plugins/Banshee.Plugins.Radio/RadioSource.cs
==============================================================================
--- branches/banshee/stable/src/Plugins/Banshee.Plugins.Radio/RadioSource.cs	(original)
+++ branches/banshee/stable/src/Plugins/Banshee.Plugins.Radio/RadioSource.cs	Sun Mar  9 23:58:45 2008
@@ -32,6 +32,8 @@
 using Mono.Unix;
 using Gtk;
 
+using Action = Gtk.Action;
+
 using Banshee.Base;
 using Banshee.Widgets;
 using Banshee.Sources;