tracker r1432 - in branches/xesam-support: . src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Wed May 14 13:12:44 2008
New Revision: 1432
URL: http://svn.gnome.org/viewvc/tracker?rev=1432&view=rev

Log:
        * svn merge -r 1429:1431 ../indexer-split/
        * Important crash-fixes by Martyn in indexer-split



Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/src/trackerd/tracker-query-tree.c

Modified: branches/xesam-support/src/trackerd/tracker-query-tree.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-query-tree.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-query-tree.c	Wed May 14 13:12:44 2008
@@ -284,12 +284,17 @@
 	g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
 	g_return_val_if_fail (language != NULL, NULL);
 
+        /* NOTE: The "query" has to come AFTER the "config" and
+         * "language" properties since setting the query actually
+         * uses the priv->config and priv->language settings.
+         * Changing this order results in warnings.
+         */
 	return g_object_new (TRACKER_TYPE_QUERY_TREE,
-			     "query", query_str,
 			     "indexer", indexer,
                              "config", config,
                              "language", language,
 			     "services", services,
+			     "query", query_str,
 			     NULL);
 }