Current version of Psi+ is 1.5.1711

It is based on: * psi: a30cb7a2 * plugins: 526dd7d * psimedia: 9fd3307 * resources: 2ef1865
psi-plus · Mar 21, 2024 · b469f10 · b469f10
1 parent 07a86c2
commit b469f10
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/psichatdlg.cpp b/src/psichatdlg.cpp
@@ -471,7 +471,7 @@ void PsiChatDlg::updateToolbuttons()
         if (actionName == "chat_voice" && !AvCallManager::isSupported()) {
             continue;
         }
-        if (actionName == "chat_pgp" && !options->getOption("plugins.auto-load.openpgp").toBool()) {
+        if (actionName == "chat_pgp" && !options->getOption("plugins.auto-load.openpgp", false).toBool()) {
             continue;
         }
 
@@ -900,7 +900,7 @@ void PsiChatDlg::updatePgp()
 
 void PsiChatDlg::checkPgpAutostart()
 {
-    const bool enabled = PsiOptions::instance()->getOption("plugins.auto-load.openpgp").toBool();
+    const bool enabled = PsiOptions::instance()->getOption("plugins.auto-load.openpgp", false).toBool();
     if (account()->hasPgp() && enabled) {
         const bool alwaysEnabled = PsiOptions::instance()->getOption("options.pgp.always-enabled").toBool();
         if (alwaysEnabled) {

diff --git a/src/shortcutmanager.cpp b/src/shortcutmanager.cpp
@@ -88,7 +88,7 @@ QList<QKeySequence> ShortcutManager::shortcuts(const QString &name)
 QList<QKeySequence> ShortcutManager::readShortcutsFromOptions(const QString &name, const PsiOptions *options)
 {
     QList<QKeySequence> list;
-    QVariant            variant = options->getOption(QString("options.shortcuts.%1").arg(name));
+    QVariant            variant = options->getOption(QStringLiteral("options.shortcuts.%1").arg(name), QVariantList());
     QString             type    = variant.typeName();
     if (type == "QVariantList") {
         const auto &variants = variant.toList();

diff --git a/src/textutil.cpp b/src/textutil.cpp
@@ -539,12 +539,16 @@ QString TextUtil::emoticonify(const QString &in)
 
                         int n = match.capturedStart();
                         if (ePos == -1 || n < ePos || (match.capturedLength() > foundLen && n < ePos + foundLen)) {
+#if 0
+// this logic is commented out being rather harmful with unicode emoji
                             bool leftSpace  = n == 0 || (n > 0 && str[n - 1].isSpace());
                             bool rightSpace = (n + match.capturedLength() == int(str.length()))
                                 || (n + match.capturedLength() < int(str.length())
                                     && str[n + match.capturedLength()].isSpace());
                             // there must be whitespace at least on one side of the emoticon
                             if (leftSpace || rightSpace) {
+#endif
+                            if (true) {
                                 ePos    = n;
                                 closest = icon;
 

diff --git a/version b/version
@@ -1 +1 @@
-1.5.1710 (2024-03-20, f6fa8f94)
+1.5.1711 (2024-03-21, a30cb7a2)