From 7d74fd2c039a6c9b2879a281e670482d333b8f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Wed, 6 Sep 2023 16:04:15 +0200 Subject: [PATCH] Add compatibility with the new libcloudproviders integration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since libcloudproviders 0.3.3 it is possible to specify the interface name directly in the .desktop file, and thus allowing it to be integrated when using a containerized client. Signed-off-by: Corentin Noël --- mirall.desktop.in | 2 +- src/gui/CMakeLists.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mirall.desktop.in b/mirall.desktop.in index aa25464d1..d7a8a95c4 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -197,7 +197,7 @@ Comment[lb]=@APPLICATION_NAME@ Desktop Synchronisatioun Client GenericName[lb]=Dossier Dync Name[lb]=@APPLICATION_NAME@ Desktop Sync Client Icon[lb]=@APPLICATION_ICON_NAME@ - +@LIBCLOUDPROVIDERS_DESKTOP_IMPLEMENTS@ [Desktop Action Quit] Exec=@APPLICATION_EXECUTABLE@ --quit diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index e4af0e33a..0a89c6d30 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -659,6 +659,12 @@ if(TARGET PkgConfig::CLOUDPROVIDERS) PkgConfig::GLIB2 PkgConfig::GIO ) + + list(APPEND LIBCLOUDPROVIDERS_DESKTOP_IMPLEMENTS "Implements=org.freedesktop.CloudProviders\n") + list(APPEND LIBCLOUDPROVIDERS_DESKTOP_IMPLEMENTS "[org.freedesktop.CloudProviders]") + list(APPEND LIBCLOUDPROVIDERS_DESKTOP_IMPLEMENTS "BusName=${LIBCLOUDPROVIDERS_DBUS_BUS_NAME}") + list(APPEND LIBCLOUDPROVIDERS_DESKTOP_IMPLEMENTS "ObjectPath=${LIBCLOUDPROVIDERS_DBUS_OBJECT_PATH}") + list(JOIN LIBCLOUDPROVIDERS_DESKTOP_IMPLEMENTS "\n" LIBCLOUDPROVIDERS_DESKTOP_IMPLEMENTS) endif() ## handle DBUS for Fdo notifications