diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-26 16:54:13 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-26 16:54:13 -0500 |
| commit | ecb89c3d1d389dcd343158d9853445e44fce8d40 (patch) | |
| tree | fb40d1658c47ce6355b303e968ef5f1e47225038 | |
| parent | 939a3aab4526ff072a2caeb140fe014333b234c5 (diff) | |
| parent | c555920fe79bdc350eb3b246dc0b7d6b73318726 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Common/Kernel/BaseKernel.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Common/Kernel/IKernel.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Kernel.cs | 11 |
3 files changed, 18 insertions, 11 deletions
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 962c740c3..9e8edce23 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -462,5 +462,16 @@ namespace MediaBrowser.Common.Kernel /// <value>The resource pools.</value> public ResourcePool ResourcePools { get; set; } + /// <summary> + /// Removes the plugin. + /// </summary> + /// <param name="plugin">The plugin.</param> + public void RemovePlugin(IPlugin plugin) + { + var list = Plugins.ToList(); + list.Remove(plugin); + Plugins = list; + } + } } diff --git a/MediaBrowser.Common/Kernel/IKernel.cs b/MediaBrowser.Common/Kernel/IKernel.cs index dce744c0a..715dc9a27 100644 --- a/MediaBrowser.Common/Kernel/IKernel.cs +++ b/MediaBrowser.Common/Kernel/IKernel.cs @@ -123,5 +123,12 @@ namespace MediaBrowser.Common.Kernel /// </summary> /// <value>The resource pools.</value> ResourcePool ResourcePools { get; set; } + + /// <summary> + /// Removes the plugin. + /// </summary> + /// <param name="plugin">The plugin.</param> + void RemovePlugin(IPlugin plugin); + } } diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 521bf92c6..48dfa5c16 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -537,17 +537,6 @@ namespace MediaBrowser.Controller } /// <summary> - /// Removes the plugin. - /// </summary> - /// <param name="plugin">The plugin.</param> - internal void RemovePlugin(IPlugin plugin) - { - var list = Plugins.ToList(); - list.Remove(plugin); - Plugins = list; - } - - /// <summary> /// Gets the system info. /// </summary> /// <returns>SystemInfo.</returns> |