# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1465301967 -7200
# Node ID 1c22fcce1662a73f6988b67ed12044ab660b6960
# Parent  008b94539c9d9a3f45487faf058952751af5089a
Irccd: rename PluginService.configure to setConfig

diff -r 008b94539c9d -r 1c22fcce1662 lib/irccd/config.cpp
--- a/lib/irccd/config.cpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/lib/irccd/config.cpp	Tue Jun 07 14:19:27 2016 +0200
@@ -582,7 +582,7 @@
 			if (!util::isIdentifierValid(option.key()))
 				continue;
 
-			irccd.pluginService().configure(option.key(), findPluginConfig(option.key()));
+			irccd.pluginService().setConfig(option.key(), findPluginConfig(option.key()));
 			irccd.pluginService().setFormats(option.key(), findPluginFormats(option.key()));
 			irccd.pluginService().load(option.key(), option.value());
 		}
diff -r 008b94539c9d -r 1c22fcce1662 lib/irccd/plugin-js.cpp
--- a/lib/irccd/plugin-js.cpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/lib/irccd/plugin-js.cpp	Tue Jun 07 14:19:27 2016 +0200
@@ -129,7 +129,7 @@
 
 	for (const auto &pair : formats()) {
 		dukx_push_std_string(m_context, pair.second);
-		duk_put_prop_string(m_context, -1, pair.first.c_str());
+		duk_put_prop_string(m_context, -2, pair.first.c_str());
 	}
 
 	duk_pop_n(m_context, 3);
diff -r 008b94539c9d -r 1c22fcce1662 lib/irccd/service-plugin.cpp
--- a/lib/irccd/service-plugin.cpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/lib/irccd/service-plugin.cpp	Tue Jun 07 14:19:27 2016 +0200
@@ -115,7 +115,7 @@
 	m_plugins.push_back(std::move(plugin));
 }
 
-void PluginService::configure(const std::string &name, PluginConfig config)
+void PluginService::setConfig(const std::string &name, PluginConfig config)
 {
 	m_config.emplace(name, std::move(config));
 }
diff -r 008b94539c9d -r 1c22fcce1662 lib/irccd/service-plugin.hpp
--- a/lib/irccd/service-plugin.hpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/lib/irccd/service-plugin.hpp	Tue Jun 07 14:19:27 2016 +0200
@@ -110,7 +110,7 @@
 	 * \param name the plugin name
 	 * \param config the new configuration
 	 */
-	IRCCD_EXPORT void configure(const std::string &name, PluginConfig config);
+	IRCCD_EXPORT void setConfig(const std::string &name, PluginConfig config);
 
 	/**
 	 * Get a configuration for a plugin.
diff -r 008b94539c9d -r 1c22fcce1662 tests/plugin-ask/main.cpp
--- a/tests/plugin-ask/main.cpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/tests/plugin-ask/main.cpp	Tue Jun 07 14:19:27 2016 +0200
@@ -58,7 +58,7 @@
 		: m_ps(m_irccd.pluginService())
 		, m_server(std::make_shared<ServerTest>())
 	{
-		m_ps.configure("ask", {{"file", SOURCEDIR "/answers.conf"}});
+		m_ps.setConfig("ask", {{"file", SOURCEDIR "/answers.conf"}});
 		m_ps.load("ask", PLUGINDIR "/ask.js");
 		m_plugin = m_ps.require("ask");
 	}
diff -r 008b94539c9d -r 1c22fcce1662 tests/plugin-auth/main.cpp
--- a/tests/plugin-auth/main.cpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/tests/plugin-auth/main.cpp	Tue Jun 07 14:19:27 2016 +0200
@@ -62,7 +62,7 @@
 		, m_nickserv2(std::make_shared<ServerTest>("nickserv2"))
 		, m_quakenet(std::make_shared<ServerTest>("quakenet"))
 	{
-		m_ps.configure("auth", {
+		m_ps.setConfig("auth", {
 			{ "nickserv1.type", "nickserv" },
 			{ "nickserv1.password", "plopation" },
 			{ "nickserv2.type", "nickserv" },
diff -r 008b94539c9d -r 1c22fcce1662 tests/plugin-hangman/main.cpp
--- a/tests/plugin-hangman/main.cpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/tests/plugin-hangman/main.cpp	Tue Jun 07 14:19:27 2016 +0200
@@ -76,7 +76,7 @@
 		if (config.count("file") == 0)
 			config.emplace("file", SOURCEDIR "/words.conf");
 
-		m_ps.configure("hangman", config);
+		m_ps.setConfig("hangman", config);
 		m_ps.load("hangman", PLUGINDIR "/hangman.js");
 		m_plugin = m_ps.require("hangman");
 	}
diff -r 008b94539c9d -r 1c22fcce1662 tests/plugin-history/main.cpp
--- a/tests/plugin-history/main.cpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/tests/plugin-history/main.cpp	Tue Jun 07 14:19:27 2016 +0200
@@ -74,7 +74,7 @@
 		if (config.count("file") == 0)
 			config.emplace("file", SOURCEDIR "/words.conf");
 
-		m_ps.configure("history", config);
+		m_ps.setConfig("history", config);
 		m_ps.load("history", PLUGINDIR "/history.js");
 		m_plugin = m_ps.require("history");
 	}
diff -r 008b94539c9d -r 1c22fcce1662 tests/plugin-logger/main.cpp
--- a/tests/plugin-logger/main.cpp	Tue Jun 07 14:19:07 2016 +0200
+++ b/tests/plugin-logger/main.cpp	Tue Jun 07 14:19:27 2016 +0200
@@ -78,7 +78,7 @@
 		if (config.count("path") == 0)
 			config.emplace("path", BINARYDIR "/log.txt");
 
-		m_ps.configure("logger", config);
+		m_ps.setConfig("logger", config);
 		m_ps.load("logger", PLUGINDIR "/logger.js");
 		m_plugin = m_ps.require("logger");
 	}