GNOME.org
 

[tracker/tracker-store] tracker-indexer: Remove class signals

commit c102bfb826c23a8657103d02bd8de771bc6e96f2
Author: Jürg Billeter <j bitron ch>
Date:   Tue May 5 15:22:06 2009 +0200

    tracker-indexer: Remove class signals
---
 src/tracker-indexer/Makefile.am       |    4 +-
 src/tracker-indexer/tracker-events.c  |  221 ---------------------------------
 src/tracker-indexer/tracker-events.h  |   47 -------
 src/tracker-indexer/tracker-indexer.c |   84 -------------
 src/tracker-indexer/tracker-indexer.h |    6 -
 src/tracker-indexer/tracker-main.c    |    3 -
 src/trackerd/tracker-resource-class.c |  116 +++++++++---------
 src/trackerd/tracker-resource-class.h |    4 -
 src/trackerd/tracker-resources.c      |   54 --------
 tests/tracker-indexer/Makefile.am     |    5 +-
 10 files changed, 62 insertions(+), 482 deletions(-)

diff --git a/src/tracker-indexer/Makefile.am b/src/tracker-indexer/Makefile.am
index 99dd9c7..c4a3a47 100644
--- a/src/tracker-indexer/Makefile.am
+++ b/src/tracker-indexer/Makefile.am
@@ -54,9 +54,7 @@ tracker_indexer_SOURCES =						\
 	tracker-removable-device.c					\
 	tracker-removable-device.h					\
 	tracker-push.c							\
-	tracker-push.h							\
-	tracker-events.c						\
-	tracker-events.h
+	tracker-push.h
 
 tracker_indexer_LDADD =							\
 	$(plugin_libs)							\
