From 9ecca94a024dc81b36dcf00d326683b1242e9177 Mon Sep 17 00:00:00 2001 From: donghualin Date: Wed, 4 Mar 2026 17:40:02 +0800 Subject: [PATCH] fix: fixed the wired device show error because we used the macro, so the condition is error, the wired device which is off will show PMS: BUG-308755 --- CMakeLists.txt | 5 ----- .../networkmanagerprocesser.cpp | 19 ++++--------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 054198ef..9db8b8e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ project(dde-network-core LANGUAGES CXX C ) -option(ENABLE_DEEPIN_NMQT "enable nmqt patch on deepin" ON) option(BUILD_TESTS "Build unit tests" OFF) option(BUILD_EXAMPLE "Build example programs" OFF) @@ -34,10 +33,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") message(STATUS ${result}) endif() -if (ENABLE_DEEPIN_NMQT) - add_definitions(-DUSE_DEEPIN_NMQT) -endif() - message(STATUS DEEPIN_NMQT_TEST ": ${DEEPIN_NMQT_TEST}") set(INTERFACE_VERSION "2.0") diff --git a/src/impl/networkmanager/networkmanagerprocesser.cpp b/src/impl/networkmanager/networkmanagerprocesser.cpp index 86d6b41d..84052285 100644 --- a/src/impl/networkmanager/networkmanagerprocesser.cpp +++ b/src/impl/networkmanager/networkmanagerprocesser.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -186,12 +186,7 @@ void NetworkManagerProcesser::createOrRemoveDevice(const QString &path) } }; - if (device->managed() -#ifdef USE_DEEPIN_NMQT - && ((device->interfaceFlags() & DEVICE_INTERFACE_FLAG_UP) || - device->type() == NetworkManager::Device::Wifi) -#endif - ) { + if (device->managed() && ((device->interfaceFlags() & DEVICE_INTERFACE_FLAG_UP) || device->type() == NetworkManager::Device::Wifi)) { // 如果由非manager变成manager的模式,则新增设备 if (!deviceExist(device->uni())) { NetworkDeviceBase *newDevice = createDevice(device); @@ -327,21 +322,15 @@ void NetworkManagerProcesser::onDeviceAdded(const QString &uni) } } -#ifdef USE_DEEPIN_NMQT connect(currentDevice.get(), &NetworkManager::Device::interfaceFlagsChanged, currentDevice.get(), [ uni, this ] { createOrRemoveDevice(uni); }); -#endif + connect(currentDevice.get(), &NetworkManager::Device::managedChanged, currentDevice.get(), [ uni, this ] { createOrRemoveDevice(uni); }); - if (currentDevice->managed() -#ifdef USE_DEEPIN_NMQT - && ((currentDevice->interfaceFlags() & DEVICE_INTERFACE_FLAG_UP) || - currentDevice->type() == NetworkManager::Device::Wifi) -#endif - ) { + if (currentDevice->managed() && ((currentDevice->interfaceFlags() & DEVICE_INTERFACE_FLAG_UP) || currentDevice->type() == NetworkManager::Device::Wifi)) { NetworkDeviceBase *newDevice = createDevice(currentDevice); connect(newDevice, &NetworkDeviceBase::deviceStatusChanged, this, &NetworkManagerProcesser::onUpdateNetworkDetail); connect(newDevice, &NetworkDeviceBase::activeConnectionChanged, this, &NetworkManagerProcesser::onUpdateNetworkDetail);