mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
ref #3273
This commit is contained in:
louiz’
2018-03-12 01:06:15 +01:00
parent bb476f4a0d
commit b3b90139db
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/database.hpp
+1 -1
View File
@@ -84,7 +84,7 @@ class Database
struct RemoteJid: Column<std::string> { static constexpr auto name = "remote"; }; 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 MucLogLineTable = Table<Id, Uuid, Owner, IrcChanName, IrcServerName, Date, Body, Nick>;
using MucLogLine = MucLogLineTable::RowType; using MucLogLine = MucLogLineTable::RowType;
src/xmpp/biboumi_adhoc_commands.cpp
+7 -7
View File
@@ -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); instructions.set_inner("Edit the form, to configure the settings of the IRC server " + server_domain);
{ {
XmlSubNode hostname(x, "field"); XmlSubNode field(x, "field");
hostname["var"] = "hostname"; field["var"] = "hostname";
hostname["type"] = "text-single"; field["type"] = "text-single";
hostname["label"] = "Address"; field["label"] = "Address";
hostname["desc"] = "The hostname (or IP) to connect to."; field["desc"] = "The address (hostname or IP) to connect to.";
XmlSubNode value(hostname, "value"); XmlSubNode value(field, "value");
if (options.col<Database::Address>().empty()) if (options.col<Database::Address>().empty())
value.set_inner(server_domain); value.set_inner(server_domain);
else else
@@ -389,7 +389,7 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
const XmlNode* value = field->get_child("value", "jabber:x:data"); const XmlNode* value = field->get_child("value", "jabber:x:data");
const std::vector<const XmlNode*> values = field->get_children("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(); options.col<Database::Address>() = value->get_inner();
} }