From 7a9a50d7023e564f0e0211c0aefedd48b0dd9eac Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 26 Nov 2023 21:53:04 +0100 Subject: [PATCH] [libcalamares] AutoMount / kded6 has been tested by KaOS --- src/libcalamares/partition/AutoMount.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 1f17e3173..c21f7817d 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -30,12 +30,12 @@ struct AutoMountInfo * * KDE Solid automount management. * - * Solid can be influenced through DBus calls to kded5. The following code - * handles Solid: if Solid exists (e.g. we're in a KDE Plasma desktop) + * Solid can be influenced through DBus calls to kded (both kded5 and kded6). The + * following code handles Solid: if Solid exists (e.g. we're in a KDE Plasma desktop) * then try to turn off automount that way. */ -/** @brief Boilerplate for a call to kded5 +/** @brief Boilerplate for a call to kded * * Returns a method-call message, ready for arguments and call(). */ @@ -46,8 +46,6 @@ kdedCall( const QString& method ) return QDBusMessage::createMethodCall( QStringLiteral( "org.kde.kded5" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded5" ), method ); #else -#warning KF6 Automount-handling is untested - // This is definitely wrong until Plasma6 is released, and somebody tests it return QDBusMessage::createMethodCall( QStringLiteral( "org.kde.kded6" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded6" ), method ); #endif