From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
Let's have GNOME desktop integration enabled by default (unless
Windows or Mac)
Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
---
.gitlab-ci.yml | 4 +---
configure.ac | 15 ---------------
meson.build | 7 -------
meson_options.txt | 5 -----
src/desktop-integration.c | 2 +-
5 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 750e801d..74280e98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,14 +38,12 @@ makecheck_simple:
--enable-pulse=no
--enable-smartcard=no
--enable-usbredir=no
- --enable-dbus=no
- make -j4
- make check
makecheck_simple-meson:
script:
- - meson build -Dauto_features=disabled
- -Ddbus=false || (cat build/meson-logs/meson-log.txt && exit 1)
+ - meson build -Dauto_features=disabled || (cat build/meson-logs/meson-log.txt && exit 1)
- ninja -C build
- (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
diff --git a/configure.ac b/configure.ac
index ea4e8ff2..5d6a1a01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -460,20 +460,6 @@ AM_CONDITIONAL(WITH_VALA, [test "x$enable_vala" = "xyes"])
VAPIDIR="${datadir}/vala/vapi"
AC_SUBST(VAPIDIR)
-AC_ARG_ENABLE([dbus],
- AS_HELP_STRING([--enable-dbus=@<:@auto/yes/no@:>@],
- [Enable dbus support for desktop integration (disabling automount) @<:@default=auto@:>@]),
- [],
- [enable_dbus="auto"])
-
-have_dbus=no
-if test "x$enable_dbus" != "xno"; then
- AC_DEFINE([USE_GDBUS], [1], [Define if supporting gdbus])
- have_dbus=yes
-else
- SPICE_WARNING([No D-Bus support, desktop integration and USB redirection may not work properly])
-fi
-
AC_ARG_ENABLE([alignment-checks],
AS_HELP_STRING([--enable-alignment-checks],
[Enable runtime checks for cast alignment @<:@default=no@:>@]),
@@ -540,7 +526,6 @@ AC_MSG_NOTICE([
SASL support: ${have_sasl}
Smartcard support: ${have_smartcard}
USB redirection support: ${have_usbredir} ${with_usbredir_hotplug}
- DBus: ${have_dbus}
WebDAV support: ${have_phodav}
LZ4 support: ${have_lz4}
diff --git a/meson.build b/meson.build
index 75a2c441..a3eca829 100644
--- a/meson.build
+++ b/meson.build
@@ -279,13 +279,6 @@ if spice_gtk_has_introspection and get_option('vapi')
spice_gtk_has_vala = true
endif
-# dbus
-if get_option('dbus')
- spice_gtk_config_data.set('USE_GDBUS', '1')
-else
- warning('No D-Bus support, desktop integration and USB redirection may not work properly')
-endif
-
# lz4
spice_gtk_has_lz4 = false
d = dependency('liblz4', required : get_option('lz4'))
diff --git a/meson_options.txt b/meson_options.txt
index 42538255..ff4654d1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -52,11 +52,6 @@ option('vapi',
value : true,
description: 'Check for vala requirements')
-option('dbus',
- type : 'boolean',
- value : true,
- description: 'Enable dbus support for desktop integration (disabling automount)')
-
option('alignment-checks',
type : 'boolean',
value : false,
diff --git a/src/desktop-integration.c b/src/desktop-integration.c
index a0d5b006..6430801f 100644
--- a/src/desktop-integration.c
+++ b/src/desktop-integration.c
@@ -30,7 +30,7 @@
#define GNOME_SESSION_INHIBIT_AUTOMOUNT 16
-#if defined(USE_GDBUS) && defined(G_OS_UNIX) && !__APPLE__
+#if defined(G_OS_UNIX) && !__APPLE__
# define WITH_GNOME
#endif
--
2.20.1
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel