[tracker/tracker-store] tracker-indexer: Remove obsolete volume handling D-Bus methods

[Jürg Billeter <juergbi src gnome org>]

commit 8e57c6f359cb9e3a9f25bb0076f842cb829f62d0
Author: Jürg Billeter <j bitron ch>
Date:   Thu Jun 25 16:28:40 2009 +0200

    tracker-indexer: Remove obsolete volume handling D-Bus methods

 data/dbus/tracker-indexer.xml         |   11 -----------
 src/tracker-indexer/tracker-indexer.c |    4 ++++
 src/tracker-indexer/tracker-indexer.h |    9 ---------
 src/tracker-store/tracker-main.c      |    8 ++++++++
 4 files changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/data/dbus/tracker-indexer.xml b/data/dbus/tracker-indexer.xml
index e9335b8..39b9666 100644
--- a/data/dbus/tracker-indexer.xml
+++ b/data/dbus/tracker-indexer.xml
@@ -11,17 +11,6 @@
 
 <node name="/">
   <interface name="org.freedesktop.Tracker.Indexer">  
-    <method name="VolumeDisableAll">
-      <annotation name="org.freedesktop.DBus.GLib.Async"
-      value="true"/>
-    </method>
-    <method name="VolumeUpdateState">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <arg type="s" name="volume_id" direction="in" />
-      <arg type="s" name="path" direction="in" />
-      <arg type="b" name="enabled" direction="in" />
-    </method>
-
     <method name="Pause">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
     </method>
diff --git a/src/tracker-indexer/tracker-indexer.c b/src/tracker-indexer/tracker-indexer.c
index 3a35344..202a407 100644
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@ -2047,6 +2047,9 @@ tracker_indexer_file_move (TrackerIndexer	  *indexer,
 	g_object_unref (file_to);
 }
 
+/* TODO: Fix volume handling in tracker-store / tracker-indexer */
+
+#if 0
 void            
 tracker_indexer_volume_disable_all (TrackerIndexer         *indexer,
 				    DBusGMethodInvocation  *context,
@@ -2111,6 +2114,7 @@ tracker_indexer_volume_update_state (TrackerIndexer         *indexer,
 	}
 
 }
+#endif
 
 static void
 restore_backup_cb (const gchar *subject,
diff --git a/src/tracker-indexer/tracker-indexer.h b/src/tracker-indexer/tracker-indexer.h
index abe9c31..d52734d 100644
--- a/src/tracker-indexer/tracker-indexer.h
+++ b/src/tracker-indexer/tracker-indexer.h
@@ -110,15 +110,6 @@ void            tracker_indexer_file_move           (TrackerIndexer         *ind
 						     const gchar            *module_name,
 						     const gchar            *from,
 						     const gchar            *to);
-void            tracker_indexer_volume_disable_all  (TrackerIndexer         *indexer,
-						     DBusGMethodInvocation  *context,
-						     GError                **error);
-void            tracker_indexer_volume_update_state (TrackerIndexer         *indexer,
-						     const gchar            *volume_uuid,
-						     const gchar            *path,
-						     gboolean                enabled,
-						     DBusGMethodInvocation  *context,
-						     GError                **error);
 
 void            tracker_indexer_restore_backup      (TrackerIndexer         *indexer,
 						     const gchar            *backup_file,
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index c6fbc7a..c9f2b2c 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -390,6 +390,8 @@ mount_point_added_cb (TrackerStorage *hal,
 
 	private = g_static_private_get (&private_key);
 
+	/* TODO: Fix volume handling in tracker-store / tracker-indexer
+
 	g_message ("Indexer is being notified about added UDI:");
 	g_message ("  %s", udi);
 
@@ -400,6 +402,7 @@ mount_point_added_cb (TrackerStorage *hal,
 								   TRUE,
 								   mount_point_set_cb,
 								   mpu);
+	 */
 }
 
 static void
@@ -440,6 +443,8 @@ mount_point_removed_cb (TrackerStorage  *hal,
 
 	private = g_static_private_get (&private_key);
 
+	/* TODO: Fix volume handling in tracker-store / tracker-indexer
+
 	g_message ("Indexer is being notified about removed UDI:");
 	g_message ("  %s", udi);
 
@@ -450,6 +455,7 @@ mount_point_removed_cb (TrackerStorage  *hal,
 								   FALSE,
 								   mount_point_set_and_signal_cb,
 								   mpu);
+	 */
 }
 
 #endif /* HAVE_HAL */
@@ -762,6 +768,7 @@ set_up_mount_points (TrackerStorage *hal)
 	 *
 	 * tracker_status_set_is_paused_for_dbus (TRUE); */
 
+	/* TODO: Fix volume handling in tracker-store / tracker-indexer
 	g_message ("Indexer is being notified to disable all volumes");
 	org_freedesktop_Tracker_Indexer_volume_disable_all (tracker_dbus_indexer_get_proxy (), &error);
 
@@ -812,6 +819,7 @@ set_up_mount_points (TrackerStorage *hal)
 	}
 
 	g_list_free (roots);
+	 */
 
 	/* Merging: tracker-0.6 appears to have code here that we don't have
 	 *