tracker r2620 - in trunk: . src/trackerd

[ifrade svn gnome org]

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

Log:
Prevent timeouts in the DBus API returning errors

Modified:
   trunk/ChangeLog
   trunk/src/trackerd/tracker-files.c
   trunk/src/trackerd/tracker-keywords.c

Modified: trunk/src/trackerd/tracker-files.c
==============================================================================
--- trunk/src/trackerd/tracker-files.c	(original)
+++ trunk/src/trackerd/tracker-files.c	Mon Dec  1 13:13:01 2008
@@ -739,7 +739,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;
 	}
 

Modified: trunk/src/trackerd/tracker-keywords.c
==============================================================================
--- trunk/src/trackerd/tracker-keywords.c	(original)
+++ trunk/src/trackerd/tracker-keywords.c	Mon Dec  1 13:13:01 2008
@@ -527,7 +527,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;
 	}