[gcr/nielsdg/remove-dbus-services] gcr: Remove gcr-prompter based D-Bus services




commit 39cc1912e976b680de2bb6e6132d365309be111a
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sun Jun 26 21:30:33 2022 +0200

    gcr: Remove gcr-prompter based D-Bus 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.

 gcr/gcr-dbus-constants.h                         |  4 ----
 gcr/meson.build                                  | 17 -----------------
 gcr/org.gnome.keyring.PrivatePrompter.service.in |  3 ---
 gcr/org.gnome.keyring.SystemPrompter.service.in  |  3 ---
 meson.build                                      |  9 ---------
 5 files changed, 36 deletions(-)
---
diff --git a/gcr/gcr-dbus-constants.h b/gcr/gcr-dbus-constants.h
index e4303d97..c316c569 100644
--- a/gcr/gcr-dbus-constants.h
+++ b/gcr/gcr-dbus-constants.h
@@ -26,10 +26,6 @@
 
 G_BEGIN_DECLS
 
-#define GCR_DBUS_PROMPTER_SYSTEM_BUS_NAME            "org.gnome.keyring.SystemPrompter"
-#define GCR_DBUS_PROMPTER_PRIVATE_BUS_NAME           "org.gnome.keyring.PrivatePrompter"
-#define GCR_DBUS_PROMPTER_MOCK_BUS_NAME              "org.gnome.keyring.MockPrompter"
-
 #define GCR_DBUS_PROMPTER_OBJECT_PATH                "/org/gnome/keyring/Prompter"
 #define GCR_DBUS_PROMPT_OBJECT_PREFIX                "/org/gnome/keyring/Prompt"
 
diff --git a/gcr/meson.build b/gcr/meson.build
index 88428eed..5a9ba05a 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/meson.build b/meson.build
index d50575d6..1a3aa74d 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]