[banshee/podcast-ng: 1000/1000] [podcast-ng] Code dust-off

[Michael C. Urbanski <murbanski src gnome org>]

commit ccb4f1553e7e4ebe024366ba00589544b96e64a9
Author: Mike Urbanski <michael c urbanski gmail com>
Date:   Mon Nov 29 19:10:11 2010 -0600

    [podcast-ng] Code dust-off

 src/Clients/Nereid/Nereid/ViewContainer.cs         |   29 +-------------------
 .../SyndicationClient/SyndicationClient.cs         |    1 +
 .../Banshee.Paas.Data/CacheModelProvider.cs        |    2 +-
 .../Banshee.Paas/Banshee.Paas.Data/PaasItem.cs     |    1 -
 .../Banshee.Paas.Data/PaasTrackInfo.cs             |    3 +-
 .../Banshee.Paas/Banshee.Paas.Gui/PaasActions.cs   |    6 ++--
 .../Banshee.Paas/Banshee.Paas.Gui/PaasItemView.cs  |    3 +-
 .../Banshee.Paas/Banshee.Paas/PaasSource.cs        |    2 +-
 8 files changed, 11 insertions(+), 36 deletions(-)
---
diff --git a/src/Clients/Nereid/Nereid/ViewContainer.cs b/src/Clients/Nereid/Nereid/ViewContainer.cs
index 48500d0..29df9bf 100644
--- a/src/Clients/Nereid/Nereid/ViewContainer.cs
+++ b/src/Clients/Nereid/Nereid/ViewContainer.cs
@@ -155,7 +155,6 @@ namespace Nereid
             search_entry.FilterChanged += OnSearchEntryFilterChanged;
             search_entry.ActivateFilter ((int)TrackFilterType.None);
 
-            RestoreDefaultSearchEntry ();
             OnSearchEntryFilterChanged (search_entry, EventArgs.Empty);
         }
 
@@ -176,31 +175,6 @@ namespace Nereid
             }
         }
 
-        private void ClearSearchEntryBox ()
-        {
-            if (search_entry_box.Child != null) {
-                search_entry_box.Remove (search_entry_box.Child);
-            }
-        }
-
-        public void RestoreDefaultSearchEntry ()
-        {
-            SetSearchEntry (DefaultSearchEntry);
-        }
-
-        public void SetSearchEntry (SearchEntry searchEntry)
-        {
-            if (searchEntry != null && current_search_entry != searchEntry) {
-                ClearSearchEntryBox ();
-
-                current_search_entry = searchEntry;
-                search_entry_box.Add (current_search_entry);
-
-                current_search_entry.Show ();
-                search_entry_box.Show ();
-            }
-        }
-
         public void SetHeaderWidget (Widget widget)
         {
             if (widget != null) {
@@ -239,8 +213,7 @@ namespace Nereid
             get { return source_actions_align; }
         }
 
-        public SearchEntry DefaultSearchEntry
-        {
+        public SearchEntry SearchEntry {
             get { return search_entry; }
         }
 
diff --git a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Aether/SyndicationClient/SyndicationClient.cs b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Aether/SyndicationClient/SyndicationClient.cs
index 8fa5326..67cb24d 100644
--- a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Aether/SyndicationClient/SyndicationClient.cs
+++ b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Aether/SyndicationClient/SyndicationClient.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 
 using Migo2.Async;
 
+using Hyena;
 using Banshee.Base;
 using Banshee.ServiceStack;
 
diff --git a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/CacheModelProvider.cs b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/CacheModelProvider.cs
index 802a4ff..d9a4ec0 100644
--- a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/CacheModelProvider.cs
+++ b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/CacheModelProvider.cs
@@ -68,7 +68,7 @@ namespace Banshee.Paas.Data
             }
         }
 
-        public override T Load (System.Data.IDataReader reader)
+        public override T Load (IDataReader reader)
         {
             return GetCached (PrimaryKeyFor (reader)) ?? CacheResult (base.Load (reader));
         }
