Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
49270d10
Commit
49270d10
authored
7 years ago
by
Konstantinos Sideris
Browse files
Options
Downloads
Patches
Plain Diff
Update matrix-structs library
parent
97e6fc6a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/MatrixStructs.cmake
+1
-1
1 addition, 1 deletion
cmake/MatrixStructs.cmake
src/InviteeItem.cc
+1
-1
1 addition, 1 deletion
src/InviteeItem.cc
src/MatrixClient.cc
+2
-2
2 additions, 2 deletions
src/MatrixClient.cc
with
4 additions
and
4 deletions
cmake/MatrixStructs.cmake
+
1
−
1
View file @
49270d10
...
...
@@ -23,7 +23,7 @@ ExternalProject_Add(
MatrixStructs
GIT_REPOSITORY https://github.com/mujx/matrix-structs
GIT_TAG
850100c0ac2b5a04720b2a1f09270749bf99f7dd
GIT_TAG
701eb5b06c370c23bca35a957f5a208c2115b52f
BUILD_IN_SOURCE 1
SOURCE_DIR
${
MATRIX_STRUCTS_ROOT
}
...
...
This diff is collapsed.
Click to expand it.
src/InviteeItem.cc
+
1
−
1
View file @
49270d10
...
...
@@ -9,7 +9,7 @@ constexpr int IconSize = 13;
InviteeItem
::
InviteeItem
(
mtx
::
identifiers
::
User
user
,
QWidget
*
parent
)
:
QWidget
{
parent
}
,
user_
{
QString
::
fromStdString
(
user
.
to
S
tring
())}
,
user_
{
QString
::
fromStdString
(
user
.
to
_s
tring
())}
{
auto
topLayout_
=
new
QHBoxLayout
(
this
);
topLayout_
->
setSpacing
(
0
);
...
...
This diff is collapsed.
Click to expand it.
src/MatrixClient.cc
+
2
−
2
View file @
49270d10
...
...
@@ -154,7 +154,7 @@ MatrixClient::login(const QString &username, const QString &password) noexcept
if
(
server_
.
port
()
>
0
)
hostname
=
QString
(
"%1:%2"
).
arg
(
server_
.
host
()).
arg
(
server_
.
port
());
emit
loginSuccess
(
QString
::
fromStdString
(
login
.
user_id
.
to
S
tring
()),
emit
loginSuccess
(
QString
::
fromStdString
(
login
.
user_id
.
to
_s
tring
()),
hostname
,
QString
::
fromStdString
(
login
.
access_token
));
}
catch
(
std
::
exception
&
e
)
{
...
...
@@ -228,7 +228,7 @@ MatrixClient::registerUser(const QString &user,
// Try to parse a regular register response.
try
{
mtx
::
responses
::
Register
res
=
nlohmann
::
json
::
parse
(
data
);
emit
registerSuccess
(
QString
::
fromStdString
(
res
.
user_id
.
to
S
tring
()),
emit
registerSuccess
(
QString
::
fromStdString
(
res
.
user_id
.
to
_s
tring
()),
QString
::
fromStdString
(
res
.
user_id
.
hostname
()),
QString
::
fromStdString
(
res
.
access_token
));
}
catch
(
const
std
::
exception
&
e
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment