summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels De Graef <nielsdegraef@gmail.com>2022-06-26 21:30:33 +0200
committerNiels De Graef <nielsdegraef@gmail.com>2022-06-26 21:41:05 +0200
commitf316c8919bfcbe2534271e9729084342db3cc9c6 (patch)
tree75529f4d2552f0bf4e1ba466116b979be4e55199
parent8492fc903c7c30d2273c6ee48494037330cc1e6e (diff)
downloadgcr-nielsdg/remove-dbus-services.tar.gz
gcr: Remove gcr-prompter based D-Bus servicesnielsdg/remove-dbus-services
`gcr-prompter` got removed in the gcr4 migration, so keeping these doesn't make sense in any case. If we decide to bring back `gcr-prompter`, we can still revert this commit too.
-rw-r--r--gcr/meson.build17
-rw-r--r--gcr/org.gnome.keyring.PrivatePrompter.service.in3
-rw-r--r--gcr/org.gnome.keyring.SystemPrompter.service.in3
-rw-r--r--meson.build9
4 files changed, 0 insertions, 32 deletions
diff --git a/gcr/meson.build b/gcr/meson.build
index 88428ee..5a9ba05 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -298,23 +298,6 @@ if get_option('ssh_agent')
endforeach
endif
-# Services
-gcr_service_files = [
- 'org.gnome.keyring.SystemPrompter.service',
- 'org.gnome.keyring.PrivatePrompter.service',
-]
-
-foreach service_file : gcr_service_files
- configure_file(
- output: service_file,
- input: service_file + '.in',
- configuration: {
- 'libexecdir': gcr_prefix / get_option('libexecdir'),
- },
- install_dir: dbus_services_dir,
- )
-endforeach
-
# Tests
gcr_test_names = [
'util',
diff --git a/gcr/org.gnome.keyring.PrivatePrompter.service.in b/gcr/org.gnome.keyring.PrivatePrompter.service.in
deleted file mode 100644
index 542a376..0000000
--- a/gcr/org.gnome.keyring.PrivatePrompter.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.keyring.PrivatePrompter
-Exec=@libexecdir@/gcr-prompter
diff --git a/gcr/org.gnome.keyring.SystemPrompter.service.in b/gcr/org.gnome.keyring.SystemPrompter.service.in
deleted file mode 100644
index 8d0063c..0000000
--- a/gcr/org.gnome.keyring.SystemPrompter.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.keyring.SystemPrompter
-Exec=@libexecdir@/gcr-prompter
diff --git a/meson.build b/meson.build
index d50575d..1a3aa74 100644
--- a/meson.build
+++ b/meson.build
@@ -76,15 +76,6 @@ if libsystemd.found() and systemd.found()
with_systemd = true
endif
-dbus_dep = dependency('dbus-1', required: false)
-if dbus_dep.found()
- dbus_services_dir = dbus_dep.get_variable('session_bus_services_dir',
- pkgconfig_define: [ 'datadir', get_option('datadir') ],
- )
-else
- dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
-endif
-
if get_option('gtk3')
gtk3_min_version = '3.22'
gtk3_dep = dependency('gtk+-3.0', version: '>=' + gtk3_min_version)