diff --git a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/PaasItem.cs b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/PaasItem.cs
index e25a03f..404860d 100644
--- a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/PaasItem.cs
+++ b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/PaasItem.cs
@@ -25,7 +25,6 @@
 // THE SOFTWARE.
 
 using System;
-using System.Data;
 using System.Collections.Generic;
 
 using Hyena;
diff --git a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/PaasTrackInfo.cs b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/PaasTrackInfo.cs
index b5f7757..9241db1 100644
--- a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/PaasTrackInfo.cs
+++ b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Data/PaasTrackInfo.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Collections.Generic;
 
+using Hyena;
 using Banshee.Collection;
 using Banshee.Collection.Database;
 
@@ -174,7 +175,7 @@ namespace Banshee.Paas.Data
             track.FileSize = item.Size;
             track.LicenseUri = item.Channel.License;
 
-            track.Uri = new Banshee.Base.SafeUri (item.LocalPath ?? item.Url);
+            track.Uri = new SafeUri (item.LocalPath ?? item.Url);
 
             if (!String.IsNullOrEmpty (item.LocalPath)) {
                 try {
diff --git a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Gui/PaasActions.cs b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Gui/PaasActions.cs
index 92eb3e4..8f2ee86 100644
--- a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Gui/PaasActions.cs
+++ b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Gui/PaasActions.cs
@@ -451,7 +451,7 @@ namespace Banshee.Paas.Gui
 
             if (selCount > 0) {
                 md = new HigMessageDialog (
-                    ServiceManager.Get<GtkElementsService> ("GtkElementsService").PrimaryWindow,
+                    ServiceManager.Get<GtkElementsService> ().PrimaryWindow,
                     DialogFlags.DestroyWithParent,
                     MessageType.Question,
                     ButtonsType.None, header,
@@ -466,7 +466,7 @@ namespace Banshee.Paas.Gui
                 md.AddButton (Stock.Delete, ResponseType.Yes, false);
             } else {
                 md = new HigMessageDialog (
-                    ServiceManager.Get<GtkElementsService> ("GtkElementsService").PrimaryWindow,
+                    ServiceManager.Get<GtkElementsService> ().PrimaryWindow,
                     DialogFlags.DestroyWithParent,
                     MessageType.Question,
                     ButtonsType.None, header,
@@ -499,7 +499,7 @@ namespace Banshee.Paas.Gui
             ResponseType response;
 
             HigMessageDialog md = new HigMessageDialog (
-                ServiceManager.Get<GtkElementsService> ("GtkElementsService").PrimaryWindow,
+                ServiceManager.Get<GtkElementsService> ().PrimaryWindow,
                 DialogFlags.DestroyWithParent,
                 MessageType.Question,
                 ButtonsType.None,
diff --git a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Gui/PaasItemView.cs b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Gui/PaasItemView.cs
index 3dbe809..e97e799 100644
--- a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Gui/PaasItemView.cs
+++ b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas.Gui/PaasItemView.cs
@@ -81,12 +81,13 @@ namespace Banshee.Paas.Gui
                 if (pti == null) {
                     return;
                 }
-
+/*
                 if (track.IsPlaying || pti.IsDownloaded) {
                     text_cell.Sensitive = true;
                 } else {
                     text_cell.Sensitive = false;
                 }
+*/                
             }
         }
     }
diff --git a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas/PaasSource.cs b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas/PaasSource.cs
index f17970b..f677019 100644
--- a/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas/PaasSource.cs
+++ b/src/Extensions/Banshee.Paas/Banshee.Paas/Banshee.Paas/PaasSource.cs
@@ -107,7 +107,7 @@ namespace Banshee.Paas
         }
 
 #region Constructors
-        public PaasSource (PaasService service) : base (Catalog.GetString ("Podcasts"), "PaasLibrary", 200)
+        public PaasSource (PaasService service) : base (Catalog.GetString ("Podcasts"), "PaasLibrary", 51)
         {
             actions = new PaasActions (service);