summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Georg <mail@jensge.org>2014-05-24 19:04:30 +0200
committerJens Georg <mail@jensge.org>2014-05-24 19:04:30 +0200
commitbbff7f8836557e501736f3a61ea24538bad1bccd (patch)
treee4a85f1121a64a4f7834988622ddd38f1908bf35
parent8abfa8082997bf59cd20aba2bd86de0eb3f88279 (diff)
downloadgupnp-bbff7f8836557e501736f3a61ea24538bad1bccd.tar.gz
Use g_propagate_error
Signed-off-by: Jens Georg <mail@jensge.org>
-rw-r--r--libgupnp/gupnp-service-proxy.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c
index ec1253b..9747889 100644
--- a/libgupnp/gupnp-service-proxy.c
+++ b/libgupnp/gupnp-service-proxy.c
@@ -1440,11 +1440,7 @@ gupnp_service_proxy_end_action_list (GUPnPServiceProxy *proxy,
/* Check for saved error from begin_action() */
if (action->error) {
- if (error)
- *error = action->error;
- else
- g_error_free (action->error);
-
+ g_propagate_error (error, action->error);
gupnp_service_proxy_action_free (action);
return FALSE;
@@ -1511,11 +1507,7 @@ gupnp_service_proxy_end_action_hash (GUPnPServiceProxy *proxy,
/* Check for saved error from begin_action() */
if (action->error) {
- if (error)
- *error = action->error;
- else
- g_error_free (action->error);
-
+ g_propagate_error (error, action->error);
gupnp_service_proxy_action_free (action);
return FALSE;