Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

089a2206

Commit 089a2206 authored 1 year ago by Sébastien Blin

Downloads
- Patches
- Plain Diff

conference: rename Participant into SubCall and merge bind/attach

GitLab: #958
Change-Id: I91036c9f1e20ee19e3896eb8e0110aa36a9d0602

parent a404577a

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/client/callmanager.cpp 4 additions, 4 deletions

src/client/callmanager.cpp
src/conference.cpp 205 additions, 183 deletions

src/conference.cpp
src/conference.h 33 additions, 31 deletions

src/conference.h
src/jamidht/conversation_module.cpp 5 additions, 5 deletions

src/jamidht/conversation_module.cpp
src/jamidht/jamiaccount.cpp 1 addition, 2 deletions

src/jamidht/jamiaccount.cpp
src/manager.cpp 32 additions, 36 deletions

src/manager.cpp
src/manager.h 4 additions, 4 deletions

src/manager.h
src/sip/sipcall.cpp 0 additions, 1 deletion

src/sip/sipcall.cpp
test/unitTest/call/conference.cpp 4 additions, 4 deletions

test/unitTest/call/conference.cpp

with 288 additions and 270 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment