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

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Mon May 26 09:11:14 2008
New Revision: 1482
URL: http://svn.gnome.org/viewvc/tracker?rev=1482&view=rev

Log:
         svn merge -r 1479:1481 ../indexer-split



Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/src/trackerd/tracker-xesam-live-search.c
   branches/xesam-support/src/trackerd/tracker-xesam-live-search.h
   branches/xesam-support/src/trackerd/tracker-xesam-session.c
   branches/xesam-support/src/trackerd/tracker-xesam.c

Modified: branches/xesam-support/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-live-search.c	Mon May 26 09:11:14 2008
@@ -56,6 +56,7 @@
 
 	g_free (priv->search_id);
 	g_free (priv->query);
+
 	g_free (priv->from_sql);
 	g_free (priv->where_sql);
 }
@@ -724,6 +725,7 @@
 	return (const gchar*) priv->search_id;
 }
 
+
 /**
  * tracker_xesam_live_search_parse_query:
  * @self: a #TrackerXesamLiveSearch

Modified: branches/xesam-support/src/trackerd/tracker-xesam-live-search.h
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-live-search.h	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-live-search.h	Mon May 26 09:11:14 2008
@@ -53,7 +53,6 @@
 void         tracker_xesam_live_search_set_id             (TrackerXesamLiveSearch  *self,
 							   const gchar             *search_id);
 const gchar* tracker_xesam_live_search_get_id             (TrackerXesamLiveSearch  *self);
-
 const gchar* tracker_xesam_live_search_get_where_query    (TrackerXesamLiveSearch  *self);
 const gchar* tracker_xesam_live_search_get_from_query     (TrackerXesamLiveSearch  *self);
 const gchar* tracker_xesam_live_search_get_xml_query      (TrackerXesamLiveSearch  *self);

Modified: branches/xesam-support/src/trackerd/tracker-xesam-session.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-session.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-session.c	Mon May 26 09:11:14 2008
@@ -80,6 +80,7 @@
 
 	priv->session_id = NULL;
 
+
 	priv->searches = g_hash_table_new_full (g_str_hash, g_str_equal, 
 				(GDestroyNotify) g_free,
 				(GDestroyNotify) g_object_unref);

Modified: branches/xesam-support/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam.c	Mon May 26 09:11:14 2008
@@ -210,7 +210,6 @@
 
 	while (sessions) {
 		GList *searches;
-
 		searches = tracker_xesam_session_get_searches (sessions->data);
 
 		while (searches) {
@@ -218,9 +217,7 @@
 			GArray                 *added = NULL;
 			GArray                 *removed = NULL;
 			GArray                 *modified = NULL;
-
 			search = searches->data;
-
 			tracker_xesam_live_search_match_with_events (search, 
 								     &added, 
 								     &removed, 
@@ -231,24 +228,27 @@
 				tracker_xesam_live_search_emit_hits_added (search, added->len);
 			}
 
-			if (added)
+			if (added) {
 				g_array_free (added, TRUE);
+			}
 
 			if (removed && removed->len > 0) {
 				reason_to_live = TRUE;
 				tracker_xesam_live_search_emit_hits_removed (search, removed);
 			}
 
-			if (removed)
+			if (removed) {
 				g_array_free (removed, TRUE);
+			}
 
 			if (modified && modified->len > 0) {
 				reason_to_live = TRUE;
 				tracker_xesam_live_search_emit_hits_modified (search, modified);
 			}
 
-			if (modified)
+			if (modified) {
 				g_array_free (modified, TRUE);
+			}
 
 			searches = g_list_next (searches);
 		}
@@ -284,6 +284,7 @@
 	 * we didn't get a wakeup-call nor we had items to process this loop.
 	 * For a thread we would also have to setup a new DBConnection. */
 
+
 	if (!live_search_handler_running) {
 		live_search_handler_running = TRUE;
 		g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,