Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository 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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
662e7260
Commit
662e7260
authored
5 years ago
by
Kateryna Kostiuk
Browse files
Options
Downloads
Patches
Plain Diff
cleanup: conversations for conference
Change-Id: Iea6d39916b46158f4438a95e6de5350b00e0a0f0
parent
1692b804
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/api/conversationmodel.h
+1
-1
1 addition, 1 deletion
src/api/conversationmodel.h
src/conversationmodel.cpp
+1
-1
1 addition, 1 deletion
src/conversationmodel.cpp
with
2 additions
and
2 deletions
src/api/conversationmodel.h
+
1
−
1
View file @
662e7260
...
@@ -107,7 +107,7 @@ public:
...
@@ -107,7 +107,7 @@ public:
* @param search name filter
* @param search name filter
* @return filtered conversations
* @return filtered conversations
*/
*/
std
::
map
<
ConferenceableItem
,
ConferenceableValue
>
getConferenceableConversations
(
std
::
string
convId
,
std
::
string
filter
=
{})
const
;
std
::
map
<
ConferenceableItem
,
ConferenceableValue
>
getConferenceableConversations
(
const
std
::
string
&
convId
,
const
std
::
string
&
filter
=
{})
const
;
/**
/**
* Get a custom filtered set of conversations
* Get a custom filtered set of conversations
* @return conversations filtered
* @return conversations filtered
...
...
This diff is collapsed.
Click to expand it.
src/conversationmodel.cpp
+
1
−
1
View file @
662e7260
...
@@ -362,7 +362,7 @@ ConversationModel::allFilteredConversations() const
...
@@ -362,7 +362,7 @@ ConversationModel::allFilteredConversations() const
}
}
std
::
map
<
ConferenceableItem
,
ConferenceableValue
>
std
::
map
<
ConferenceableItem
,
ConferenceableValue
>
ConversationModel
::
getConferenceableConversations
(
std
::
string
convId
,
std
::
string
filter
)
const
ConversationModel
::
getConferenceableConversations
(
const
std
::
string
&
convId
,
const
std
::
string
&
filter
)
const
{
{
auto
conversationIdx
=
pimpl_
->
indexOf
(
convId
);
auto
conversationIdx
=
pimpl_
->
indexOf
(
convId
);
if
(
conversationIdx
==
-
1
||
!
owner
.
enabled
)
{
if
(
conversationIdx
==
-
1
||
!
owner
.
enabled
)
{
...
...
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