From 79e6d1ca3cbf9fb61e2c1329327217db99205aae Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Tue, 7 Nov 2017 16:45:49 +0100 Subject: [PATCH] use simple address in remote-conference-event-handler --- src/conference/remote-conference-event-handler.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conference/remote-conference-event-handler.cpp b/src/conference/remote-conference-event-handler.cpp index 1c768441d..aa79c5fcb 100644 --- a/src/conference/remote-conference-event-handler.cpp +++ b/src/conference/remote-conference-event-handler.cpp @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "address/simple-address.h" #include "private.h" #include "logger/logger.h" #include "remote-conference-event-handler-p.h" @@ -78,13 +79,12 @@ void RemoteConferenceEventHandler::notifyReceived (const string &xmlBody) { tm = static_cast(Utils::stoll(confInfo->getConferenceDescription()->getFreeText().get())); bool isFullState = (confInfo->getState() == StateType::full); - Address cleanedConfAddress = d->confAddress; - cleanedConfAddress.clean(); + SimpleAddress simpleConfAddress(d->confAddress); // Temporary workaround - Address entityAddress(confInfo->getEntity().c_str()); - Address cleanedConfAddress2(cleanedConfAddress); - cleanedConfAddress2.setDomain(entityAddress.getDomain()); - if (entityAddress.weakEqual(cleanedConfAddress) || entityAddress.weakEqual(cleanedConfAddress2)) { + SimpleAddress entityAddress(confInfo->getEntity().c_str()); + SimpleAddress simpleConfAddress2(simpleConfAddress); + simpleConfAddress2.setDomain(entityAddress.getDomain()); + if ((entityAddress == simpleConfAddress) || (entityAddress == simpleConfAddress2)) { if ( confInfo->getConferenceDescription().present() && confInfo->getConferenceDescription().get().getSubject().present()