banshee r4165 - in trunk/banshee: . src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Sources.Gui src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying

[gburt svn gnome org]

Author: gburt
Date: Wed Jun 18 17:45:35 2008
New Revision: 4165
URL: http://svn.gnome.org/viewvc/banshee?rev=4165&view=rev

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

	* src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:
	* src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:
	Patch from Alex Launi, adds some parenthesis that Mono 1.2.6 seems to need
	to compile Banshee (BGO #538973).


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
   trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/OverlayWindow.cs

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs	Wed Jun 18 17:45:35 2008
@@ -322,10 +322,10 @@
             Source source = ActionSource;
 
             if (source != last_source && source != null) {
-                IUnmapableSource unmapable = source as IUnmapableSource;
-                IImportSource import_source = source as IImportSource;
-                SmartPlaylistSource smart_playlist = source as SmartPlaylistSource;
-                PrimarySource primary_source = source as PrimarySource ?? source.Parent as PrimarySource;
+                IUnmapableSource unmapable = (source as IUnmapableSource);
+                IImportSource import_source = (source as IImportSource);
+                SmartPlaylistSource smart_playlist = (source as SmartPlaylistSource);
+                PrimarySource primary_source = (source as PrimarySource) ?? (source.Parent as PrimarySource);
 
                 UpdateAction ("UnmapSourceAction", unmapable != null, unmapable != null && unmapable.CanUnmap, source);
                 UpdateAction ("RenameSourceAction", source.CanRename, true, null);

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 Jun 18 17:45:35 2008
@@ -86,12 +86,12 @@
                     OnAddToNewPlaylist),
 
                 new ActionEntry ("RemoveTracksAction", Stock.Remove,
-                    Catalog.GetString("_Remove"), "Delete",
-                    Catalog.GetString("Remove selected track(s) from this source"), OnRemoveTracks),
+                    Catalog.GetString ("_Remove"), "Delete",
+                    Catalog.GetString ("Remove selected track(s) from this source"), OnRemoveTracks),
 
                 new ActionEntry ("RemoveTracksFromLibraryAction", null,
-                    Catalog.GetString("Remove From _Library"), "",
-                    Catalog.GetString("Remove selected track(s) from library"), OnRemoveTracksFromLibrary),
+                    Catalog.GetString ("Remove From _Library"), "",
+                    Catalog.GetString ("Remove selected track(s) from library"), OnRemoveTracksFromLibrary),
 
                 new ActionEntry ("DeleteTracksFromDriveAction", null,
                     Catalog.GetString ("_Delete From Drive"), null,
@@ -200,7 +200,7 @@
         {
             Source source = ServiceManager.SourceManager.ActiveSource;
             bool in_database = source is DatabaseSource;
-            PrimarySource primary_source = source as PrimarySource ?? source.Parent as PrimarySource;
+            PrimarySource primary_source = (source as PrimarySource) ?? (source.Parent as PrimarySource);
             
             Hyena.Collections.Selection selection = (source is ITrackModelSource) ? (source as ITrackModelSource).TrackModel.Selection : null;
 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs	Wed Jun 18 17:45:35 2008
@@ -85,7 +85,7 @@
             }
             
             Source drop_source = store.GetSource (path);
-            Source parent_source = drop_source as LibrarySource ?? drop_source.Parent as LibrarySource;
+            Source parent_source = (drop_source as LibrarySource) ?? (drop_source.Parent as LibrarySource);
 
             // Scroll if within 20 pixels of the top or bottom
             if (y < 20)

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	Wed Jun 18 17:45:35 2008
@@ -150,7 +150,7 @@
         protected virtual void ShapeSurface (Cairo.Context cr, Cairo.Color color)
         {
             cr.Operator = Cairo.Operator.Source;
-            Cairo.Pattern pattern = new Cairo.SolidPattern (color);
+            Cairo.Pattern pattern = new Cairo.SolidPattern (color, false);
             cr.Source = pattern;
             pattern.Destroy ();
             cr.Paint ();