[tracker/rss-enclosures] Steroids client: don't run callback if call was cancelled



commit 0f29f43d870752744f0ecb26e144762ac42c2786
Author: Adrien Bustany <abustany gnome org>
Date:   Wed Jun 16 10:49:35 2010 -0400

    Steroids client: don't run callback if call was cancelled

 src/libtracker-client/tracker.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/libtracker-client/tracker.c b/src/libtracker-client/tracker.c
index 60a5d85..3a47098 100644
--- a/src/libtracker-client/tracker.c
+++ b/src/libtracker-client/tracker.c
@@ -588,14 +588,16 @@ fast_async_callback_iterator (GObject      *source_object,
 	g_object_unref (data->output_stream);
 
 	if (inner_error) {
-		g_set_error (&error,
-		             TRACKER_CLIENT_ERROR,
-		             TRACKER_CLIENT_ERROR_BROKEN_PIPE,
-		             "Couldn't get results from server");
-		g_error_free (inner_error);
+		if (inner_error->code != G_IO_ERROR_CANCELLED) {
+			g_set_error (&error,
+			             TRACKER_CLIENT_ERROR,
+			             TRACKER_CLIENT_ERROR_BROKEN_PIPE,
+			             "Couldn't get results from server");
+			(* data->iterator_callback) (NULL, error, data->user_data);
+		}
 		tracker_result_iterator_free (iterator);
 		dbus_pending_call_unref (data->dbus_call);
-		(* data->iterator_callback) (NULL, error, data->user_data);
+		g_error_free (inner_error);
 		return;
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]