Decouple settings handling from old-style plugins

The breakage was discovered when i removed Logger class.
it turned out the fix is somewhat involved.
This change implements it as discussed with the rest of the team.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/daemon/CommLayerServerDBus.cpp b/src/daemon/CommLayerServerDBus.cpp
index 5ce8e474..3e98ab80 100644
--- a/src/daemon/CommLayerServerDBus.cpp
+++ b/src/daemon/CommLayerServerDBus.cpp
@@ -337,7 +337,10 @@ static int handle_GetPluginsInfo(DBusMessage* call, DBusMessage* reply)
 {
     DBusMessageIter out_iter;
     dbus_message_iter_init_append(reply, &out_iter);
-    store_val(&out_iter, g_pPluginManager->GetPluginsInfo());
+
+    map_map_string_t map_of_plugin_info;
+    GetPluginsInfo(map_of_plugin_info);
+    store_val(&out_iter, map_of_plugin_info);
 
     send_flush_and_unref(reply);
     return 0;
@@ -358,7 +361,8 @@ static int handle_GetPluginSettings(DBusMessage* call, DBusMessage* reply)
 
     //long unix_uid = get_remote_uid(call);
     //VERB1 log("got %s('%s') call from uid %ld", "GetPluginSettings", PluginName, unix_uid);
-    map_plugin_settings_t plugin_settings = g_pPluginManager->GetPluginSettings(PluginName); //, to_string(unix_uid).c_str());
+    map_plugin_settings_t plugin_settings;
+    GetPluginSettings(PluginName, plugin_settings);
 
     DBusMessageIter out_iter;
     dbus_message_iter_init_append(reply, &out_iter);