From 8f1ed031da08199f5bf44fcce43a54bffba4bae8 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 12 Oct 2017 17:55:23 +0200 Subject: [PATCH] feat(ChatRoom): call right `setSubject` method --- src/chat/chat-room/client-group-chat-room.cpp | 6 +++--- src/conference/local-conference-p.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/chat/chat-room/client-group-chat-room.cpp b/src/chat/chat-room/client-group-chat-room.cpp index 22ed84b38..3fdc1bb74 100644 --- a/src/chat/chat-room/client-group-chat-room.cpp +++ b/src/chat/chat-room/client-group-chat-room.cpp @@ -68,7 +68,7 @@ ClientGroupChatRoom::ClientGroupChatRoom (LinphoneCore *core, const Address &me, : ChatRoom(*new ClientGroupChatRoomPrivate(core)), RemoteConference(core, me, nullptr) { static_cast(Conference::mPrivate)->focus = ObjectFactory::create(Address(uri)); - setSubject(subject); + RemoteConference::setSubject(subject); } int ClientGroupChatRoom::getCapabilities () const { @@ -152,7 +152,7 @@ void ClientGroupChatRoom::leave () { L_D(); RemoteConferencePrivate *conferencePrivate = - static_cast(Conference::mPrivate); + static_cast(Conference::mPrivate); conferencePrivate->eventHandler->unsubscribe(); shared_ptr session = conferencePrivate->focus->getPrivate()->getSession(); @@ -298,7 +298,7 @@ void ClientGroupChatRoom::onParticipantSetAdmin (const Address &addr, bool isAdm } void ClientGroupChatRoom::onSubjectChanged (const std::string &subject) { - setSubject(subject); + RemoteConference::setSubject(subject); LinphoneChatRoom *cr = L_GET_C_BACK_PTR(this); LinphoneChatRoomCbs *cbs = linphone_chat_room_get_callbacks(cr); LinphoneChatRoomCbsSubjectChangedCb cb = linphone_chat_room_cbs_get_subject_changed(cbs); diff --git a/src/conference/local-conference-p.h b/src/conference/local-conference-p.h index def1a9111..3ae543efb 100644 --- a/src/conference/local-conference-p.h +++ b/src/conference/local-conference-p.h @@ -30,9 +30,10 @@ LINPHONE_BEGIN_NAMESPACE class LocalConferenceEventHandler; class LocalConferencePrivate : public ConferencePrivate { -private: +public: std::unique_ptr eventHandler; +private: L_DECLARE_PUBLIC(LocalConference); };