From 2c51d42acfe6d824b09080e5727a1ddc83001d64 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 27 Apr 2012 17:51:18 -0400 Subject: [PATCH] gdm: don't fail if fprintd unavailable fingerprint support is optional so we shouldn't try to start fprintd upfront and croak if it fails. https://bugzilla.gnome.org/show_bug.cgi?id=675006 (cherry picked from commit e333263fd646cee7b235e181db7dd96a6bf0735e) --- js/gdm/fingerprint.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/js/gdm/fingerprint.js b/js/gdm/fingerprint.js index 9c090b08a..13362c268 100644 --- a/js/gdm/fingerprint.js +++ b/js/gdm/fingerprint.js @@ -11,10 +11,17 @@ const FprintManagerIface = ; -const FprintManagerProxy = Gio.DBusProxy.makeProxyWrapper(FprintManagerIface); +const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface); function FprintManager() { - return new FprintManagerProxy(Gio.DBus.system, - 'net.reactivated.Fprint', - '/net/reactivated/Fprint/Manager'); -}; + var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system, + g_interface_name: FprintManagerInfo.name, + g_interface_info: FprintManagerInfo, + g_name: 'net.reactivated.Fprint', + g_object_path: '/net/reactivated/Fprint/Manager', + g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START | + Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) }); + + self.init(null); + return self; +}