[evolution-data-server/gnome-3-30] Replace evolution-dbus-session tool with DBUS_SERVICES_PREFIX option

[Milan Crha <mcrha src gnome org>]

commit ad4380f1cbb8a07b476692d4b0519901214f0211
Author: Milan Crha <mcrha redhat com>
Date:   Fri Nov 30 11:41:26 2018 +0100

    Replace evolution-dbus-session tool with DBUS_SERVICES_PREFIX option
    
    The option is still meant to be used in Flatpak only, to prefix
    the D-Bus services with certain prefix (usually the same as the Flatpak
    application ID), thus the services do not clash with those installed
    in the host system. It fixes many issues in evolution-dbus-session.
    
    Related to https://gitlab.gnome.org/GNOME/evolution/issues/165

 CMakeLists.txt                                     |  17 +-
 src/tools/CMakeLists.txt                           |   4 -
 src/tools/evolution-dbus-session/CMakeLists.txt    |  31 -
 .../evolution-dbus-session.c                       | 823 ---------------------
 4 files changed, 10 insertions(+), 865 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d49e0175..4a20ec6bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,13 +31,13 @@ set(PROJECT_DISTCONFIGURE_PARAMS
        -DENABLE_VALA_BINDINGS=ON
        -DENABLE_INSTALLED_TESTS=ON
        -DENABLE_GTK_DOC=ON
-       -DENABLE_DBUS_SESSION_TOOL=ON
        -DWITH_PRIVATE_DOCS=ON
 )
 
 # ******************************
 # D-Bus versioning
 # ******************************
+# Actual name can be modified with DBUS_SERVICES_PREFIX option
 set(ADDRESS_BOOK_DBUS_SERVICE_NAME     "org.gnome.evolution.dataserver.AddressBook9")
 set(CALENDAR_DBUS_SERVICE_NAME         "org.gnome.evolution.dataserver.Calendar7")
 set(SOURCES_DBUS_SERVICE_NAME          "org.gnome.evolution.dataserver.Sources5")
@@ -171,6 +171,15 @@ ensure_default_value(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share")
 ensure_default_value(LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale")
 ensure_default_value(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc")
 
+add_printable_variable(DBUS_SERVICES_PREFIX "Prefix for D-Bus services, usually left empty, without trailing 
dot" "")
+
+if(NOT ("${DBUS_SERVICES_PREFIX}" STREQUAL ""))
+       set(ADDRESS_BOOK_DBUS_SERVICE_NAME      "${DBUS_SERVICES_PREFIX}.${ADDRESS_BOOK_DBUS_SERVICE_NAME}")
+       set(CALENDAR_DBUS_SERVICE_NAME          "${DBUS_SERVICES_PREFIX}.${CALENDAR_DBUS_SERVICE_NAME}")
+       set(SOURCES_DBUS_SERVICE_NAME           "${DBUS_SERVICES_PREFIX}.${SOURCES_DBUS_SERVICE_NAME}")
+       set(USER_PROMPTER_DBUS_SERVICE_NAME     "${DBUS_SERVICES_PREFIX}.${USER_PROMPTER_DBUS_SERVICE_NAME}")
+endif(NOT ("${DBUS_SERVICES_PREFIX}" STREQUAL ""))
+
 # ******************************
 # Special directories
 # ******************************
@@ -996,12 +1005,6 @@ if(ENABLE_VALA_BINDINGS)
 
 endif(ENABLE_VALA_BINDINGS)
 
-# ******************************
-# D-Bus session tool, a Flatpak helper
-# ******************************
-
-add_printable_option(ENABLE_DBUS_SESSION_TOOL "Build evolution-dbus-session tool" OFF)
-
 # Generate the ${PROJECT_NAME}-config.h file
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config.h)
 
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 796e02b6f..e13c25f4f 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,6 +1,2 @@
 add_subdirectory(addressbook-export)
 add_subdirectory(list-sources)
-
-if(ENABLE_DBUS_SESSION_TOOL)
-       add_subdirectory(evolution-dbus-session)
-endif(ENABLE_DBUS_SESSION_TOOL)