diff --git a/src/tracker-indexer/tracker-events.c b/src/tracker-indexer/tracker-events.c
deleted file mode 100644
index e4ef793..0000000
--- a/src/tracker-indexer/tracker-events.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- *
- * Authors:
- *  Philip Van Hoof <philip codeminded be>
- */
-
-#include "config.h"
-
-#include <libtracker-common/tracker-ontology.h>
-
-#include "tracker-events.h"
-
-/* TODO: once all writes are vanished from tracker-indexer, this file can be removed */
-
-typedef struct {
-	GPtrArray *allowances;
-	GPtrArray *events;
-} EventsPrivate;
-
-static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
-
-static void 
-tracker_events_add_allow (const gchar *rdf_class)
-{
-	EventsPrivate *private;
-
-	private = g_static_private_get (&private_key);
-	g_return_if_fail (private != NULL);
-
-	g_ptr_array_add (private->allowances, g_strdup (rdf_class));
-}
-
-static gboolean
-is_allowed (EventsPrivate *private, const gchar *rdf_class)
-{
-	guint i;
-	gboolean found = FALSE;
-
-	for (i = 0; i < private->allowances->len;  i++) {
-		if (g_strcmp0 (rdf_class, private->allowances->pdata[i]) == 0) {
-			found = TRUE;
-			break;
-		}
-	}
-
-	return found;
-}
-
-typedef struct {
-	const gchar *uri;
-	TrackerDBusEventsType type;
-} PreparableEvent;
-
-static void 
-prepare_event_for_rdf_types (gpointer data, gpointer user_data)
-{
-	const gchar *rdf_class = data;
-	PreparableEvent *info = user_data;
-	const gchar *uri = info->uri;
-	TrackerDBusEventsType type = info->type;
-
-	EventsPrivate *private;
-	GValueArray *event;
-	GValue uri_value = { 0 , };
-	GValue rdfclass_value = { 0 , };
-	GValue type_value = { 0 , };
-
-	private = g_static_private_get (&private_key);
-	g_return_if_fail (private != NULL);
-
-	if (!is_allowed (private, rdf_class))
-		return;
-
-	if (!private->events) {
-		private->events = g_ptr_array_new ();
-	}
-
-	g_value_init (&uri_value, G_TYPE_STRING);
-	g_value_init (&rdfclass_value, G_TYPE_STRING);
-	g_value_init (&type_value, G_TYPE_INT);
-
-	event = g_value_array_new (3);
-
-	g_value_set_string (&uri_value, uri);
-	g_value_set_string (&rdfclass_value, rdf_class);
-	g_value_set_int (&type_value, type);
-
-	g_value_array_append (event, &uri_value);
-	g_value_array_append (event, &rdfclass_value);
-	g_value_array_append (event, &type_value);
-
-	g_ptr_array_add (private->events, event);
-
-	g_value_unset (&uri_value);
-	g_value_unset (&rdfclass_value);
-	g_value_unset (&type_value);
-}
-
-void 
-tracker_events_insert (const gchar *uri, 
-		       const gchar *object, 
-		       GPtrArray *rdf_types, 
-		       TrackerDBusEventsType type)
-{
-	PreparableEvent info;
-
-	info.uri = uri;
-	info.type = type;
-
-	if (rdf_types && type == TRACKER_DBUS_EVENTS_TYPE_UPDATE) {
-		/* object is not very important for updates (we don't expose
-		 * the value being set to the user's DBus API in trackerd) */
-		g_ptr_array_foreach (rdf_types, prepare_event_for_rdf_types, &info);
-	} else if (type == TRACKER_DBUS_EVENTS_TYPE_UPDATE) {
-		/* In this case we had an INSERT for a resource that didn't exist 
-		 * yet, but it was not the rdf:type predicate being inserted */
-		prepare_event_for_rdf_types ((gpointer) TRACKER_RDFS_PREFIX "Resource", &info);
-	} else {
-		/* In case of delete and create, object is the rdf:type */
-		prepare_event_for_rdf_types ((gpointer) object, &info);
-	}
-}
-
-void 
-tracker_events_reset (void)
-{
-	EventsPrivate *private;
-	guint i;
-
-	private = g_static_private_get (&private_key);
-	g_return_if_fail (private != NULL);
-
-	if (private->events) {
-		for (i = 0; i < private->events->len; i++) {
-			g_value_array_free (private->events->pdata[i]);
-		}
-		g_ptr_array_free (private->events, TRUE);
-
-		private->events = NULL;
-	}
-}
-
-GPtrArray *
-tracker_events_get_pending (void)
-{
-	EventsPrivate *private;
-
-	private = g_static_private_get (&private_key);
-	g_return_val_if_fail (private != NULL, NULL);
-
-	return private->events;
-}
-
-static void
-free_private (EventsPrivate *private)
-{
-	g_ptr_array_foreach (private->allowances, (GFunc)g_free, NULL);
-	g_ptr_array_free (private->allowances, TRUE);
-	g_free (private);
-}
-
-void 
-tracker_events_init (TrackerNotifyClassGetter callback)
-{
-	EventsPrivate *private;
-	GStrv          classes_to_signal;
-	gint           i, count;
-
-	private = g_new0 (EventsPrivate, 1);
-
-	g_static_private_set (&private_key,
-			      private,
-			      (GDestroyNotify) free_private);
-
-	private->allowances = g_ptr_array_new ();
-	private->events = NULL;
-
-	if (!callback) {
-		return;
-	}
-
-	classes_to_signal = (*callback)();
-	count = g_strv_length (classes_to_signal);
-	for (i = 0; i < count; i++) {
-		tracker_events_add_allow (classes_to_signal[i]);
-	}
-
-	g_strfreev (classes_to_signal);
-}
-
-void 
-tracker_events_shutdown (void)
-{
-	EventsPrivate *private;
-
-	private = g_static_private_get (&private_key);
-	if (private != NULL) {
-		/* Shutdown with pending events = ERROR */
-		g_return_if_fail (private->events == NULL);
-		g_static_private_set (&private_key, NULL, NULL);
-	} else {
-		g_warning ("tracker_events already shutdown");
-	}
-}
diff --git a/src/tracker-indexer/tracker-events.h b/src/tracker-indexer/tracker-events.h
deleted file mode 100644
index fb1d04b..0000000
--- a/src/tracker-indexer/tracker-events.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- *
- * Authors:
- *  Philip Van Hoof <philip codeminded be>
- */
-
-#ifndef __TRACKER_INDEXER_EVENTS_H__
-#define __TRACKER_INDEXER_EVENTS_H__
-
-#include <libtracker-common/tracker-dbus.h>
-
-/* TODO: once all writes are vanished from tracker-indexer, this file can be removed */
-
-G_BEGIN_DECLS
-
-typedef GStrv (*TrackerNotifyClassGetter) (void);
-
-void       tracker_events_init        (TrackerNotifyClassGetter callback);
-void       tracker_events_shutdown    (void);
-void       tracker_events_insert      (const gchar           *uri,
-				       const gchar           *object,
-				       GPtrArray             *rdf_types,
-				       TrackerDBusEventsType  type);
-GPtrArray *tracker_events_get_pending (void);
-void       tracker_events_reset       (void);
-
-
-G_END_DECLS
-
-#endif /* __TRACKER_INDEXER_PUSH_H__ */
diff --git a/src/tracker-indexer/tracker-indexer.c b/src/tracker-indexer/tracker-indexer.c
index 52f82e7..445145d 100644
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@ -84,7 +84,6 @@
 #include "tracker-marshal.h"
 #include "tracker-module-metadata-private.h"
 #include "tracker-removable-device.h"
