summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-03-12 01:06:15 +0100
committerlouiz’ <louiz@louiz.org>2018-03-12 01:06:15 +0100
commitb3b90139dbb0a09988477fdab4f19d717ac05cab (patch)
tree217efead2a81075087ca8974463630d8cd6f04fd
parentbb476f4a0d60bbc41393a86a370aa94ab405b081 (diff)
downloadbiboumi-b3b90139dbb0a09988477fdab4f19d717ac05cab.tar.gz
biboumi-b3b90139dbb0a09988477fdab4f19d717ac05cab.tar.bz2
biboumi-b3b90139dbb0a09988477fdab4f19d717ac05cab.tar.xz
biboumi-b3b90139dbb0a09988477fdab4f19d717ac05cab.zip
Rename a few “hostname” into “address”, regarding last commit
ref #3273
-rw-r--r--src/database/database.hpp2
-rw-r--r--src/xmpp/biboumi_adhoc_commands.cpp14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/database/database.hpp b/src/database/database.hpp
index 79b16d6..8a967d8 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -84,7 +84,7 @@ class Database
struct RemoteJid: Column<std::string> { static constexpr auto name = "remote"; };
- struct Address: Column<std::string> { static constexpr auto name = "hostname_"; };
+ struct Address: Column<std::string> { static constexpr auto name = "address_"; };
using MucLogLineTable = Table<Id, Uuid, Owner, IrcChanName, IrcServerName, Date, Body, Nick>;
using MucLogLine = MucLogLineTable::RowType;
diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp
index 0a25bd4..942d98d 100644
--- a/src/xmpp/biboumi_adhoc_commands.cpp
+++ b/src/xmpp/biboumi_adhoc_commands.cpp
@@ -228,12 +228,12 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com
instructions.set_inner("Edit the form, to configure the settings of the IRC server " + server_domain);
{
- XmlSubNode hostname(x, "field");
- hostname["var"] = "hostname";
- hostname["type"] = "text-single";
- hostname["label"] = "Address";
- hostname["desc"] = "The hostname (or IP) to connect to.";
- XmlSubNode value(hostname, "value");
+ XmlSubNode field(x, "field");
+ field["var"] = "hostname";
+ field["type"] = "text-single";
+ field["label"] = "Address";
+ field["desc"] = "The address (hostname or IP) to connect to.";
+ XmlSubNode value(field, "value");
if (options.col<Database::Address>().empty())
value.set_inner(server_domain);
else
@@ -389,7 +389,7 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
const XmlNode* value = field->get_child("value", "jabber:x:data");
const std::vector<const XmlNode*> values = field->get_children("value", "jabber:x:data");
- if (field->get_tag("var") == "hostname")
+ if (field->get_tag("var") == "address")
{
options.col<Database::Address>() = value->get_inner();
}