Commit b3b90139 authored by louiz’'s avatar louiz’

Rename a few “hostname” into “address”, regarding last commit

ref #3273
parent bb476f4a
......@@ -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;
......
......@@ -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();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment