banshee r4817 - in trunk/banshee: . src/Backends/Banshee.Hal/Banshee.HalBackend src/Clients/Booter/Booter src/Core/Banshee.Services/Banshee.Collection src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.Library src/Core/Banshee.Services/Banshee.Playlist src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Core/Banshee.ThickClient/Banshee.Sources.Gui src/Libraries/Migo/Migo.Syndication src/Libraries/MusicBrainz/MusicBrainz

[blorentz svn gnome org]

Author: blorentz
Date: Sun Nov  9 23:25:10 2008
New Revision: 4817
URL: http://svn.gnome.org/viewvc/banshee?rev=4817&view=rev

Log:
2008-11-10  Ivan N. Zlatev  <contact i-nz net>

	* src/Clients/Booter/Booter/Entry.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:
	* src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:
	* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs:
	* src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs:
	* src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:
	* src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:
	* src/Core/Banshee.Services/Banshee.Sources/Source.cs:
	* src/Core/Banshee.Services/Banshee.Collection/BansheeListModel.cs:
	* src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:
	* src/Backends/Banshee.Hal/Banshee.HalBackend/Device.cs:
	* src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs:
	* src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs:  Fix missing () 
	in ?? operator usage. Fixes compilation with gmcs HEAD (BGO #559616).



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/Device.cs
   trunk/banshee/src/Clients/Booter/Booter/Entry.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/BansheeListModel.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
   trunk/banshee/src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs
   trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs

Modified: trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/Device.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/Device.cs	(original)
+++ trunk/banshee/src/Backends/Banshee.Hal/Banshee.HalBackend/Device.cs	Sun Nov  9 23:25:10 2008
@@ -53,12 +53,12 @@
         
         private string uuid;
         public string Uuid {
-            get { return uuid ?? uuid = device.Udi; /*String.IsNullOrEmpty (HalDevice["usb.serial"]) ? device.Udi : HalDevice["usb.serial"];*/ }
+            get { return uuid ?? (uuid = device.Udi); /*String.IsNullOrEmpty (HalDevice["usb.serial"]) ? device.Udi : HalDevice["usb.serial"];*/ }
         }
 
         private string serial;
         public virtual string Serial {
-            get { return serial ?? serial = HalDevice["usb.serial"]; }
+            get { return serial ?? (serial = HalDevice["usb.serial"]); }
         }
 
         private string name;

Modified: trunk/banshee/src/Clients/Booter/Booter/Entry.cs
==============================================================================
--- trunk/banshee/src/Clients/Booter/Booter/Entry.cs	(original)
+++ trunk/banshee/src/Clients/Booter/Booter/Entry.cs	Sun Nov  9 23:25:10 2008
@@ -227,7 +227,7 @@
                     case "help-playback": Console.WriteLine (commands.ToString ("playback")); break;
                     default:
                         if (argument.Key.StartsWith ("help")) {
-                            (errors ?? errors = new List<string> ()).Add (argument.Key);
+                            (errors ?? (errors = new List<string> ())).Add (argument.Key);
                         }
                         break;
                 }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs	Sun Nov  9 23:25:10 2008
@@ -63,7 +63,7 @@
         private static DatabaseTrackModelProvider<DatabaseTrackInfo> provider;
 
         public static DatabaseTrackModelProvider<DatabaseTrackInfo> Provider {
-            get { return provider ?? provider = new DatabaseTrackModelProvider<DatabaseTrackInfo> (ServiceManager.DbConnection); }
+            get { return provider ?? (provider = new DatabaseTrackModelProvider<DatabaseTrackInfo> (ServiceManager.DbConnection)); }
         }
 
         private bool artist_changed = false, album_changed = false;

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs	Sun Nov  9 23:25:10 2008
@@ -187,12 +187,12 @@
         private string unfiltered_query;
         public string UnfilteredQuery {
             get {
-                return unfiltered_query ?? unfiltered_query = String.Format (
+                return unfiltered_query ?? (unfiltered_query = String.Format (
                     "FROM {0}{1} WHERE {2} {3}",
                     From, JoinFragment,
                     String.IsNullOrEmpty (provider.Where) ? "1=1" : provider.Where,
                     ConditionFragment
-                );
+                ));
             }
         }
 

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/BansheeListModel.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/BansheeListModel.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/BansheeListModel.cs	Sun Nov  9 23:25:10 2008
@@ -90,7 +90,7 @@
         protected ModelSelection<T> model_selection;
         public virtual ModelSelection<T> SelectedItems {
             get {
-                return model_selection ?? model_selection = new ModelSelection<T> (this, Selection);
+                return model_selection ?? (model_selection = new ModelSelection<T> (this, Selection));
             }
         }
         

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs	Sun Nov  9 23:25:10 2008
@@ -147,7 +147,7 @@
         private static int [] library_ids;
         private static int [] LibraryIds {
             get {
-                return library_ids ?? library_ids = new int [] {ServiceManager.SourceManager.MusicLibrary.DbId, ServiceManager.SourceManager.VideoLibrary.DbId};
+                return library_ids ?? (library_ids = new int [] {ServiceManager.SourceManager.MusicLibrary.DbId, ServiceManager.SourceManager.VideoLibrary.DbId});
             }
         }
     }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs	Sun Nov  9 23:25:10 2008
