sync: from linuxdeepin/dde-session-shell

deepin-ci-robot · deepin-ci-robot · commit abb8c7793961 · 2025-07-09T05:56:25.000Z
Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: linuxdeepin/dde-session-shell#21
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -8,13 +8,18 @@ Files: README.md README.zh_CN.md
 Copyright: None
 License: CC-BY-4.0
 
+# cmake
+Files: cmake/*.in cmake/*.cmake
+Copyright: None
+License: CC0-1.0
+
 # xml2cpp
 Files: src/global_util/dbus/*
 Copyright: The Qt Company Ltd.
 License: CC0-1.0
 
 # Project file
-Files: *.pro *.qrc *CMakeLists.txt *.cmake qt-theme.ini files/* scripts/* src/lightdm-deepin-greeter/deepin-greeter
+Files: *.pro *.qrc *CMakeLists.txt *.cmake qt-theme.ini files/* scripts/* src/lightdm-deepin-greeter/deepin-greeter .project
 Copyright: None
 License: CC0-1.0
 
@@ -24,7 +29,7 @@ Copyright: UnionTech Software Technology Co., Ltd.
 License: GPL-3.0-or-later
 
 # png svg
-Files: src/widgets/img/* misc/images/* src/session-widgets/img/*
+Files: src/widgets/img/* misc/images/* src/session-widgets/img/* plugins/examples/login-plugins/login-udcp/images/*
 Copyright: UnionTech Software Technology Co., Ltd.
 License: GPL-3.0-or-later
 
diff --git a/LICENSES/GPL-3.0-or-later.txt b/LICENSES/GPL-3.0-or-later.txt
@@ -1,7 +1,7 @@
 GNU GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007
 
-Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 
@@ -215,7 +215,7 @@ To do so, attach the following notices to the program. It is safest to attach th
 
      This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
-     You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+     You should have received a copy of the GNU General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -227,6 +227,6 @@ If the program does terminal interaction, make it output a short notice like thi
 
 The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”.
 
-You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>.
+You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
 
-The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/plugins/examples/login-plugins/login-udcp/qss/udcp_mfa_login_widget.qss b/plugins/examples/login-plugins/login-udcp/qss/udcp_mfa_login_widget.qss
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 QPushButton#sendButton {
     background-color: rgba(255, 255, 255, 76);
     color: white;
diff --git a/src/global_util/plugin_manager/modules_loader.cpp b/src/global_util/plugin_manager/modules_loader.cpp
@@ -33,6 +33,12 @@ ModulesLoader::~ModulesLoader()
 {
     quit();
     wait();
+    
+    QMutexLocker locker(&m_mutex);
+    for (auto &loader : m_pluginLoaders) {
+        cleanupPluginLoader(loader);
+    }
+    m_pluginLoaders.clear();
 }
 
 ModulesLoader& ModulesLoader::instance()
@@ -86,13 +92,15 @@ void ModulesLoader::findModule(const QString& path)
         // 版本过低则不加载，可能会导致登录器崩溃
         if (!checkVersion(version, LOWEST_VERSION)) {
             qCWarning(DDE_SHELL) << "The module version is too low, version:" << version << ", lowest version:" << LOWEST_VERSION;
+            loader->deleteLater();
             continue;
         }
 
         // 性能优化，分类加载
         QString pluginType = meta.value("pluginType").toString();
         if (!pluginType.isEmpty()) {
             if ((pluginType == LoginType && !m_loadLoginModule) || (pluginType == TrayType && m_loadLoginModule)) {
+                loader->deleteLater();
                 continue;
             }
         } else {
@@ -103,27 +111,27 @@ void ModulesLoader::findModule(const QString& path)
         auto* moduleInstance = dynamic_cast<dss::module::BaseModuleInterface*>(loader->instance());
         if (!moduleInstance) {
             qCWarning(DDE_SHELL) << "Load plugin failed, error:" << loader->errorString();
-            loader->unload();
+            cleanupPluginLoader(loader);
             continue;
         }
 
         qCInfo(DDE_SHELL) << "Current plugin key:" << moduleInstance->key();
         if (blackList.contains(moduleInstance->key())) {
             qCInfo(DDE_SHELL) << "The plugin is in black list, won't be loaded.";
-            loader->unload();
+            cleanupPluginLoader(loader);
             continue;
         }
 
         int loadPluginType = moduleInstance->loadPluginType();
         if (loadPluginType != dss::module::BaseModuleInterface::Load) {
             qCInfo(DDE_SHELL) << "The plugin dose not want to be loaded.";
-            loader->unload();
+            cleanupPluginLoader(loader);
             continue;
         }
 
         if (PluginManager::instance()->contains(moduleInstance->key())) {
             qCInfo(DDE_SHELL) << "The plugin has been loaded.";
-            loader->unload();
+            cleanupPluginLoader(loader);
             continue;
         }
 
@@ -268,6 +276,7 @@ bool ModulesLoader::isPluginEnabled(const QFileInfo& module)
             auto dbusInterface = new QDBusInterface(service, targetPath, interface, dbusConnection);
             if (!dbusInterface || !dbusInterface->isValid()) {
                 qCWarning(DDE_SHELL) << "Check plugin enabled dbus interface is not valid.";
+                dbusInterface->deleteLater();
                 return false;
             }
             const bool pluginEnabled = dbusInterface->property(property.toStdString().c_str()).toBool();
@@ -346,6 +355,14 @@ void ModulesLoader::unloadPlugin(const QString& path)
     }
 }
 
+void ModulesLoader::cleanupPluginLoader(QPluginLoader* loader)
+{
+    if (loader) {
+        loader->unload();
+        loader->deleteLater();
+    }
+}
+
 // TODO 只重新加载/卸载变更的插件
 void ModulesLoader::onDConfigPropertyChanged(const QString& key, const QVariant& value, QObject* objPtr)
 {
@@ -367,4 +384,4 @@ void ModulesLoader::onDbusPropertiesChanged(const QString& interfaceName, const
             start(QThread::LowestPriority);
         }
     }
-}
+}
diff --git a/src/global_util/plugin_manager/modules_loader.h b/src/global_util/plugin_manager/modules_loader.h
@@ -40,6 +40,7 @@ class ModulesLoader : public QThread
     bool isPluginEnabled(const QFileInfo &module);
     bool contains(const QString &pluginFile) const;
     QPair<QString, QPluginLoader*> getPluginLoader(const QString &pluginFile) const;
+    void cleanupPluginLoader(QPluginLoader* loader);
 
     static void onDConfigPropertyChanged(const QString &key, const QVariant &value, QObject *objPtr);
 
diff --git a/src/pam-inhibit-autologin/pam_inhibit_autologin.c b/src/pam-inhibit-autologin/pam_inhibit_autologin.c
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2011 - 2025 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #include <security/pam_ext.h>
 #include <security/pam_modules.h>
 #include <security/_pam_types.h>
diff --git a/src/session-widgets/fullmanagedauthwidget.h b/src/session-widgets/fullmanagedauthwidget.h
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #ifndef FULLMANAGEDAUTHWIDGET_H
 #define FULLMANAGEDAUTHWIDGET_H
 
diff --git a/src/widgets/abstractfullbackgroundinterface.h b/src/widgets/abstractfullbackgroundinterface.h
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2011 - 2022 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #ifndef ABSTRACTFULLBACKGROUND_H
 #define ABSTRACTFULLBACKGROUND_H
 
diff --git a/src/widgets/popupwindow.cpp b/src/widgets/popupwindow.cpp
@@ -1,6 +1,6 @@
-// SPDX-FileCopyrightText: 2011 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
 //
-// SPDX-License-Identifier: LGPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "popupwindow.h"
 
diff --git a/src/widgets/popupwindow.h b/src/widgets/popupwindow.h
@@ -1,6 +1,6 @@
-// SPDX-FileCopyrightText: 2011 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2021 - 2022 UnionTech Software Technology Co., Ltd.
 //
-// SPDX-License-Identifier: LGPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #ifndef POPUPWINDOW_H
 #define POPUPWINDOW_H
diff --git a/translations/dde-session-shell_es_419.ts b/translations/dde-session-shell_es_419.ts
diff --git a/translations/dde-session-shell_es_AR.ts b/translations/dde-session-shell_es_AR.ts
diff --git a/translations/dde-session-shell_es_CL.ts b/translations/dde-session-shell_es_CL.ts
diff --git a/translations/dde-session-shell_es_MX.ts b/translations/dde-session-shell_es_MX.ts
