summaryrefslogtreecommitdiff
path: root/liblightdm-gobject/greeter.c
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2016-07-12 10:49:21 +1200
committerRobert Ancell <robert.ancell@canonical.com>2016-07-12 10:49:21 +1200
commitd388dfaee596bd163c2580201d121b2b552b876d (patch)
treef1600146a8535de3ef8df716bea697bc2897dda2 /liblightdm-gobject/greeter.c
parent1af9195bda0f29b70f8ecd6069d82b7efc09d890 (diff)
downloadlightdm-git-d388dfaee596bd163c2580201d121b2b552b876d.tar.gz
Fix warning about error propagation
Diffstat (limited to 'liblightdm-gobject/greeter.c')
-rw-r--r--liblightdm-gobject/greeter.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 49da7d44..62cb30d6 100644
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -976,8 +976,9 @@ lightdm_greeter_connect_to_daemon_finish (LightDMGreeter *greeter, GAsyncResult
Request *request = REQUEST (result);
g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
-
- g_propagate_error (error, request->error);
+
+ if (request->error)
+ g_propagate_error (error, request->error);
return request->result;
}
@@ -1637,7 +1638,8 @@ lightdm_greeter_start_session_finish (LightDMGreeter *greeter, GAsyncResult *res
g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
- g_propagate_error (error, request->error);
+ if (request->error)
+ g_propagate_error (error, request->error);
return request->result;
}
@@ -1739,7 +1741,8 @@ lightdm_greeter_ensure_shared_data_dir_finish (LightDMGreeter *greeter, GAsyncRe
g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
- g_propagate_error (error, request->error);
+ if (request->error)
+ g_propagate_error (error, request->error);
return g_strdup (request->dir);
}