From dddcfa6dbbca04ed69597ec335007612e2e2b8e8 Mon Sep 17 00:00:00 2001
From: Greenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 15 Dec 2020 09:29:51 +0000
Subject: Suggested changes.

---
 Emby.Server.Implementations/ApplicationHost.cs           |   3 +--
 .../Emby.Server.Implementations.csproj                   |   7 -------
 Emby.Server.Implementations/Plugins/Active.png           | Bin 1422 -> 0 bytes
 Emby.Server.Implementations/Plugins/Disabled.png         | Bin 1790 -> 0 bytes
 Emby.Server.Implementations/Plugins/Malfunction.png      | Bin 2091 -> 0 bytes
 Emby.Server.Implementations/Plugins/NotSupported.png     | Bin 2046 -> 0 bytes
 Emby.Server.Implementations/Plugins/PluginManager.cs     |   3 ---
 Emby.Server.Implementations/Plugins/RestartRequired.png  | Bin 1996 -> 0 bytes
 Emby.Server.Implementations/Plugins/Superceded.png       | Bin 2136 -> 0 bytes
 Emby.Server.Implementations/Plugins/blank.png            | Bin 120 -> 0 bytes
 10 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 Emby.Server.Implementations/Plugins/Active.png
 delete mode 100644 Emby.Server.Implementations/Plugins/Disabled.png
 delete mode 100644 Emby.Server.Implementations/Plugins/Malfunction.png
 delete mode 100644 Emby.Server.Implementations/Plugins/NotSupported.png
 delete mode 100644 Emby.Server.Implementations/Plugins/RestartRequired.png
 delete mode 100644 Emby.Server.Implementations/Plugins/Superceded.png
 delete mode 100644 Emby.Server.Implementations/Plugins/blank.png

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 404e28bdc..17cccdaf9 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -393,8 +393,7 @@ namespace Emby.Server.Implementations
 
             if (_creatingInstances.IndexOf(type) != -1)
             {
-                Logger.LogError("DI Loop detected.");
-                Logger.LogError("Attempted creation of {Type}", type.FullName);
+                Logger.LogError("DI Loop detected in the attempted creation of {Type}", type.FullName);
                 foreach (var entry in _creatingInstances)
                 {
                     Logger.LogError("Called from: {stack}", entry.FullName);
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 7e0be7899..0c94f937c 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -73,12 +73,5 @@
     <EmbeddedResource Include="Localization\countries.json" />
     <EmbeddedResource Include="Localization\Core\*.json" />
     <EmbeddedResource Include="Localization\Ratings\*.csv" />
-    <EmbeddedResource Include="Plugins\blank.png" />
-    <EmbeddedResource Include="Plugins\Superceded.png" />
-    <EmbeddedResource Include="Plugins\Disabled.png" />
-    <EmbeddedResource Include="Plugins\NotSupported.png" />
-    <EmbeddedResource Include="Plugins\Malfunction.png" />
-    <EmbeddedResource Include="Plugins\RestartRequired.png" />
-    <EmbeddedResource Include="Plugins\Active.png" />
   </ItemGroup>
 </Project>
diff --git a/Emby.Server.Implementations/Plugins/Active.png b/Emby.Server.Implementations/Plugins/Active.png
deleted file mode 100644
index 3722ee520..000000000
Binary files a/Emby.Server.Implementations/Plugins/Active.png and /dev/null differ
diff --git a/Emby.Server.Implementations/Plugins/Disabled.png b/Emby.Server.Implementations/Plugins/Disabled.png
deleted file mode 100644
index eeb8ffefc..000000000
Binary files a/Emby.Server.Implementations/Plugins/Disabled.png and /dev/null differ
diff --git a/Emby.Server.Implementations/Plugins/Malfunction.png b/Emby.Server.Implementations/Plugins/Malfunction.png
deleted file mode 100644
index d4726150e..000000000
Binary files a/Emby.Server.Implementations/Plugins/Malfunction.png and /dev/null differ
diff --git a/Emby.Server.Implementations/Plugins/NotSupported.png b/Emby.Server.Implementations/Plugins/NotSupported.png
deleted file mode 100644
index a13c1f7c1..000000000
Binary files a/Emby.Server.Implementations/Plugins/NotSupported.png and /dev/null differ
diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 07b729748..cf25ccf48 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -1,7 +1,6 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -23,8 +22,6 @@ namespace Emby.Server.Implementations
     /// </summary>
     public class PluginManager : IPluginManager
     {
-        private const int OffsetFromTopRightCorner = 38;
-
         private readonly string _pluginsPath;
         private readonly Version _appVersion;
         private readonly JsonSerializerOptions _jsonOptions;
diff --git a/Emby.Server.Implementations/Plugins/RestartRequired.png b/Emby.Server.Implementations/Plugins/RestartRequired.png
deleted file mode 100644
index 65fd102a2..000000000
Binary files a/Emby.Server.Implementations/Plugins/RestartRequired.png and /dev/null differ
diff --git a/Emby.Server.Implementations/Plugins/Superceded.png b/Emby.Server.Implementations/Plugins/Superceded.png
deleted file mode 100644
index 251e70535..000000000
Binary files a/Emby.Server.Implementations/Plugins/Superceded.png and /dev/null differ
diff --git a/Emby.Server.Implementations/Plugins/blank.png b/Emby.Server.Implementations/Plugins/blank.png
deleted file mode 100644
index f81ae3243..000000000
Binary files a/Emby.Server.Implementations/Plugins/blank.png and /dev/null differ
-- 
cgit v1.2.3