aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMelvin Keskin <melvo@olomono.de>2023-03-11 14:37:35 +0100
committerLinus Jahn <lnj@kaidan.im>2023-03-13 16:16:08 +0100
commit64e29c129d7a47e5d128cd097c5c4f6cbd5b4328 (patch)
treed6c9007a82b616e592b3fd62fa2f4a52e1da00d1 /src
parent83316865510a2e3c26b44f41840028b28cd440a1 (diff)
OmemoManagerPrivate: Fix documentation and warning
Diffstat (limited to 'src')
-rw-r--r--src/omemo/QXmppOmemoManager.cpp2
-rw-r--r--src/omemo/QXmppOmemoManager_p.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
index 0aab152d..d5d3af0a 100644
--- a/src/omemo/QXmppOmemoManager.cpp
+++ b/src/omemo/QXmppOmemoManager.cpp
@@ -340,7 +340,7 @@ QXmppOmemoManager::~QXmppOmemoManager() = default;
///
/// This should be called after starting the client and before the login.
/// It must only be called after \c setUp() has been called once for the user
-/// during one of the past login session.
+/// during one of the past login sessions.
/// It does not need to be called if setUp() has been called during the current
/// login session.
///
diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp
index 070ed5a8..63cb5e00 100644
--- a/src/omemo/QXmppOmemoManager_p.cpp
+++ b/src/omemo/QXmppOmemoManager_p.cpp
@@ -2798,7 +2798,7 @@ void ManagerPrivate::updateDevices(const QString &deviceOwnerJid, const QXmppOme
//
// Corrects the own device list on the PEP service by the locally stored
-// devices or set a contact device to be removed locally in the future.
+// devices or sets a contact device to be removed locally in the future.
//
// \param deviceOwnerJid bare JID of the devices' owner
//
@@ -2813,7 +2813,7 @@ void ManagerPrivate::handleIrregularDeviceListChanges(const QString &deviceOwner
auto future = pubSubManager->deleteOwnPepNode(ns_omemo_2_devices);
future.then(q, [=](QXmppPubSubManager::Result result) {
if (const auto error = std::get_if<QXmppError>(&result)) {
- warning("Node '" % QString(ns_omemo_2_devices) % "' of JID '" % deviceOwnerJid %
+ warning("Node '" % QString(ns_omemo_2_devices) % "' of JID '" % deviceOwnerJid %
"' could not be deleted in order to recover from an inconsistent node: " %
errorToString(*error));
} else {