summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2018-05-14 15:49:50 -0400
committerMarco Trevisan (TreviƱo) <mail@3v1n0.net>2018-06-04 22:30:52 +0200
commitc58a4f4f1ee1fcf34fdf1fc8f22def7e5455a182 (patch)
treefd58112d6e28c16eba678fe6c35db185bf7c669e
parent64494c1c2f07b2ebc1aa793fa1e9cfc365c8d9d5 (diff)
downloadgdm-c58a4f4f1ee1fcf34fdf1fc8f22def7e5455a182.tar.gz
libgdm: fix pointer/boolean task confusion
The manager fetching code in GdmClient treats its task return value as boolean, but it's actually a pointer (the manager) This commit corrects the confusion. https://bugzilla.gnome.org/show_bug.cgi?id=795940
-rw-r--r--libgdm/gdm-client.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libgdm/gdm-client.c b/libgdm/gdm-client.c
index a88a5d7e..06dfe725 100644
--- a/libgdm/gdm-client.c
+++ b/libgdm/gdm-client.c
@@ -390,11 +390,13 @@ on_got_manager_for_reauthentication (GdmClient *client,
GTask *task)
{
GCancellable *cancellable;
+ GdmManager *manager;
char *username;
GError *error;
error = NULL;
- if (!g_task_propagate_boolean (G_TASK (result), &error)) {
+ manager = g_task_propagate_pointer (G_TASK (result), &error);
+ if (manager == NULL) {
g_task_return_error (task, error);
g_object_unref (task);
return;
@@ -530,10 +532,12 @@ on_got_manager_for_opening_connection (GdmClient *client,
GTask *task)
{
GCancellable *cancellable;
+ GdmManager *manager;
GError *error;
error = NULL;
- if (!g_task_propagate_boolean (G_TASK (result), &error)) {
+ manager = g_task_propagate_pointer (G_TASK (result), &error);
+ if (manager == NULL) {
g_task_return_error (task, error);
g_object_unref (task);
return;