banshee r5103 - in branches/banshee/stable: . build/m4/shamrock data/desktop-files po src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper src/Core/Banshee.CollectionIndexer/Demo src/Core/Banshee.Services/Banshee.Collection src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.Collection.Indexer src/Core/Banshee.Services/Banshee.MediaEngine src/Core/Banshee.Services/Banshee.PlaybackController src/Core/Banshee.ThickClient/Banshee.Addins.Gui src/Core/Banshee.ThickClient/Banshee.Collection.Gui src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor src/Core/Banshee.ThickClient/Banshee.Sources.Gui src/Core/Banshee.ThickClient/ThemeIcons/22x22/actions src/Dap/Banshee.Dap.MassStorage src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp src/Dap/Banshee.Dap/Banshee.Dap src/Dap/Banshee.Dap/Banshee.Dap.Gui src/Extensions/Banshee.Daap src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio src/Extensions/Banshee.Lastfm src/Extensions/B anshee.PlayQueue src/Extensions/Banshee.Podcasting/Banshee.Podcasting src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui src/Extensions/Banshee.Podcasting/ThemeIcons/16x16/categories src/Extensions/Banshee.Podcasting/ThemeIcons/16x16/status src/Extensions/Banshee.Podcasting/ThemeIcons/22x22/categories src/Extensions/Banshee.Podcasting/ThemeIcons/48x48/categories src/Libraries/Hyena src/Libraries/Hyena.Gui src/Libraries/Lastfm src/Libraries/Lastfm.Gui src/Libraries/Lastfm.Gui/Lastfm.Gui src/Libraries/Lastfm.Gui/Resources src/Libraries/Migo/Migo.DownloadCore src/Libraries/Migo/Migo.Net src/Libraries/Migo/Migo.Syndication src/Libraries/Migo/Migo.TaskCore src/Libraries/Mono.Media/Media.Playlists.Xspf src/Libraries/Mtp tests/Mono.Media/xspf tests/old

[gburt svn gnome org]

Author: gburt
Date: Wed Mar  4 22:23:48 2009
New Revision: 5103
URL: http://svn.gnome.org/viewvc/banshee?rev=5103&view=rev

Log:
2009-01-26  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs:
	Fix bug with getting into a loop, constantly trying to reconnect to an
	indexer while in the middle of connecting to it.


Modified:
   branches/banshee/stable/   (props changed)
   branches/banshee/stable/ChangeLog
   branches/banshee/stable/build/m4/shamrock/nunit.m4   (props changed)
   branches/banshee/stable/data/desktop-files/banshee-1.desktop.mime   (props changed)
   branches/banshee/stable/po/sr latin po   (props changed)
   branches/banshee/stable/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/   (props changed)
   branches/banshee/stable/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs
   branches/banshee/stable/src/Core/Banshee.CollectionIndexer/Demo/   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistInfo.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackInfo.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseTrackListModel.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.Collection/FilterListModel.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEvent.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.Services/Banshee.PlaybackController/IPlaybackControllerService.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinDetailsDialog.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinTile.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorEditableUndoAdapter.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/PageNavigationEntry.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs   (props changed)
   branches/banshee/stable/src/Core/Banshee.ThickClient/ThemeIcons/22x22/actions/encode.png   (props changed)
   branches/banshee/stable/src/Dap/Banshee.Dap.MassStorage/   (props changed)
   branches/banshee/stable/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpTrackInfo.cs   (props changed)
   branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs   (props changed)
   branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs   (props changed)
   branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs   (props changed)
   branches/banshee/stable/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Lastfm/   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackInfo.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastFeedView.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastItemView.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService_Interface.cs   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/ThemeIcons/16x16/categories/podcast.png   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/ThemeIcons/16x16/status/podcast-new.png   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/ThemeIcons/22x22/categories/podcast.png   (props changed)
   branches/banshee/stable/src/Extensions/Banshee.Podcasting/ThemeIcons/48x48/categories/podcast.png   (props changed)
   branches/banshee/stable/src/Libraries/Hyena/   (props changed)
   branches/banshee/stable/src/Libraries/Hyena.Gui/   (props changed)
   branches/banshee/stable/src/Libraries/Lastfm/   (props changed)
   branches/banshee/stable/src/Libraries/Lastfm.Gui/Lastfm.Gui/   (props changed)
   branches/banshee/stable/src/Libraries/Lastfm.Gui/Resources/badge-hover.png   (props changed)
   branches/banshee/stable/src/Libraries/Lastfm.Gui/Resources/badge.png   (props changed)
   branches/banshee/stable/src/Libraries/Lastfm.Gui/Test.cs   (props changed)
   branches/banshee/stable/src/Libraries/Migo/Migo.DownloadCore/   (props changed)
   branches/banshee/stable/src/Libraries/Migo/Migo.Net/   (props changed)
   branches/banshee/stable/src/Libraries/Migo/Migo.Syndication/   (props changed)
   branches/banshee/stable/src/Libraries/Migo/Migo.TaskCore/   (props changed)
   branches/banshee/stable/src/Libraries/Mono.Media/Media.Playlists.Xspf/   (props changed)
   branches/banshee/stable/src/Libraries/Mtp/   (props changed)
   branches/banshee/stable/tests/Mono.Media/xspf/   (props changed)
   branches/banshee/stable/tests/old/BansheeTests.cs   (props changed)
   branches/banshee/stable/tests/old/GuiTests.cs   (props changed)

Modified: branches/banshee/stable/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs
==============================================================================
--- branches/banshee/stable/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs	(original)
+++ branches/banshee/stable/src/Core/Banshee.CollectionIndexer/Banshee.Collection.Indexer.RemoteHelper/IndexerClient.cs	Wed Mar  4 22:23:48 2009
@@ -54,6 +54,7 @@
         
         public void Start ()
         {
+            ShowDebugMessages = true;
             Debug ("Acquiring org.freedesktop.DBus session instance");
             session_bus = Bus.Session.GetObject<IBus> ("org.freedesktop.DBus", new ObjectPath ("/org/freedesktop/DBus"));
             session_bus.NameOwnerChanged += OnBusNameOwnerChanged;
@@ -71,10 +72,7 @@
         {
             if (name == indexer_bus_name) {
                 Debug ("NameOwnerChanged: {0}, '{1}' => '{2}'", name, oldOwner, newOwner);
-                if (String.IsNullOrEmpty (newOwner)) {
-                    // Do not disconnect since we're already disconnected
-                    ResetInternalState ();
-                } else {
+                if (service == null && !String.IsNullOrEmpty (newOwner)) {
                     ConnectToIndexerService ();
                 }
             }
@@ -147,6 +145,11 @@
             
             try {
                 service.CleanupAndShutdown -= OnCleanupAndShutdown;
+            } catch (Exception e) {
+                Debug (e.ToString ());
+            }
+
+            try {
                 service.Shutdown ();
             } catch (Exception e) {
                 Debug (e.ToString ());
@@ -157,6 +160,10 @@
         
         private void ResetInternalState ()
         {
+            if (service == null) {
+                return;
+            }
+
             Debug ("Resetting internal state - service is no longer available or not needed");
             service = null;
             listening = false;