GNOME.org
 

tracker r2188 - in branches/indexer-split: . src/tracker-indexer src/trackerd

Author: ifrade
Date: Fri Aug 29 13:38:01 2008
New Revision: 2188
URL: http://svn.gnome.org/viewvc/tracker?rev=2188&view=rev

Log:
Pass context and not false to tracker_dbus_async_return_if_fail

Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-indexer/tracker-indexer.c
   branches/indexer-split/src/trackerd/tracker-daemon.c
   branches/indexer-split/src/trackerd/tracker-files.c
   branches/indexer-split/src/trackerd/tracker-keywords.c
   branches/indexer-split/src/trackerd/tracker-metadata.c

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c	Fri Aug 29 13:38:01 2008
@@ -1963,7 +1963,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
+	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to pause the indexer");
@@ -2003,7 +2003,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
+	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to pause the indexer for %d seconds",
@@ -2040,7 +2040,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
+	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
 
 	tracker_dbus_request_new (request_id,
                                   "DBus request to continue the indexer");
@@ -2081,8 +2081,8 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
-	tracker_dbus_async_return_if_fail (files != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
+	tracker_dbus_async_return_if_fail (files != NULL, context);
 
 	tracker_dbus_request_new (request_id,
                                   "DBus request to check %d files",
@@ -2153,9 +2153,9 @@
 	GError *actual_error;
 	PathInfo *info;
 
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
-	tracker_dbus_async_return_if_fail (from != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (to != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
+	tracker_dbus_async_return_if_fail (from != NULL, context);
+	tracker_dbus_async_return_if_fail (to != NULL, context);
 
 	request_id = tracker_dbus_get_next_request_id ();
 
@@ -2207,12 +2207,12 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (property != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (values != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (values) > 0, FALSE);
+	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (property != NULL, context);
+	tracker_dbus_async_return_if_fail (values != NULL, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (values) > 0, context);
 
 	tracker_dbus_request_new (request_id,
                                   "DBus request to set %d values in property '%s' for file '%s' ",
@@ -2254,11 +2254,11 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (property != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (values != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (property != NULL, context);
+	tracker_dbus_async_return_if_fail (values != NULL, context);
 
 	tracker_dbus_request_new (request_id,
                                   "DBus request to remove %d values in property '%s' for file '%s' ",
@@ -2291,7 +2291,7 @@
 {
 	guint request_id;
 
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
+	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
 
 	request_id = tracker_dbus_get_next_request_id ();
 	tracker_dbus_request_new (request_id,

Modified: branches/indexer-split/src/trackerd/tracker-daemon.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-daemon.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-daemon.c	Fri Aug 29 13:38:01 2008
@@ -494,7 +494,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (option != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (option != NULL, context);
 
 	priv = TRACKER_DAEMON_GET_PRIVATE (object);
 
@@ -595,7 +595,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (option != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (option != NULL, context);
 
 	priv = TRACKER_DAEMON_GET_PRIVATE (object);
 

Modified: branches/indexer-split/src/trackerd/tracker-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-files.c	Fri Aug 29 13:38:01 2008
@@ -112,7 +112,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to see if files exist, "
@@ -164,10 +164,10 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (mime != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (size >= 0, FALSE);
-	tracker_dbus_async_return_if_fail (mtime >= 0, FALSE);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (mime != NULL, context);
+	tracker_dbus_async_return_if_fail (size >= 0, context);
+	tracker_dbus_async_return_if_fail (mtime >= 0, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to create file, "
@@ -203,7 +203,7 @@
 	
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to delete file, "
@@ -243,7 +243,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get service type ",
@@ -338,10 +338,10 @@
 					 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (offset >= 0, FALSE);
-	tracker_dbus_async_return_if_fail (max_length >= 0, FALSE);
-	tracker_dbus_async_return_if_fail (value != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (offset >= 0, context);
+	tracker_dbus_async_return_if_fail (max_length >= 0, context);
+	tracker_dbus_async_return_if_fail (value != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get text contents, "
@@ -426,9 +426,9 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (text != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (max_length >= 0, FALSE);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (text != NULL, context);
+	tracker_dbus_async_return_if_fail (max_length >= 0, context);
 	
 	tracker_dbus_request_new (request_id,
 				  "DBus request to search text contents, "
@@ -491,9 +491,9 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (offset >= 0, FALSE);
-	tracker_dbus_async_return_if_fail (max_hits >= 0, FALSE);
+	tracker_dbus_async_return_if_fail (service != NULL, context);
+	tracker_dbus_async_return_if_fail (offset >= 0, context);
+	tracker_dbus_async_return_if_fail (max_hits >= 0, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get files by service type, "
@@ -550,10 +550,10 @@
 					
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (mime_types != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, FALSE);
-	tracker_dbus_async_return_if_fail (offset >= 0, FALSE);
-	tracker_dbus_async_return_if_fail (max_hits >= 0, FALSE);
+	tracker_dbus_async_return_if_fail (mime_types != NULL, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, context);
+	tracker_dbus_async_return_if_fail (offset >= 0, context);
+	tracker_dbus_async_return_if_fail (max_hits >= 0, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get files by mime types, "
@@ -602,10 +602,10 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (mime_types != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, FALSE);
-	tracker_dbus_async_return_if_fail (offset >= 0, FALSE);
-	tracker_dbus_async_return_if_fail (max_hits >= 0, FALSE);
+	tracker_dbus_async_return_if_fail (mime_types != NULL, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, context);
+	tracker_dbus_async_return_if_fail (offset >= 0, context);
+	tracker_dbus_async_return_if_fail (max_hits >= 0, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get files by mime types (VFS), "
@@ -657,7 +657,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request for mtime, "
@@ -717,9 +717,9 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (fields != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (fields) > 0, FALSE);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (fields != NULL, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (fields) > 0, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request for metadata for files in folder, "
@@ -855,9 +855,9 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (text != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (mime_types != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, FALSE);
+	tracker_dbus_async_return_if_fail (text != NULL, context);
+	tracker_dbus_async_return_if_fail (mime_types != NULL, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to search files by text & mime types, "
@@ -918,8 +918,8 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (text != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (text != NULL, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to search files by text & location, "
@@ -981,10 +981,10 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (text != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (mime_types != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (text != NULL, context);
+	tracker_dbus_async_return_if_fail (mime_types != NULL, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to search files by text & mime types & location, "

Modified: branches/indexer-split/src/trackerd/tracker-keywords.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-keywords.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-keywords.c	Fri Aug 29 13:38:01 2008
@@ -126,7 +126,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get keywords list, "
@@ -173,8 +173,8 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get keywords, "
@@ -248,9 +248,9 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (keywords != NULL && *keywords != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (keywords != NULL && *keywords != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to add keywords, "
@@ -327,9 +327,9 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (keywords != NULL && g_strv_length (keywords) > 0, FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (keywords != NULL && g_strv_length (keywords) > 0, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to remove keywords, "
@@ -407,8 +407,8 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to remove all keywords, "
@@ -497,8 +497,8 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (keywords != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (keywords != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to search keywords, "

Modified: branches/indexer-split/src/trackerd/tracker-metadata.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-metadata.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-metadata.c	Fri Aug 29 13:38:01 2008
@@ -144,10 +144,10 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (uri != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (keys != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (keys) > 0, FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (uri != NULL, context);
+	tracker_dbus_async_return_if_fail (keys != NULL, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (keys) > 0, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get metadata values, "
@@ -247,12 +247,12 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (keys != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (values != NULL, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (keys) > 0, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (values) > 0, FALSE);
-	tracker_dbus_async_return_if_fail (g_strv_length (keys) == g_strv_length (values), FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
+	tracker_dbus_async_return_if_fail (keys != NULL, context);
+	tracker_dbus_async_return_if_fail (values != NULL, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (keys) > 0, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (values) > 0, context);
+	tracker_dbus_async_return_if_fail (g_strv_length (keys) == g_strv_length (values), context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to set metadata keys, "
@@ -353,7 +353,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (metadata != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (metadata != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get metadata details, "
@@ -397,7 +397,7 @@
 
 	request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_dbus_async_return_if_fail (service_type != NULL, FALSE);
+	tracker_dbus_async_return_if_fail (service_type != NULL, context);
 
 	tracker_dbus_request_new (request_id,
 				  "DBus request to get registered metadata types, "
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]