From: Robert Ancell <robert.ancell@canonical.com>
Date: Mon, 11 Jul 2016 22:49:21 +0000 (+1200)
Subject: Fix warning about error propagation
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/2d6be78517d5a95c50dfb475ee11745dd8a6b025

Fix warning about error propagation
---

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);
 }