applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user-accounts: Simplify the fingerprint manager fetching

Browse source 
Code styling fix.
This commit is contained in:
Bastien Nocera 2016-10-13 16:10:32 +02:00
parent fa14bc5262
commit a396e0578a
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
panels/user-accounts/um-fingerprint-dialog.c
View file

@ -62,10 +62,14 @@ typedef struct {
gint state; gint state;
} EnrollData; } EnrollData;
static void create_manager (void) static void
ensure_manager (void)
{ {
GError *error = NULL; GError *error = NULL;
if (manager != NULL)
return;
connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
if (connection == NULL) { if (connection == NULL) {
g_warning ("Failed to connect to session bus: %s", error->message); g_warning ("Failed to connect to session bus: %s", error->message);
@ -183,12 +187,9 @@ set_fingerprint_label (GtkWidget *button)
GVariantIter *fingers; GVariantIter *fingers;
GError *error = NULL; GError *error = NULL;
if (manager == NULL) { ensure_manager ();
create_manager (); if (manager == NULL)
if (manager == NULL) { return FALSE;
return FALSE;
}
}
device = get_first_device (); device = get_first_device ();
if (device == NULL) if (device == NULL)
@ -232,11 +233,9 @@ delete_fingerprints (void)
GDBusProxy *device; GDBusProxy *device;
GVariant *result; GVariant *result;
if (manager == NULL) { ensure_manager ();
create_manager (); if (manager == NULL)
if (manager == NULL) return;
return;
}
device = get_first_device (); device = get_first_device ();
if (device == NULL) if (device == NULL)
@ -614,7 +613,7 @@ enroll_fingerprints (GtkWindow *parent,
GtkWidget *editable_button, GtkWidget *editable_button,
ActUser *user) ActUser *user)
{ {
GDBusProxy *device; GDBusProxy *device = NULL;
GtkBuilder *dialog; GtkBuilder *dialog;
EnrollData *data; EnrollData *data;
GtkWidget *ass; GtkWidget *ass;
@ -622,15 +621,9 @@ enroll_fingerprints (GtkWindow *parent,
GVariant *result; GVariant *result;
GError *error = NULL; GError *error = NULL;
device = NULL; ensure_manager ();
if (manager != NULL)
if (manager == NULL) {
create_manager ();
if (manager != NULL)
device = get_first_device ();
} else {
device = get_first_device (); device = get_first_device ();
}
if (manager == NULL || device == NULL) { if (manager == NULL || device == NULL) {
GtkWidget *d; GtkWidget *d;