tracker r2619 - in trunk: . src/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Mon Dec  1 12:01:07 2008
New Revision: 2619
URL: http://svn.gnome.org/viewvc/tracker?rev=2619&view=rev

Log:
Reporting errors correctly in dbus.

Modified:
   trunk/ChangeLog
   trunk/src/trackerd/tracker-metadata.c

Modified: trunk/src/trackerd/tracker-metadata.c
==============================================================================
--- trunk/src/trackerd/tracker-metadata.c	(original)
+++ trunk/src/trackerd/tracker-metadata.c	Mon Dec  1 12:01:07 2008
@@ -511,7 +511,9 @@
 							    &actual_error);
 
 	if (actual_error) {
-		g_propagate_error (error, actual_error);
+		tracker_dbus_request_failed (request_id, &actual_error, NULL);
+		dbus_g_method_return_error (context, actual_error);
+		g_error_free (actual_error);
 		return;
 	}
 
@@ -570,7 +572,9 @@
 								  &actual_error);
 	
 	if (actual_error) {
-		g_propagate_error (error, actual_error);
+		tracker_dbus_request_failed (request_id, &actual_error, NULL);
+		dbus_g_method_return_error (context, actual_error);
+		g_error_free (actual_error);
 		return;
 	}
 
@@ -613,8 +617,8 @@
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get unique values with count and sum, "
-				  "service type:'%s', query '%s'"
-				  "count field :'%s'",
+				  "service type:'%s', query '%s', "
+				  "count field :'%s', "
 				  "sum field :'%s'",
 				  service_type,
 				  query_condition,
@@ -633,7 +637,9 @@
 									  &actual_error);
 
 	if (actual_error) {
-		g_propagate_error (error, actual_error);
+		tracker_dbus_request_failed (request_id, &actual_error, NULL);
+		dbus_g_method_return_error (context, actual_error);
+		g_error_free (actual_error);
 		return;
 	}
 
@@ -681,7 +687,9 @@
 					   &actual_error);
 
 	if (actual_error) {
-		g_propagate_error (error, actual_error);
+		tracker_dbus_request_failed (request_id, &actual_error, NULL);
+		dbus_g_method_return_error (context, actual_error);
+		g_error_free (actual_error);
 		return;
 	}
 
@@ -722,7 +730,9 @@
 					       &actual_error);
 
 	if (actual_error) {
-		g_propagate_error (error, actual_error);
+		tracker_dbus_request_failed (request_id, &actual_error, NULL);
+		dbus_g_method_return_error (context, actual_error);
+		g_error_free (actual_error);
 		return;
 	}