[tracker/libtracker-miner] removed tracker-config and tracker-status



commit 671c86a397de79dadda4580c5434c686c09e64c7
Author: Martyn Russell <martyn imendio com>
Date:   Tue Aug 4 13:20:47 2009 +0100

    removed tracker-config and tracker-status

 src/libtracker-miner/Makefile.am             |    4 -
 src/libtracker-miner/tracker-config.c        | 1065 -------------------------
 src/libtracker-miner/tracker-config.h        |  119 ---
 src/libtracker-miner/tracker-crawler.c       |    2 -
 src/libtracker-miner/tracker-crawler.h       |    2 -
 src/libtracker-miner/tracker-miner-crawler.c |    7 -
 src/libtracker-miner/tracker-monitor.c       |    3 -
 src/libtracker-miner/tracker-status.c        | 1108 --------------------------
 src/libtracker-miner/tracker-status.h        |   96 ---
 src/libtracker-miner/tracker-utils.c         |    9 +-
 src/libtracker-miner/tracker-utils.h         |    5 +-
 11 files changed, 6 insertions(+), 2414 deletions(-)
---
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index bb48a12..8908b58 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -25,8 +25,6 @@ libtracker_miner_LTLIBRARIES = libtracker-miner.la
 # tracker-miner-crawler.h				
 
 libtracker_miner_la_SOURCES = 				\
-	tracker-config.c				\
-	tracker-config.h				\
 	tracker-crawler.c				\
 	tracker-crawler.h				\
 	tracker-dbus.c					\
@@ -40,8 +38,6 @@ libtracker_miner_la_SOURCES = 				\
 	tracker-monitor.h				\
 	tracker-processor.c				\
 	tracker-processor.h				\
-	tracker-status.c				\
-	tracker-status.h				\
 	tracker-utils.c					\
 	tracker-utils.h
 
diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c
index 2ecdb8e..aa4849e 100644
--- a/src/libtracker-miner/tracker-crawler.c
+++ b/src/libtracker-miner/tracker-crawler.c
@@ -30,12 +30,10 @@
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-module-config.h>
 
-#include "tracker-config.h"
 #include "tracker-crawler.h"
 #include "tracker-dbus.h"
 #include "tracker-monitor.h"
 #include "tracker-marshal.h"
-#include "tracker-status.h"
 #include "tracker-utils.h"
 
 #define TRACKER_CRAWLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CRAWLER, TrackerCrawlerPrivate))
diff --git a/src/libtracker-miner/tracker-crawler.h b/src/libtracker-miner/tracker-crawler.h
index 60e0de0..dc43dbf 100644
--- a/src/libtracker-miner/tracker-crawler.h
+++ b/src/libtracker-miner/tracker-crawler.h
@@ -23,8 +23,6 @@
 
 #include <glib-object.h>
 
-#include "tracker-config.h"
-
 G_BEGIN_DECLS
 
 #define TRACKER_TYPE_CRAWLER		(tracker_crawler_get_type ())
diff --git a/src/libtracker-miner/tracker-miner-crawler.c b/src/libtracker-miner/tracker-miner-crawler.c
index 7cf85f1..0b23dca 100644
--- a/src/libtracker-miner/tracker-miner-crawler.c
+++ b/src/libtracker-miner/tracker-miner-crawler.c
@@ -23,7 +23,6 @@
 #include <libtracker-common/tracker-storage.h>
 
 #include "tracker-miner-crawler.h"
-#include "tracker-config.h"
 #include "tracker-processor.h"
 #include "tracker-marshal.h"
 
@@ -39,7 +38,6 @@ struct DirectoryData {
 };
 
 struct TrackerMinerCrawlerPrivate {
-	TrackerConfig *config;
 	TrackerStorage *storage;
 	TrackerProcessor *processor;
 
@@ -145,7 +143,6 @@ tracker_miner_crawler_init (TrackerMinerCrawler *miner)
 
 	priv = miner->_priv = TRACKER_MINER_CRAWLER_GET_PRIVATE (miner);
 
-	priv->config = tracker_config_new ();
 	priv->storage = tracker_storage_new ();
 
 	priv->processor = tracker_processor_new (priv->storage);
@@ -163,10 +160,6 @@ tracker_miner_crawler_finalize (GObject *object)
 	TrackerMinerCrawler *miner = TRACKER_MINER_CRAWLER (object);
 	TrackerMinerCrawlerPrivate *priv = miner->_priv;
 
-	if (priv->config) {
-		g_object_unref (priv->config);
-	}
-
 	if (priv->storage) {
 		g_object_unref (priv->storage);
 	}
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 966c8a6..7d273d9 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -33,7 +33,6 @@
 #include "tracker-monitor.h"
 #include "tracker-dbus.h"
 #include "tracker-marshal.h"
-#include "tracker-status.h"
 
 #define TRACKER_MONITOR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_MONITOR, TrackerMonitorPrivate))
 
@@ -52,8 +51,6 @@
 #undef  PAUSE_ON_IO
 
 struct _TrackerMonitorPrivate {
-	TrackerConfig *config;
-
 	GHashTable    *monitors;
 	
 	gboolean       enabled;
diff --git a/src/libtracker-miner/tracker-utils.c b/src/libtracker-miner/tracker-utils.c
index 69b3fd5..8746bc7 100644
--- a/src/libtracker-miner/tracker-utils.c
+++ b/src/libtracker-miner/tracker-utils.c
@@ -23,17 +23,18 @@
 #include "tracker-utils.h"
 
 void
-tracker_throttle (TrackerConfig *config,
-		  gint		 multiplier)
+tracker_throttle (gint multiplier)
 {
 	gint throttle;
 
-	g_return_if_fail (TRACKER_IS_CONFIG (config));
-
 	/* Get the throttle, add 5 (minimum value) so we don't do
 	 * nothing and then multiply it by the factor given
 	 */
+#ifdef FIX
 	throttle  = tracker_config_get_throttle (config);
+#else 
+	throttle  = 0;
+#endif
 	/* throttle += 5; */
 	throttle *= multiplier;
 
diff --git a/src/libtracker-miner/tracker-utils.h b/src/libtracker-miner/tracker-utils.h
index f5b643b..6ad558d 100644
--- a/src/libtracker-miner/tracker-utils.h
+++ b/src/libtracker-miner/tracker-utils.h
@@ -23,9 +23,6 @@
 
 #include <glib.h>
 
-#include "tracker-config.h"
-
-void tracker_throttle (TrackerConfig *config,
-		       gint           multiplier);
+void tracker_throttle (gint multiplier);
 
 #endif /* __TRACKERD_UTILS_H__ */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]