tracker r1393 - branches/indexer-split/src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Mon May 12 11:41:25 2008
New Revision: 1393
URL: http://svn.gnome.org/viewvc/tracker?rev=1393&view=rev

Log:
Added parent session to searches

Modified:
   branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
   branches/indexer-split/src/trackerd/tracker-xesam-live-search.h
   branches/indexer-split/src/trackerd/tracker-xesam-session.c
   branches/indexer-split/src/trackerd/tracker-xesam-session.h
   branches/indexer-split/src/trackerd/tracker-xesam.h

Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.c	Mon May 12 11:41:25 2008
@@ -26,6 +26,7 @@
 
 
 struct _TrackerXesamLiveSearchPriv {
+	TrackerXesamSession *session;
 	gchar *search_id;
 	gboolean active;
 	gboolean closed;
@@ -46,11 +47,23 @@
 {
 	TrackerXesamLiveSearch *self = (TrackerXesamLiveSearch *) object;
 	TrackerXesamLiveSearchPriv *priv = self->priv;
+	if (priv->session)
+		g_object_unref (priv->session);
 	g_free (priv->search_id);
 	g_free (priv->query);
 }
 
 void
+tracker_xesam_live_search_set_session (TrackerXesamLiveSearch *self, 
+				       gpointer session)
+{
+	TrackerXesamLiveSearchPriv *priv = self->priv;
+	if (priv->session)
+		g_object_unref (priv->session);
+	priv->session = g_object_ref (session);
+}
+
+void
 tracker_xesam_live_search_set_xml_query (TrackerXesamLiveSearch *self, const gchar *query)
 {
 	TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -102,6 +115,7 @@
 tracker_xesam_live_search_init (TrackerXesamLiveSearch *self) 
 {
 	TrackerXesamLiveSearchPriv *priv = self->priv;
+	priv->session = NULL;
 	priv->search_id = NULL;
 	priv->active = FALSE;
 	priv->closed = FALSE;

Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.h	Mon May 12 11:41:25 2008
@@ -56,6 +56,8 @@
 const gchar* tracker_xesam_live_search_get_query          (TrackerXesamLiveSearch  *self);
 void         tracker_xesam_live_search_set_xml_query      (TrackerXesamLiveSearch *self, 
 							   const gchar *xml_query);
+void         tracker_xesam_live_search_set_session        (TrackerXesamLiveSearch *self, 
+							   gpointer session);
 void         tracker_xesam_live_search_activate           (TrackerXesamLiveSearch  *self,
 							   GError                 **error);
 gboolean     tracker_xesam_live_search_is_active          (TrackerXesamLiveSearch  *self);

Modified: branches/indexer-split/src/trackerd/tracker-xesam-session.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-session.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-session.c	Mon May 12 11:41:25 2008
@@ -375,6 +375,7 @@
 
 	search = tracker_xesam_live_search_new (query_xml);
 	tracker_xesam_live_search_set_id (search, tracker_xesam_generate_unique_key ());
+	tracker_xesam_live_search_set_session (search, self);
 
 	g_hash_table_insert (priv->searches, 
 		g_strdup (tracker_xesam_live_search_get_id (search)),

Modified: branches/indexer-split/src/trackerd/tracker-xesam-session.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-session.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-session.h	Mon May 12 11:41:25 2008
@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "tracker-xesam.h"
+
 #include "tracker-xesam-live-search.h"
 #include "tracker-dbus-xesam.h"
 
@@ -41,7 +43,6 @@
 
 #define TRACKER_TYPE_XESAM_STRV_ARRAY (dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRV))
 
-typedef struct _TrackerXesamSession TrackerXesamSession;
 typedef struct _TrackerXesamSessionClass TrackerXesamSessionClass;
 typedef struct _TrackerXesamSessionPriv TrackerXesamSessionPriv;
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.h	Mon May 12 11:41:25 2008
@@ -22,6 +22,8 @@
 #ifndef __TRACKERD_XESAM_H__
 #define __TRACKERD_XESAM_H__
 
+typedef struct _TrackerXesamSession TrackerXesamSession;
+
 #include "tracker-utils.h"
 #include "tracker-dbus.h"
 #include "tracker-xesam-session.h"
@@ -29,6 +31,7 @@
 
 G_BEGIN_DECLS
 
+
 typedef enum {
 	TRACKER_XESAM_ERROR = 1
 } TrackerXesamErrorDomain;