From 3f7b6c0e8562a9600e9e33edf80af11205054292 Mon Sep 17 00:00:00 2001
From: Chase Geigle <geigle1@illinois.edu>
Date: Thu, 20 Sep 2018 15:57:35 -0500
Subject: [PATCH] fix(plugin): Warn only for built plugins on a failed load.

---
 src/components/controller.cpp | 10 ++++++----
 src/utils/plugin.cpp          | 20 +++++++++++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index 39ca86d7..a1258f7f 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -79,10 +79,12 @@ controller::controller(connection& conn, signal_emitter& emitter, const logger&
 
   m_log.trace("controller: Load plugins");
   for (const auto name : plugin_names) {
-    try {
-      m_plugins.emplace_back(name);
-    } catch (const application_error& err) {
-      m_log.warn("Failed to load plugin '%s': %s", name, err.what());
+    if (name) {
+      try {
+        m_plugins.emplace_back(name);
+      } catch (const application_error& err) {
+        m_log.warn("Failed to load plugin '%s': %s", name, err.what());
+      }
     }
   }
 
diff --git a/src/utils/plugin.cpp b/src/utils/plugin.cpp
index d3b8de84..50b65df7 100644
--- a/src/utils/plugin.cpp
+++ b/src/utils/plugin.cpp
@@ -2,20 +2,38 @@
 
 #include "components/logger.hpp"
 #include "errors.hpp"
+#include "settings.hpp"
 #include "utils/plugin.hpp"
 
 POLYBAR_NS
 
 // clang-format off
 std::vector<const char*> plugin_names = {
+#if ENABLE_I3
   "libpolybar-utils-i3.so",
+#endif
+#if ENABLE_ALSA
   "libpolybar-modules-alsa.so",
+#endif
+#if ENABLE_CURL
   "libpolybar-modules-github.so",
+#endif
+#if ENABLE_I3
   "libpolybar-modules-i3.so",
+#endif
+#if ENABLE_MPD
   "libpolybar-modules-mpd.so",
+#endif
+#if ENABLE_NETWORK
   "libpolybar-modules-network.so",
+#endif
+#if ENABLE_PLUSEAUDIO
   "libpolybar-modules-pulseaudio.so",
-  "libpolybar-modules-xkeyboard.so"
+#endif
+#if WITH_XKB
+  "libpolybar-modules-xkeyboard.so",
+#endif
+  nullptr
 };
 // clang-format on