]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Fix warning about error propagation
authorRobert Ancell <robert.ancell@canonical.com>
Mon, 11 Jul 2016 22:49:21 +0000 (10:49 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Mon, 11 Jul 2016 22:49:21 +0000 (10:49 +1200)
liblightdm-gobject/greeter.c

index 49da7d44d1b61ea88dd6b2540b55f91e4383293d..62cb30d623fb67e651967912e730a37d245df902 100644 (file)
@@ -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);
 }