mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-09 04:13:33 +02:00
Remove all use of g_error()
Otherwise we get bug reports about crashers that aren't crashers.
This commit is contained in:
@ -31,8 +31,10 @@ static void create_manager(void)
|
||||
GError *error = NULL;
|
||||
|
||||
connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
|
||||
if (connection == NULL)
|
||||
g_error("Failed to connect to session bus: %s", error->message);
|
||||
if (connection == NULL) {
|
||||
g_print("Failed to connect to session bus: %s\n", error->message);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
manager = dbus_g_proxy_new_for_name(connection,
|
||||
"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
|
||||
@ -45,8 +47,10 @@ static DBusGProxy *open_device(const char *username)
|
||||
gchar *path;
|
||||
DBusGProxy *dev;
|
||||
|
||||
if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error))
|
||||
g_error("list_devices failed: %s", error->message);
|
||||
if (!net_reactivated_Fprint_Manager_get_default_device(manager, &path, &error)) {
|
||||
g_print("list_devices failed: %s\n", error->message);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
if (path == NULL) {
|
||||
g_print("No devices found\n");
|
||||
@ -61,8 +65,10 @@ static DBusGProxy *open_device(const char *username)
|
||||
|
||||
g_free (path);
|
||||
|
||||
if (!net_reactivated_Fprint_Device_claim(dev, username, &error))
|
||||
g_error("failed to claim device: %s", error->message);
|
||||
if (!net_reactivated_Fprint_Device_claim(dev, username, &error)) {
|
||||
g_print("failed to claim device: %s\n", error->message);
|
||||
exit (1);
|
||||
}
|
||||
return dev;
|
||||
}
|
||||
|
||||
@ -84,8 +90,10 @@ static void do_enroll(DBusGProxy *dev)
|
||||
&enroll_completed, NULL);
|
||||
|
||||
g_print("Enrolling right index finger.\n");
|
||||
if (!net_reactivated_Fprint_Device_enroll_start(dev, "right-index-finger", &error))
|
||||
g_error("EnrollStart failed: %s", error->message);
|
||||
if (!net_reactivated_Fprint_Device_enroll_start(dev, "right-index-finger", &error)) {
|
||||
g_print("EnrollStart failed: %s\n", error->message);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
while (!enroll_completed)
|
||||
g_main_context_iteration(NULL, TRUE);
|
||||
@ -93,15 +101,19 @@ static void do_enroll(DBusGProxy *dev)
|
||||
dbus_g_proxy_disconnect_signal(dev, "EnrollStatus",
|
||||
G_CALLBACK(enroll_result), &enroll_completed);
|
||||
|
||||
if (!net_reactivated_Fprint_Device_enroll_stop(dev, &error))
|
||||
g_error("VerifyStop failed: %s", error->message);
|
||||
if (!net_reactivated_Fprint_Device_enroll_stop(dev, &error)) {
|
||||
g_print("VerifyStop failed: %s\n", error->message);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
static void release_device(DBusGProxy *dev)
|
||||
{
|
||||
GError *error = NULL;
|
||||
if (!net_reactivated_Fprint_Device_release(dev, &error))
|
||||
g_error("ReleaseDevice failed: %s", error->message);
|
||||
if (!net_reactivated_Fprint_Device_release(dev, &error)) {
|
||||
g_print("ReleaseDevice failed: %s\n", error->message);
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
|
||||
Reference in New Issue
Block a user