Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
90
Issues
90
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
b3b90139
Commit
b3b90139
authored
Mar 12, 2018
by
louiz’
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename a few “hostname” into “address”, regarding last commit
ref
#3273
parent
bb476f4a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
src/database/database.hpp
src/database/database.hpp
+1
-1
src/xmpp/biboumi_adhoc_commands.cpp
src/xmpp/biboumi_adhoc_commands.cpp
+7
-7
No files found.
src/database/database.hpp
View file @
b3b90139
...
...
@@ -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
;
...
...
src/xmpp/biboumi_adhoc_commands.cpp
View file @
b3b90139
...
...
@@ -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
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment