napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] AutoMount / kded6 has been tested by KaOS

Browse Source
This commit is contained in:
Adriaan de Groot 2023-11-26 21:53:04 +01:00
parent 26236fe63a
commit 7a9a50d702
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcalamares/partition/AutoMount.cpp
View File

@ -30,12 +30,12 @@ struct AutoMountInfo
* *
* KDE Solid automount management. * KDE Solid automount management.
* *
* Solid can be influenced through DBus calls to kded5. The following code * Solid can be influenced through DBus calls to kded (both kded5 and kded6). The
* handles Solid: if Solid exists (e.g. we're in a KDE Plasma desktop) * following code handles Solid: if Solid exists (e.g. we're in a KDE Plasma desktop)
* then try to turn off automount that way. * 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(). * Returns a method-call message, ready for arguments and call().
*/ */
@ -46,8 +46,6 @@ kdedCall( const QString& method )
return QDBusMessage::createMethodCall( return QDBusMessage::createMethodCall(
QStringLiteral( "org.kde.kded5" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded5" ), method ); QStringLiteral( "org.kde.kded5" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded5" ), method );
#else #else
#warning KF6 Automount-handling is untested
// This is definitely wrong until Plasma6 is released, and somebody tests it
return QDBusMessage::createMethodCall( return QDBusMessage::createMethodCall(
QStringLiteral( "org.kde.kded6" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded6" ), method ); QStringLiteral( "org.kde.kded6" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded6" ), method );
#endif #endif