gdm/util: Do not use gjs GDBus proxy wrapper for fprint manager
It only adds more complexity, while we can handle it all manually quite easier now. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2267>
This commit is contained in:
parent
dc4f0f9053
commit
9f3a9f8f2c
@ -14,8 +14,8 @@ import {loadInterfaceXML} from '../misc/fileUtils.js';
|
|||||||
import * as Params from '../misc/params.js';
|
import * as Params from '../misc/params.js';
|
||||||
import * as SmartcardManager from '../misc/smartcardManager.js';
|
import * as SmartcardManager from '../misc/smartcardManager.js';
|
||||||
|
|
||||||
const FprintManagerIface = loadInterfaceXML('net.reactivated.Fprint.Manager');
|
const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(
|
||||||
const FprintManagerProxy = Gio.DBusProxy.makeProxyWrapper(FprintManagerIface);
|
loadInterfaceXML('net.reactivated.Fprint.Manager'));
|
||||||
const FprintDeviceIface = loadInterfaceXML('net.reactivated.Fprint.Device');
|
const FprintDeviceIface = loadInterfaceXML('net.reactivated.Fprint.Device');
|
||||||
const FprintDeviceProxy = Gio.DBusProxy.makeProxyWrapper(FprintDeviceIface);
|
const FprintDeviceProxy = Gio.DBusProxy.makeProxyWrapper(FprintDeviceIface);
|
||||||
|
|
||||||
@ -125,12 +125,15 @@ export class ShellUserVerifier extends Signals.EventEmitter {
|
|||||||
this._updateDefaultService.bind(this));
|
this._updateDefaultService.bind(this));
|
||||||
this._updateDefaultService();
|
this._updateDefaultService();
|
||||||
|
|
||||||
this._fprintManager = new FprintManagerProxy(Gio.DBus.system,
|
this._fprintManager = new Gio.DBusProxy({
|
||||||
'net.reactivated.Fprint',
|
g_connection: Gio.DBus.system,
|
||||||
'/net/reactivated/Fprint/Manager',
|
g_name: 'net.reactivated.Fprint',
|
||||||
null,
|
g_object_path: '/net/reactivated/Fprint/Manager',
|
||||||
null,
|
g_interface_name: FprintManagerInfo.name,
|
||||||
Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES);
|
g_interface_info: FprintManagerInfo,
|
||||||
|
g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES,
|
||||||
|
});
|
||||||
|
this._fprintManager.init(null);
|
||||||
this._smartcardManager = SmartcardManager.getSmartcardManager();
|
this._smartcardManager = SmartcardManager.getSmartcardManager();
|
||||||
|
|
||||||
// We check for smartcards right away, since an inserted smartcard
|
// We check for smartcards right away, since an inserted smartcard
|
||||||
|
Loading…
x
Reference in New Issue
Block a user