Commit d75ae314 authored by Robert Ancell's avatar Robert Ancell Committed by Ray Strode

act-user-manager: Remove ConsoleKit support

ConsoleKit is very much dead and replaced by logind or elogind.
parent 033cde3c
Pipeline #112012 passed with stage
in 1 minute and 10 seconds
...@@ -194,18 +194,11 @@ config_h.set('MINIMUM_UID', get_option('minimum_uid')) ...@@ -194,18 +194,11 @@ config_h.set('MINIMUM_UID', get_option('minimum_uid'))
gdm_conf_file = get_option('gdmconffile') gdm_conf_file = get_option('gdmconffile')
config_h.set_quoted('PATH_GDM_CUSTOM', gdm_conf_file) config_h.set_quoted('PATH_GDM_CUSTOM', gdm_conf_file)
enable_systemd = get_option('systemd') if get_option('elogind')
enable_elogind = get_option('elogind')
assert(not enable_systemd or not enable_elogind, 'systemd and elogind support requested, please choose only one.')
if enable_systemd
logind_dep = dependency('libsystemd', version: '>= 186')
endif
if enable_elogind
logind_dep = dependency('libelogind', version: '>= 229.4') logind_dep = dependency('libelogind', version: '>= 229.4')
else
logind_dep = dependency('libsystemd', version: '>= 186')
endif endif
config_h.set('WITH_SYSTEMD', enable_systemd or enable_elogind)
subdir('data') subdir('data')
subdir('src') subdir('src')
......
...@@ -6,7 +6,6 @@ option('user_heuristics', type: 'boolean', value: true, description: 'Enable heu ...@@ -6,7 +6,6 @@ option('user_heuristics', type: 'boolean', value: true, description: 'Enable heu
option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of') option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
option('minimum_uid', type: 'integer', value: 1000, description: 'Set minimum uid for human users') option('minimum_uid', type: 'integer', value: 1000, description: 'Set minimum uid for human users')
option('systemd', type: 'boolean', value: false, description: 'Use systemd')
option('elogind', type: 'boolean', value: false, description: 'Use elogind') option('elogind', type: 'boolean', value: false, description: 'Use elogind')
option('introspection', type: 'boolean', value: true, description: 'Enable introspection for this build') option('introspection', type: 'boolean', value: true, description: 'Enable introspection for this build')
......
This diff is collapsed.
...@@ -28,44 +28,20 @@ enum_sources = gnome.mkenums( ...@@ -28,44 +28,20 @@ enum_sources = gnome.mkenums(
install_dir: join_paths(act_pkgincludedir, subdir), install_dir: join_paths(act_pkgincludedir, subdir),
) )
dbus_sources = []
ifaces = [
'Manager',
'Seat',
'Session',
]
namespace = 'ConsoleKit'
prefix = 'org.freedesktop.' + namespace
foreach iface: ifaces
dbus_sources += gnome.gdbus_codegen(
'ck-@0@-generated'.format(iface.to_lower()),
'@0@.@1@.xml'.format(prefix, iface),
interface_prefix: prefix,
namespace: namespace,
extra_args: ['--glib-min-required', '2.64'],
)
endforeach
deps = [ deps = [
crypt_dep, crypt_dep,
gio_unix_dep, gio_unix_dep,
glib_dep, glib_dep,
libaccounts_generated_dep, libaccounts_generated_dep,
logind_dep,
] ]
symbol_map = join_paths(meson.current_source_dir(), 'symbol.map') symbol_map = join_paths(meson.current_source_dir(), 'symbol.map')
ldflags = cc.get_supported_link_arguments('-Wl,--version-script,@0@'.format(symbol_map)) ldflags = cc.get_supported_link_arguments('-Wl,--version-script,@0@'.format(symbol_map))
if enable_systemd or enable_elogind
deps += logind_dep
endif
libaccountsservice = shared_library( libaccountsservice = shared_library(
act_name, act_name,
sources: sources + enum_sources + dbus_sources, sources: sources + enum_sources,
version: libversion, version: libversion,
include_directories: top_inc, include_directories: top_inc,
dependencies: deps, dependencies: deps,
......
<?xml version="1.0" encoding="UTF-8"?>
<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
<interface name="org.freedesktop.ConsoleKit.Seat">
<doc:doc>
<doc:description>
<doc:para>A seat is a collection of sessions and a set of hardware (usually at
least a keyboard and mouse). Only one session may be active on a
seat at a time.</doc:para>
</doc:description>
</doc:doc>
<method name="GetId">
<arg name="sid" direction="out" type="o">
<doc:doc>
<doc:summary>Seat ID</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>Returns the ID for Seat.</doc:para>
</doc:description>
</doc:doc>
</method>
<method name="GetSessions">
<arg name="sessions" direction="out" type="ao">
<doc:doc>
<doc:summary>an array of Session IDs</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>This gets a list of all the <doc:ref type="interface" to="Session">Sessions</doc:ref>
that are currently attached to this seat.</doc:para>
<doc:para>Each Session ID is an D-Bus object path for the object that implements the
<doc:ref type="interface" to="Session">Session</doc:ref> interface.</doc:para>
</doc:description>
</doc:doc>
</method>
<method name="GetDevices">
<arg name="devices" direction="out" type="a(ss)">
<doc:doc>
<doc:summary>an array of devices</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>This gets a list of all the devices
that are currently associated with this seat.</doc:para>
<doc:para>Each device is an D-Bus structure that represents
the device type and the device id.
</doc:para>
</doc:description>
</doc:doc>
</method>
<method name="GetActiveSession">
<arg name="ssid" direction="out" type="o">
<doc:doc>
<doc:summary>Session ID</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>Gets the Session ID that is currently active on this Seat.</doc:para>
<doc:para>Returns NULL if there is no active session.</doc:para>
</doc:description>
</doc:doc>
</method>
<method name="CanActivateSessions">
<arg name="can_activate" direction="out" type="b">
<doc:doc>
<doc:summary>TRUE if seat supports session activation</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description><doc:para>Used to determine whether the seat supports session activation.</doc:para>
</doc:description>
</doc:doc>
</method>
<method name="ActivateSession">
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<arg name="ssid" direction="in" type="o">
<doc:doc>
<doc:summary>Session ID</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>Attempt to activate the specified session. In most
cases, if successful, this will cause the session to
become visible and take control of the hardware that is
associated with this seat.</doc:para>
</doc:description>
<doc:seealso><doc:ref type="method" to="Session.Activate">Activate()</doc:ref></doc:seealso>
</doc:doc>
</method>
<signal name="ActiveSessionChanged">
<arg name="ssid" type="o">
<doc:doc>
<doc:summary>Session ID</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>Emitted when the active session has changed.</doc:para>
</doc:description>
</doc:doc>
</signal>
<signal name="SessionAdded">
<arg name="ssid" type="o">
<doc:doc>
<doc:summary>Session ID</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>Emitted when a session has been added to the seat.</doc:para>
</doc:description>
</doc:doc>
</signal>
<signal name="SessionRemoved">
<arg name="ssid" type="o">
<doc:doc>
<doc:summary>Session ID</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>Emitted when a session has been removed from the seat.</doc:para>
</doc:description>
</doc:doc>
</signal>
<signal name="DeviceAdded">
<arg name="device" type="(ss)">
<doc:doc>
<doc:summary>Device structure</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>Emitted when a device has been associated with the seat.</doc:para>
</doc:description>
</doc:doc>
</signal>
<signal name="DeviceRemoved">
<arg name="device" type="(ss)">
<doc:doc>
<doc:summary>Device structure</doc:summary>
</doc:doc>
</arg>
<doc:doc>
<doc:description>
<doc:para>Emitted when a device has been dissociated from the seat.</doc:para>
</doc:description>
</doc:doc>
</signal>
</interface>
</node>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment