From 4b2cf29fe1714e2bdef1d75d1b3aefb2f29ab4f6 Mon Sep 17 00:00:00 2001
From: Eric Reed <ebr@mediabrowser3.com>
Date: Tue, 26 Feb 2013 17:19:45 -0500
Subject: Move SecurityManager to BaseKernel/IKernel

---
 MediaBrowser.Controller/Kernel.cs                      | 9 ++-------
 MediaBrowser.Controller/Updates/InstallationManager.cs | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 48dfa5c16..6faa20012 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Common.Security;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
@@ -91,12 +92,6 @@ namespace MediaBrowser.Controller
         /// <value>The user data manager.</value>
         public UserDataManager UserDataManager { get; private set; }
 
-        /// <summary>
-        /// Gets the plug-in security manager.
-        /// </summary>
-        /// <value>The plug-in security manager.</value>
-        public PluginSecurityManager PluginSecurityManager { get; private set; }
-
         /// <summary>
         /// The _users
         /// </summary>
@@ -321,7 +316,7 @@ namespace MediaBrowser.Controller
             ImageManager = (ImageManager)ApplicationHost.CreateInstance(typeof(ImageManager));
             ProviderManager = (ProviderManager)ApplicationHost.CreateInstance(typeof(ProviderManager));
             UserDataManager = (UserDataManager)ApplicationHost.CreateInstance(typeof(UserDataManager));
-            PluginSecurityManager = (PluginSecurityManager)ApplicationHost.CreateInstance(typeof(PluginSecurityManager));
+            SecurityManager = (PluginSecurityManager)ApplicationHost.CreateInstance(typeof(PluginSecurityManager));
             
             base.FindParts();
 
diff --git a/MediaBrowser.Controller/Updates/InstallationManager.cs b/MediaBrowser.Controller/Updates/InstallationManager.cs
index 64b72ae63..633cc6bc3 100644
--- a/MediaBrowser.Controller/Updates/InstallationManager.cs
+++ b/MediaBrowser.Controller/Updates/InstallationManager.cs
@@ -183,7 +183,7 @@ namespace MediaBrowser.Controller.Updates
             PackageType? packageType = null,
             Version applicationVersion = null)
         {
-            var data = new Dictionary<string, string> { { "key", Kernel.PluginSecurityManager.SupporterKey }, { "mac", _networkManager.GetMacAddress() } };
+            var data = new Dictionary<string, string> { { "key", Kernel.SecurityManager.SupporterKey }, { "mac", _networkManager.GetMacAddress() } };
 
             using (var json = await HttpClient.Post(Controller.Kernel.MBAdminUrl + "service/package/retrieveall", data, Kernel.ResourcePools.Mb, cancellationToken).ConfigureAwait(false))
             {
-- 
cgit v1.2.3