From b3b90139dbb0a09988477fdab4f19d717ac05cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Mon, 12 Mar 2018 01:06:15 +0100 Subject: =?UTF-8?q?Rename=20a=20few=20=E2=80=9Chostname=E2=80=9D=20into=20?= =?UTF-8?q?=E2=80=9Caddress=E2=80=9D,=20regarding=20last=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #3273 --- src/database/database.hpp | 2 +- src/xmpp/biboumi_adhoc_commands.cpp | 14 +++++++------- 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 { static constexpr auto name = "remote"; }; - struct Address: Column { static constexpr auto name = "hostname_"; }; + struct Address: Column { static constexpr auto name = "address_"; }; using MucLogLineTable = Table; 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().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 values = field->get_children("value", "jabber:x:data"); - if (field->get_tag("var") == "hostname") + if (field->get_tag("var") == "address") { options.col() = value->get_inner(); } -- cgit v1.2.3