[geocode-glib] lib: Use g_simple_async_result_take_error()
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geocode-glib] lib: Use g_simple_async_result_take_error()
- Date: Thu, 4 Jul 2013 14:40:36 +0000 (UTC)
commit 40e4f4d96e19b5c965e4f7355d75265bf9a33071
Author: Bastien Nocera <hadess hadess net>
Date: Thu Jul 4 16:30:28 2013 +0200
lib: Use g_simple_async_result_take_error()
geocode-glib/geocode-forward.c | 9 +++------
geocode-glib/geocode-ipclient.c | 6 ++----
geocode-glib/geocode-reverse.c | 9 +++------
3 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/geocode-glib/geocode-forward.c b/geocode-glib/geocode-forward.c
index d05522d..fc186b0 100644
--- a/geocode-glib/geocode-forward.c
+++ b/geocode-glib/geocode-forward.c
@@ -278,10 +278,9 @@ on_query_data_loaded (GObject *source_forward,
NULL,
NULL,
&error) == FALSE) {
- g_simple_async_result_set_from_error (simple, error);
+ g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
- g_error_free (error);
return;
}
@@ -291,10 +290,9 @@ on_query_data_loaded (GObject *source_forward,
ret = _geocode_parse_single_result_json (contents, &error);
if (ret == NULL) {
- g_simple_async_result_set_from_error (simple, error);
+ g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
- g_error_free (error);
g_free (contents);
return;
}
@@ -347,10 +345,9 @@ on_cache_data_loaded (GObject *source_forward,
g_free (contents);
if (ret == NULL) {
- g_simple_async_result_set_from_error (simple, error);
+ g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
- g_error_free (error);
return;
}
diff --git a/geocode-glib/geocode-ipclient.c b/geocode-glib/geocode-ipclient.c
index eb2d2cb..7c688e9 100644
--- a/geocode-glib/geocode-ipclient.c
+++ b/geocode-glib/geocode-ipclient.c
@@ -256,18 +256,16 @@ query_callback (GObject *source_forward,
NULL,
NULL,
&error) == FALSE) {
- g_simple_async_result_set_from_error (simple, error);
+ g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
- g_error_free (error);
return;
}
if (contents == NULL) {
- g_simple_async_result_set_from_error (simple, error);
+ g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
- g_error_free (error);
return;
}
g_simple_async_result_set_op_res_gpointer (simple, contents, NULL);
diff --git a/geocode-glib/geocode-reverse.c b/geocode-glib/geocode-reverse.c
index 8f4204c..ea39833 100644
--- a/geocode-glib/geocode-reverse.c
+++ b/geocode-glib/geocode-reverse.c
@@ -310,20 +310,18 @@ on_query_data_loaded (GObject *source_object,
NULL,
NULL,
&error) == FALSE) {
- g_simple_async_result_set_from_error (simple, error);
+ g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
- g_error_free (error);
return;
}
ret = _geocode_parse_resolve_json (contents, &error);
if (ret == NULL) {
- g_simple_async_result_set_from_error (simple, error);
+ g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
- g_error_free (error);
g_free (contents);
return;
}
@@ -371,10 +369,9 @@ on_cache_data_loaded (GObject *source_object,
g_free (contents);
if (ret == NULL) {
- g_simple_async_result_set_from_error (simple, error);
+ g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
- g_error_free (error);
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]