-#include "tracker-events.h"
 
 #define TRACKER_INDEXER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_INDEXER, TrackerIndexerPrivate))
 
@@ -201,7 +200,6 @@ enum {
 	PAUSED,
 	CONTINUED,
 	INDEXING_ERROR,
-	EVENT_HAPPENED,
 	LAST_SIGNAL
 };
 
@@ -228,48 +226,6 @@ static guint signals[LAST_SIGNAL] = { 0, };
 G_DEFINE_TYPE (TrackerIndexer, tracker_indexer, G_TYPE_OBJECT)
 
 
-static void
-on_statements_committed (gpointer user_data)
-{
-	GPtrArray *events;
-	TrackerIndexer *indexer = user_data;
-
-	events = tracker_events_get_pending ();
-	if (events) {
-		tracker_indexer_make_event_happen (indexer, events);
-	}
-	tracker_events_reset ();
-}
-
-static void
-on_statement_inserted (const gchar *subject, 
-		       const gchar *predicate, 
-		       const gchar *object, 
-		       GPtrArray   *rdf_types,
-		       gpointer user_data)
-{
-	if (g_strcmp0 (predicate, RDF_PREFIX "type") == 0) {
-		tracker_events_insert (subject, object, rdf_types, TRACKER_DBUS_EVENTS_TYPE_ADD);
-	} else {
-		tracker_events_insert (subject, object, rdf_types, TRACKER_DBUS_EVENTS_TYPE_UPDATE);
-	}
-}
-
-static void
-on_statement_deleted (const gchar *subject, 
-		      const gchar *predicate, 
-		      const gchar *object, 
-		      GPtrArray   *rdf_types,
-		      gpointer user_data)
-{
-	if (g_strcmp0 (predicate, RDF_PREFIX "type") == 0) {
-		tracker_events_insert (subject, object, rdf_types, TRACKER_DBUS_EVENTS_TYPE_DELETE);
-	} else {
-		tracker_events_insert (subject, object, rdf_types, TRACKER_DBUS_EVENTS_TYPE_UPDATE);
-	}
-}
-
-
 static PathInfo *
 path_info_new (TrackerIndexerModule *module,
 	       GFile                *file,
@@ -765,17 +721,6 @@ tracker_indexer_class_init (TrackerIndexerClass *class)
 			      G_TYPE_NONE,
 			      2, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
-	signals[EVENT_HAPPENED] =
-		g_signal_new ("event-happened",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (TrackerIndexerClass, event_happened),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOXED,
-			      G_TYPE_NONE,
-			      1,
-			      TRACKER_TYPE_EVENT_ARRAY);
-
 	g_object_class_install_property (object_class,
 					 PROP_RUNNING,
 					 g_param_spec_boolean ("running",
@@ -787,13 +732,6 @@ tracker_indexer_class_init (TrackerIndexerClass *class)
 	g_type_class_add_private (object_class, sizeof (TrackerIndexerPrivate));
 }
 
-void
-tracker_indexer_make_event_happen   (TrackerIndexer         *indexer,
-				     GPtrArray              *events)
-{
-	g_signal_emit (indexer, signals[EVENT_HAPPENED], 0, events);
-}
-
 static void
 check_started (TrackerIndexer *indexer)
 {
@@ -954,10 +892,6 @@ tracker_indexer_init (TrackerIndexer *indexer)
 
 	priv = indexer->private = TRACKER_INDEXER_GET_PRIVATE (indexer);
 
-	tracker_data_set_insert_statement_callback (on_statement_inserted, indexer);
-	tracker_data_set_delete_statement_callback (on_statement_deleted, indexer);
-	tracker_data_set_commit_statement_callback (on_statements_committed, indexer);
-
 	/* NOTE: We set this to stopped because it is likely the
 	 * daemon sends a request for something other than to check
 	 * files initially and we don't want to signal finished and
@@ -1747,24 +1681,6 @@ process_func (gpointer data)
 	return TRUE;
 }
 
-GStrv
-tracker_indexer_get_notifiable_classes (void)
-{
-	TrackerDBResultSet *result_set;
-	GStrv               classes_to_signal = NULL;
-
-	result_set = tracker_data_query_sparql ("SELECT ?class WHERE { ?class tracker:notify true }", NULL);
-
-	if (result_set) {
-		guint count = 0;
-
-		classes_to_signal = tracker_dbus_query_result_to_strv (result_set, 0, &count);
-		g_object_unref (result_set);
-	}
-
-	return classes_to_signal;
-}
-
 TrackerIndexer *
 tracker_indexer_new (void)
 {
diff --git a/src/tracker-indexer/tracker-indexer.h b/src/tracker-indexer/tracker-indexer.h
index be28561..23ebfdf 100644
--- a/src/tracker-indexer/tracker-indexer.h
+++ b/src/tracker-indexer/tracker-indexer.h
@@ -76,8 +76,6 @@ struct TrackerIndexerClass {
 	void (*indexing_error)  (TrackerIndexer *indexer,
 				 const gchar    *reason,
 				 gboolean        requires_reindex);
-	void (*event_happened)	(TrackerIndexer *indexer,
-				 GPtrArray      *events);
 };
 
 GType		tracker_indexer_get_type	    (void) G_GNUC_CONST;
@@ -93,8 +91,6 @@ void            tracker_indexer_process_modules     (TrackerIndexer         *ind
 						     gchar                 **modules);
 void		tracker_indexer_transaction_commit  (TrackerIndexer         *indexer);
 void		tracker_indexer_transaction_open    (TrackerIndexer         *indexer);
-void		tracker_indexer_make_event_happen   (TrackerIndexer         *indexer,
-						     GPtrArray              *events);
 
 /* DBus methods */
 void            tracker_indexer_pause               (TrackerIndexer         *indexer,
@@ -150,8 +146,6 @@ void            tracker_indexer_shutdown            (TrackerIndexer         *ind
 						     DBusGMethodInvocation  *context,
 						     GError                **error);
 
-GStrv           tracker_indexer_get_notifiable_classes  (void);
-
 G_END_DECLS
 
 #endif /* __TRACKER_INDEXER_H__ */
diff --git a/src/tracker-indexer/tracker-main.c b/src/tracker-indexer/tracker-main.c
index 8293e98..5152d4e 100644
--- a/src/tracker-indexer/tracker-main.c
+++ b/src/tracker-indexer/tracker-main.c
@@ -52,7 +52,6 @@
 #include <libtracker-data/tracker-turtle.h>
 
 #include "tracker-dbus.h"
-#include "tracker-events.h"
 #include "tracker-indexer.h"
 #include "tracker-indexer-glue.h"
 #include "tracker-push.h"
@@ -415,7 +414,6 @@ main (gint argc, gchar *argv[])
                 tracker_indexer_process_modules (indexer, modules);
         }
 
-	tracker_events_init (tracker_indexer_get_notifiable_classes);
 	tracker_push_init (config, indexer);
 
 	tracker_turtle_init ();
@@ -440,7 +438,6 @@ main (gint argc, gchar *argv[])
 	g_object_unref (language);
 
 	tracker_push_shutdown ();
-	tracker_events_shutdown ();
 
 	tracker_thumbnailer_shutdown ();
 	tracker_dbus_shutdown ();
diff --git a/src/trackerd/tracker-resource-class.c b/src/trackerd/tracker-resource-class.c
index cf42ed6..c3c175a 100644
--- a/src/trackerd/tracker-resource-class.c
+++ b/src/trackerd/tracker-resource-class.c
@@ -130,6 +130,63 @@ tracker_resource_class_init (TrackerResourceClass *object)
 }
 
 static void
+emit_strings (TrackerResourceClass *object, gint signal_, GPtrArray *array)
+{
+	GStrv strings_to_emit;
+	guint i;
+
+	if (array->len > 0) {
+		strings_to_emit = (GStrv) g_malloc0  (sizeof (gchar *) * (array->len + 1));
+
+		for (i = 0; i < array->len; i++) {
+			strings_to_emit[i] = array->pdata [i];
+		}
+
+		g_signal_emit (object, signal_, 0, strings_to_emit);
+
+		/* Normal free, not a GStrv free, we free the strings later */
+		g_free (strings_to_emit);
+	}
+}
+
+static void
+free_array (GPtrArray *array)
+{
+	guint i;
+	for (i = 0; i < array->len; i++) {
+		g_free (array->pdata [i]);
+	}
+	g_ptr_array_free (array, TRUE);
+}
+
+static void
+tracker_resource_class_emit_events (TrackerResourceClass  *object)
+{
+	TrackerResourceClassPrivate *priv;
+
+	priv = TRACKER_RESOURCE_CLASS_GET_PRIVATE (object);
+
+	if (priv->adds) {
+		emit_strings (object, signals[SUBJECTS_ADDED], priv->adds);
+		free_array (priv->adds);
+		priv->adds = NULL;
+	}
+
+	if (priv->ups) {
+		emit_strings (object, signals[SUBJECTS_CHANGED], priv->ups);
+		free_array (priv->ups);
+		priv->ups = NULL;
+	}
+
+	if (priv->dels) {
+		emit_strings (object, signals[SUBJECTS_REMOVED], priv->dels);
+		free_array (priv->dels);
+		priv->dels = NULL;
+	}
+}
+
+
+static void
 tracker_resource_class_finalize (GObject *object)
 {
 	TrackerResourceClassPrivate *priv;
@@ -170,7 +227,7 @@ tracker_resource_class_get_rdf_class (TrackerResourceClass  *object)
 	return priv->rdf_class;
 }
 
-void 
+static void 
 tracker_resource_class_add_event (TrackerResourceClass  *object,
 				  const gchar           *uri,
 				  TrackerDBusEventsType type)
@@ -201,63 +258,6 @@ tracker_resource_class_add_event (TrackerResourceClass  *object,
 }
 
 static void
-emit_strings (TrackerResourceClass *object, gint signal_, GPtrArray *array)
-{
-	GStrv strings_to_emit;
-	guint i;
-
-	if (array->len > 0) {
-		strings_to_emit = (GStrv) g_malloc0  (sizeof (gchar *) * (array->len + 1));
-
-		for (i = 0; i < array->len; i++) {
-			strings_to_emit[i] = array->pdata [i];
-		}
-
-		g_signal_emit (object, signal_, 0, strings_to_emit);
-
-		/* Normal free, not a GStrv free, we free the strings later */
-		g_free (strings_to_emit);
-	}
-}
-
-static void
-free_array (GPtrArray *array)
-{
-	guint i;
-	for (i = 0; i < array->len; i++) {
-		g_free (array->pdata [i]);
-	}
-	g_ptr_array_free (array, TRUE);
-}
-
-void
-tracker_resource_class_emit_events (TrackerResourceClass  *object)
-{
-	TrackerResourceClassPrivate *priv;
-
-	priv = TRACKER_RESOURCE_CLASS_GET_PRIVATE (object);
-
-	if (priv->adds) {
-		emit_strings (object, signals[SUBJECTS_ADDED], priv->adds);
-		free_array (priv->adds);
-		priv->adds = NULL;
-	}
-
-	if (priv->ups) {
-		emit_strings (object, signals[SUBJECTS_CHANGED], priv->ups);
-		free_array (priv->ups);
-		priv->ups = NULL;
-	}
-
-	if (priv->dels) {
-		emit_strings (object, signals[SUBJECTS_REMOVED], priv->dels);
-		free_array (priv->dels);
-		priv->dels = NULL;
-	}
-}
-
-
-static void
 on_statements_committed (gpointer user_data)
 {
 	GPtrArray *events;
diff --git a/src/trackerd/tracker-resource-class.h b/src/trackerd/tracker-resource-class.h
index 0c8eb5f..365fd42 100644
--- a/src/trackerd/tracker-resource-class.h
+++ b/src/trackerd/tracker-resource-class.h
@@ -55,10 +55,6 @@ GType                  tracker_resource_class_get_type      (void);
 TrackerResourceClass  *tracker_resource_class_new           (const gchar *rdf_class);
 
 const gchar *          tracker_resource_class_get_rdf_class (TrackerResourceClass  *object);
-void                   tracker_resource_class_add_event     (TrackerResourceClass  *object,
-							     const gchar           *uri,
-							     TrackerDBusEventsType type);
-void                   tracker_resource_class_emit_events   (TrackerResourceClass  *object);
 
 G_END_DECLS
 
diff --git a/src/trackerd/tracker-resources.c b/src/trackerd/tracker-resources.c
index 7fa07b8..f243fd8 100644
--- a/src/trackerd/tracker-resources.c
+++ b/src/trackerd/tracker-resources.c
@@ -47,7 +47,6 @@ G_DEFINE_TYPE(TrackerResources, tracker_resources, G_TYPE_OBJECT)
 
 typedef struct {
 	GSList     *event_sources;
-	DBusGProxy *indexer_proxy;
 } TrackerResourcesPrivate;
 
 static void
@@ -71,8 +70,6 @@ tracker_resources_finalize (GObject	 *object)
 
 	free_event_sources (priv);
 
-	g_object_unref (priv->indexer_proxy);
-
 	G_OBJECT_CLASS (tracker_resources_parent_class)->finalize (object);
 }
 
@@ -90,59 +87,8 @@ tracker_resources_class_init (TrackerResourcesClass *klass)
 
 
 static void
-event_happened_cb (DBusGProxy *proxy,
-		   GPtrArray  *events,
-		   gpointer    user_data)
-{
-	TrackerResources        *object = user_data;
-	TrackerResourcesPrivate *priv;
-	GSList                  *event_sources, *l, *to_emit = NULL;
-	guint                    i;
-
-	priv = TRACKER_RESOURCES_GET_PRIVATE (object);
-
-	event_sources = priv->event_sources;
-
-	for (i = 0; i < events->len; i++) {
-		GValueArray *event = events->pdata[i];
-		const gchar *uri = g_value_get_string (g_value_array_get_nth (event, 0));
-		const gchar *rdf_class = g_value_get_string (g_value_array_get_nth (event, 1));
-		TrackerDBusEventsType type = g_value_get_int (g_value_array_get_nth (event, 2));
-
-		for (l = event_sources; l; l = l->next) {
-			TrackerResourceClass *class_ = l->data;
-			if (g_strcmp0 (rdf_class, tracker_resource_class_get_rdf_class (class_)) == 0) {
-				tracker_resource_class_add_event (class_, uri, type);
-				to_emit = g_slist_prepend (to_emit, class_);
-			}
-		}
-	}
-
-	if (to_emit) {
-		for (l = to_emit; l; l = l->next) {
-			TrackerResourceClass *class_ = l->data;
-			tracker_resource_class_emit_events (class_);
-		}
-
-		g_slist_free (to_emit);
-	}
-}
-
-static void
 tracker_resources_init (TrackerResources *object)
 {
-	TrackerResourcesPrivate *priv;
-	DBusGProxy *proxy = tracker_dbus_indexer_get_proxy ();
-
-	priv = TRACKER_RESOURCES_GET_PRIVATE (object);
-
-	priv->indexer_proxy = g_object_ref (proxy);
-
-	dbus_g_proxy_connect_signal (proxy, "EventHappened",
-				     G_CALLBACK (event_happened_cb),
-				     object,
-				     NULL);
-
 }
 
 TrackerResources *
diff --git a/tests/tracker-indexer/Makefile.am b/tests/tracker-indexer/Makefile.am
index 7b65263..2600a2c 100644
--- a/tests/tracker-indexer/Makefile.am
+++ b/tests/tracker-indexer/Makefile.am
@@ -14,6 +14,7 @@ INCLUDES = 									\
 	-DTRACKER_COMPILATION							\
 	-I$(top_srcdir)/src							\
 	-I$(top_srcdir)/tests/common						\
+	-I$(top_builddir)/src/trackerd						\
 	-I$(top_builddir)/src/tracker-indexer					\
 	$(WARN_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\
@@ -26,7 +27,7 @@ INCLUDES = 									\
 
 tracker_metadata_utils_SOURCES = 						\
 	$(top_srcdir)/src/tracker-indexer/tracker-dbus.c			\
-	$(top_srcdir)/src/tracker-indexer/tracker-events.c			\
+	$(top_srcdir)/src/trackerd/tracker-events.c			\
 	$(top_srcdir)/src/tracker-indexer/tracker-indexer.c			\
 	$(top_srcdir)/src/tracker-indexer/tracker-indexer-module.c		\
 	$(top_srcdir)/src/tracker-indexer/tracker-marshal-main.c		\
@@ -54,7 +55,7 @@ tracker_metadata_utils_LDADD =	                                        	\
 
 tracker_events_SOURCES = 							\
 	tracker-events-test.c							\
-	$(top_srcdir)/src/tracker-indexer/tracker-events.c
+	$(top_srcdir)/src/trackerd/tracker-events.c
 
 tracker_events_LDADD = 								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]