banshee r3156 - in trunk/banshee: . src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Sources.Gui src/Core/Banshee.Widgets/Banshee.Widgets

[gburt svn gnome org]

Author: gburt
Date: Wed Feb  6 20:17:11 2008
New Revision: 3156
URL: http://svn.gnome.org/viewvc/banshee?rev=3156&view=rev

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

	* src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:
	* src/Core/Banshee.Widgets/Banshee.Widgets/ActionButton.cs:
	* src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs:
	* src/Core/Banshee.Widgets/Banshee.Widgets/RatingActionProxy.cs: Fix mono
	1.9 compiler error with amibuous Action references.

	* src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs: Fix mono
	1.9 compiler error with if (bool?) statement.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ActionButton.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
   trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/RatingActionProxy.cs

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs	Wed Feb  6 20:17:11 2008
@@ -73,7 +73,7 @@
 
         public void UpdateAction (string action_name, bool visible, bool sensitive, Source source)
         {
-            Action action = this[action_name];
+            Gtk.Action action = this[action_name];
             action.Visible = visible;
             action.Sensitive = visible && sensitive;
 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs	Wed Feb  6 20:17:11 2008
@@ -32,6 +32,7 @@
 using System.Collections.Generic;
 
 using Gtk;
+using Action = Gtk.Action;
 
 using Banshee.Sources;
 using Banshee.ServiceStack;

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs	Wed Feb  6 20:17:11 2008
@@ -42,7 +42,7 @@
     public class PlaybackActions : BansheeActionGroup
     {
         private InterfaceActionService action_service;
-        private Action play_pause_action;
+        private Gtk.Action play_pause_action;
         
         public PlaybackActions (InterfaceActionService actionService) : base ("Playback")
         {

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs	Wed Feb  6 20:17:11 2008
@@ -264,7 +264,7 @@
             Source active_source = ServiceManager.SourceManager.ActiveSource;
 
             // TODO find just the menu that was activated instead of modifying all proxies
-            foreach (MenuItem menu in (o as Action).Proxies) {
+            foreach (MenuItem menu in (o as Gtk.Action).Proxies) {
                 Menu submenu = new Menu ();
                 menu.Submenu = submenu;
 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs	Wed Feb  6 20:17:11 2008
@@ -348,7 +348,7 @@
             }
             
             if (source.Parent != null) {
-                if (source.Parent.AutoExpand) {
+                if (source.Parent.AutoExpand == true) {
                     Expand (FindSource (source.Parent));
                 }
             }

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ActionButton.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ActionButton.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/ActionButton.cs	Wed Feb  6 20:17:11 2008
@@ -37,18 +37,18 @@
     {
         private static ArrayList buttons = new ArrayList();
 
-        private Action action;
+        private Gtk.Action action;
         private HBox box = new HBox();
         private Image image = new Image();
         private Label label = new Label();
         private Gdk.Pixbuf pixbuf;
         private IconSize default_size;
         
-        public ActionButton(Action action) : this(action, IconSize.SmallToolbar)
+        public ActionButton(Gtk.Action action) : this(action, IconSize.SmallToolbar)
         {
         }
         
-        public ActionButton(Action action, IconSize defaultSize) : base()
+        public ActionButton(Gtk.Action action, IconSize defaultSize) : base()
         {
             this.action = action;
             default_size = defaultSize;
@@ -97,7 +97,7 @@
             }
         }
         
-        public new Action Action {
+        public new Gtk.Action Action {
             get {
                 return action;
             }
@@ -148,16 +148,16 @@
     {
         private static ArrayList buttons = new ArrayList();
 
-        private Action action;
+        private Gtk.Action action;
         private HBox box = new HBox();
         private Image image = new Image();
         private IconSize default_size;
         
-        public ActionToggleButton(Action action) : this(action, IconSize.SmallToolbar)
+        public ActionToggleButton(Gtk.Action action) : this(action, IconSize.SmallToolbar)
         {
         }
     
-        public ActionToggleButton(Action action, IconSize defaultSize) : base()
+        public ActionToggleButton(Gtk.Action action, IconSize defaultSize) : base()
         {
             this.action = action;
             
@@ -202,7 +202,7 @@
             }
         }
         
-        public new Action Action {
+        public new Gtk.Action Action {
             get {
                 return action;
             }

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/CustomActionProxy.cs	Wed Feb  6 20:17:11 2008
@@ -35,7 +35,7 @@
 {
     public abstract class CustomActionProxy
     {
-        protected Action action;
+        protected Gtk.Action action;
         protected string [] paths;
         protected UIManager ui;
 
@@ -54,7 +54,7 @@
 
 #region Public API
 
-        public CustomActionProxy (UIManager ui, Action proxiedAction)
+        public CustomActionProxy (UIManager ui, Gtk.Action proxiedAction)
         {
             this.action = proxiedAction;
             this.ui = ui;
@@ -92,7 +92,7 @@
             }
         }
 
-        protected virtual void InsertProxy (Action menuAction, Widget menu, MenuItem afterItem)
+        protected virtual void InsertProxy (Gtk.Action menuAction, Widget menu, MenuItem afterItem)
         {
             Menu parent_menu = ((menu is MenuItem) ? (menu as MenuItem).Submenu : menu) as Menu;
             int position = (afterItem != null) ? Array.IndexOf (parent_menu.Children, afterItem) + 1 : 0;

Modified: trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/RatingActionProxy.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/RatingActionProxy.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/RatingActionProxy.cs	Wed Feb  6 20:17:11 2008
@@ -38,7 +38,7 @@
         private List<RatingMenuItem> rating_items = new List<RatingMenuItem> ();
         private int last_rating;
 
-        public RatingActionProxy (UIManager ui, Action action) : base (ui, action)
+        public RatingActionProxy (UIManager ui, Gtk.Action action) : base (ui, action)
         {
         }