Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
d835f509
Commit
d835f509
authored
Dec 01, 2017
by
Benjamin REIS
Browse files
Add getAddressWithoutGruu to Identity address and create participant without gruu
parent
47cf1d43
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/address/identity-address.cpp
View file @
d835f509
...
...
@@ -130,6 +130,12 @@ bool IdentityAddress::setGruu (const string &gruu) {
return
true
;
}
IdentityAddress
IdentityAddress
::
getAddressWithoutGruu
()
const
{
IdentityAddress
address
(
*
this
);
address
.
setGruu
(
""
);
return
address
;
}
string
IdentityAddress
::
asString
()
const
{
Address
tmpAddress
(
*
this
);
return
tmpAddress
.
asStringUriOnly
();
...
...
src/address/identity-address.h
View file @
d835f509
...
...
@@ -57,6 +57,8 @@ public:
const
std
::
string
&
getGruu
()
const
;
bool
setGruu
(
const
std
::
string
&
gruu
);
IdentityAddress
getAddressWithoutGruu
()
const
;
virtual
std
::
string
asString
()
const
;
private:
...
...
src/conference/participant.cpp
View file @
d835f509
...
...
@@ -88,12 +88,7 @@ void ParticipantPrivate::removeDevice (const IdentityAddress &gruu) {
Participant
::
Participant
(
const
IdentityAddress
&
address
)
:
Object
(
*
new
ParticipantPrivate
)
{
L_D
();
d
->
addr
=
address
;
}
Participant
::
Participant
(
IdentityAddress
&&
address
)
:
Object
(
*
new
ParticipantPrivate
)
{
L_D
();
d
->
addr
=
address
;
d
->
addr
=
address
.
getAddressWithoutGruu
();
}
// -----------------------------------------------------------------------------
...
...
src/conference/participant.h
View file @
d835f509
...
...
@@ -57,7 +57,6 @@ public:
L_OVERRIDE_SHARED_FROM_THIS
(
Participant
);
explicit
Participant
(
const
IdentityAddress
&
address
);
explicit
Participant
(
IdentityAddress
&&
address
);
const
IdentityAddress
&
getAddress
()
const
;
bool
isAdmin
()
const
;
...
...
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