@@ -107,11 +107,11 @@
         protected HyenaSqliteCommand CountUpdatedCommand {
             get {
                 return count_updated_command ??
-                    count_updated_command = new HyenaSqliteCommand (String.Format (
+                    (count_updated_command = new HyenaSqliteCommand (String.Format (
                         @"SELECT COUNT(*) FROM {0} WHERE {1} = {2} AND TrackID IN (
                             SELECT TrackID FROM CoreTracks WHERE DateUpdatedStamp > ?)",
                         TrackJoinTable, SourcePrimaryKey, dbid
-                    ));
+                    )));
             }
         }
 
@@ -119,11 +119,11 @@
         protected HyenaSqliteCommand CountRemovedCommand {
             get {
                 return count_removed_command ??
-                    count_removed_command = new HyenaSqliteCommand (String.Format (
+                    (count_removed_command = new HyenaSqliteCommand (String.Format (
                         @"SELECT COUNT(*) FROM {0} WHERE {1} = {2} AND TrackID IN (
                             SELECT TrackID FROM CoreRemovedTracks WHERE DateRemovedStamp > ?)",
                         TrackJoinTable, SourcePrimaryKey, dbid
-                    ));
+                    )));
             }
         }
 

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs	Sun Nov  9 23:25:10 2008
@@ -98,15 +98,15 @@
         }
 
         public DatabaseTrackListModel DatabaseTrackModel {
-            get { return track_model ?? track_model = (Parent as DatabaseSource ?? this).CreateTrackModelFor (this); }
+            get { return track_model ?? (track_model = (Parent as DatabaseSource ?? this).CreateTrackModelFor (this)); }
             protected set { track_model = value; }
         }
 
         private IDatabaseTrackModelCache track_cache;
         protected IDatabaseTrackModelCache TrackCache {
             get {
-                return track_cache ?? track_cache = new DatabaseTrackModelCache<DatabaseTrackInfo> (
-                    ServiceManager.DbConnection, UniqueId, DatabaseTrackModel, TrackProvider);
+                return track_cache ?? (track_cache = new DatabaseTrackModelCache<DatabaseTrackInfo> (
+                    ServiceManager.DbConnection, UniqueId, DatabaseTrackModel, TrackProvider));
             }
             set { track_cache = value; }
         }
@@ -306,13 +306,13 @@
         
         private IList<IFilterListModel> available_filters;
         public IList<IFilterListModel> AvailableFilters {
-            get { return available_filters ?? available_filters = new List<IFilterListModel> (); }
+            get { return available_filters ?? (available_filters = new List<IFilterListModel> ()); }
             protected set { available_filters = value; }
         }
         
         private IList<IFilterListModel> default_filters;
         public IList<IFilterListModel> DefaultFilters {
-            get { return default_filters ?? default_filters = new List<IFilterListModel> (); }
+            get { return default_filters ?? (default_filters = new List<IFilterListModel> ()); }
             protected set { default_filters = value; }
         }
         
@@ -655,14 +655,14 @@
         protected HyenaSqliteCommand prune_command;
         protected HyenaSqliteCommand PruneCommand {
             get {
-                return prune_command ?? prune_command = new HyenaSqliteCommand (String.Format (
+                return prune_command ?? (prune_command = new HyenaSqliteCommand (String.Format (
                         @"DELETE FROM CoreCache WHERE ModelID = ? AND ItemID NOT IN (SELECT ArtistID FROM CoreTracks WHERE TrackID IN (SELECT {0}));
                           DELETE FROM CoreCache WHERE ModelID = ? AND ItemID NOT IN (SELECT AlbumID FROM CoreTracks WHERE TrackID IN (SELECT {0}));",
                         track_model.TrackIdsSql
                     ),
                     artist_model.CacheId, artist_model.CacheId, 0, artist_model.Count,
                     album_model.CacheId, album_model.CacheId, 0, album_model.Count
-                );
+                ));
             }
         }
 

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs	Sun Nov  9 23:25:10 2008
@@ -485,7 +485,7 @@
                 if (unique_id == null && type_unique_id == null) {
                     Log.ErrorFormat ("Creating Source.UniqueId for {0}, but TypeUniqueId is null; trace is {1}", this.Name, System.Environment.StackTrace);
                 }
-                return unique_id ?? unique_id = String.Format ("{0}-{1}", this.GetType ().Name, TypeUniqueId);
+                return unique_id ?? (unique_id = String.Format ("{0}-{1}", this.GetType ().Name, TypeUniqueId));
             }
         }
         
@@ -581,7 +581,7 @@
 
         private string conf_id;
         public string ConfigurationId {
-            get { return conf_id ?? conf_id = UniqueId.Replace ('.', '_'); }
+            get { return conf_id ?? (conf_id = UniqueId.Replace ('.', '_')); }
         }
 
         public virtual int FilteredCount { get { return Count; } }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs	Sun Nov  9 23:25:10 2008
@@ -65,14 +65,14 @@
         
         private ImageSurface missing_audio_image;
         protected ImageSurface MissingAudioImage {
-            get { return missing_audio_image ?? missing_audio_image 
-                = new PixbufImageSurface (IconThemeUtils.LoadIcon (MissingIconSizeRequest, "audio-x-generic"), true); }
+            get { return missing_audio_image ?? (missing_audio_image 
+                = new PixbufImageSurface (IconThemeUtils.LoadIcon (MissingIconSizeRequest, "audio-x-generic"), true)); }
         }
         
         private ImageSurface missing_video_image;
         protected ImageSurface MissingVideoImage {
-            get { return missing_video_image ?? missing_video_image 
-                = new PixbufImageSurface (IconThemeUtils.LoadIcon (MissingIconSizeRequest, "video-x-generic"), true); }
+            get { return missing_video_image ?? (missing_video_image 
+                = new PixbufImageSurface (IconThemeUtils.LoadIcon (MissingIconSizeRequest, "video-x-generic"), true)); }
         }
         
         private Cairo.Color background_color;

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	Sun Nov  9 23:25:10 2008
@@ -445,8 +445,8 @@
         internal Source NewPlaylistSource {
             get {
                 return new_playlist_source ??
-                    new_playlist_source = new PlaylistSource (Catalog.GetString ("New Playlist"), 
-                        ServiceManager.SourceManager.MusicLibrary);
+                    (new_playlist_source = new PlaylistSource (Catalog.GetString ("New Playlist"), 
+                        ServiceManager.SourceManager.MusicLibrary));
             }
         }
 

Modified: trunk/banshee/src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs	(original)
+++ trunk/banshee/src/Libraries/Migo/Migo.Syndication/FeedEnclosure.cs	Sun Nov  9 23:25:10 2008
@@ -71,7 +71,7 @@
 #region Public Properties
 
         public FeedItem Item { 
-            get { return item ?? item = FeedItem.Provider.FetchSingle (item_id); } 
+            get { return item ?? (item = FeedItem.Provider.FetchSingle (item_id)); } 
             internal set {
                 item = value;
                 if (item != null && item.DbId > 0) {

Modified: trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs
==============================================================================
--- trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs	(original)
+++ trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs	Sun Nov  9 23:25:10 2008
@@ -99,7 +99,7 @@
         
         string submission_url;
         public string SubmissionUrl {
-            get { return submission_url ?? submission_url = BuildSubmissionUrl (); }
+            get { return submission_url ?? (submission_url = BuildSubmissionUrl ()); }
         }
         
         string BuildSubmissionUrl ()