misc: fix build dbus

Change-Id: Ic74e3a79ff5c79d48f4c4ab76eb0be690d296a0b

src/app/lrcinstance.cpp

@@ -36,6 +36,7 @@ LRCInstance::LRCInstance(migrateCallback willMigrateCb,
     , updateManager_(std::make_unique<UpdateManager>(updateUrl, connectivityMonitor, this))
     , threadPool_(new QThreadPool(this))
 {
+    debugMode_ = !muteDring;
     threadPool_->setMaxThreadCount(1);
 
     connect(this, &LRCInstance::currentAccountIdChanged, [this] {

src/app/lrcinstance.h

@@ -125,6 +125,11 @@ public:
 
     void set_selectedConvUid(QString selectedConvUid = "");
 
+    Q_INVOKABLE bool debugMode() const
+    {
+        return debugMode_;
+    }
+
 Q_SIGNALS:
     void accountListChanged();
     void selectedConvUidChanged();
@@ -145,6 +150,8 @@ private:
 
     conversation::Info invalid {};
 
+    bool debugMode_ {false};
+
     QThreadPool* threadPool_;
 };
 Q_DECLARE_METATYPE(LRCInstance*)

src/app/mainview/components/ConversationErrorsRow.qml

@@ -40,7 +40,7 @@ Rectangle {
                 errorLabel.text = CurrentConversation.errors[0]
                 backendErrorToolTip.text = JamiStrings.backendError.arg(CurrentConversation.backendErrors[0])
             }
-            errorRect.visible = CurrentConversation.errors.length > 0
+            errorRect.visible = CurrentConversation.errors.length > 0 // If too much noise: && LRCInstance.debugMode()
         }
     }
 

src/libclient/callbackshandler.cpp

@@ -341,7 +341,7 @@ CallbacksHandler::CallbacksHandler(const Lrc& parent)
             &CallbacksHandler::slotConversationMemberEvent,
             Qt::QueuedConnection);
     connect(&ConfigurationManager::instance(),
-            &ConfigurationManagerInterface::conversationError,
+            &ConfigurationManagerInterface::onConversationError,
             this,
             &CallbacksHandler::slotOnConversationError,
             Qt::QueuedConnection);
@@ -536,7 +536,8 @@ CallbacksHandler::slotIncomingMessage(const QString& accountId,
     for (auto& e : interaction.toStdMap()) {
         if (e.first.contains("x-ring/ring.profile.vcard")) {
             auto decodedHead = QUrl::fromPercentEncoding(e.first.toLatin1());
-            QRegularExpression re("x-ring/ring.profile.vcard;id=([A-z0-9]+),part=([0-9]+),of=([0-9]+)");
+            QRegularExpression re(
+                "x-ring/ring.profile.vcard;id=([A-z0-9]+),part=([0-9]+),of=([0-9]+)");
             auto match = re.match(decodedHead);
 
             if (!match.hasMatch())
@@ -798,9 +799,9 @@ CallbacksHandler::slotConversationMemberEvent(const QString& accountId,
 
 void
 CallbacksHandler::slotOnConversationError(const QString& accountId,
-                                              const QString& conversationId,
-                                              int code,
-                                              const QString& what)
+                                          const QString& conversationId,
+                                          int code,
+                                          const QString& what)
 {
     Q_EMIT conversationError(accountId, conversationId, code, what);
 }

src/libclient/qtwrapper/configurationmanager_wrap.h

@@ -334,10 +334,10 @@ public:
                           const std::string& conversationId,
                           int code,
                           const std::string& what) {
-                       Q_EMIT conversationError(QString(accountId.c_str()),
-                                                      QString(conversationId.c_str()),
-                                                      code,
-                                                      QString(what.c_str()));
+                       Q_EMIT onConversationError(QString(accountId.c_str()),
+                                                  QString(conversationId.c_str()),
+                                                  code,
+                                                  QString(what.c_str()));
                    })};
     }
 
@@ -1200,10 +1200,10 @@ Q_SIGNALS: // SIGNALS
                                  const QString& conversationId,
                                  const QString& memberId,
                                  int event);
-    void conversationError(const QString& accountId,
-                                 const QString& conversationId,
-                                 int code,
-                                 const QString& what);
+    void onConversationError(const QString& accountId,
+                             const QString& conversationId,
+                             int code,
+                             const QString& what);
 };
 
 namespace org {