[tracker/tracker-store] tracker-indexer: Remove obsolete RestoreBackup D-Bus method

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

commit 87291a7ad7269d56c38233509bdf71068c9ee6bc
Author: Jürg Billeter <j bitron ch>
Date:   Thu Jun 25 16:40:33 2009 +0200

    tracker-indexer: Remove obsolete RestoreBackup D-Bus method

 data/dbus/tracker-indexer.xml         |    5 ---
 src/tracker-indexer/tracker-indexer.c |   50 ---------------------------------
 src/tracker-store/tracker-backup.c    |   18 ++++++++++--
 3 files changed, 15 insertions(+), 58 deletions(-)
---
diff --git a/data/dbus/tracker-indexer.xml b/data/dbus/tracker-indexer.xml
index 39b9666..7d9d57f 100644
--- a/data/dbus/tracker-indexer.xml
+++ b/data/dbus/tracker-indexer.xml
@@ -25,11 +25,6 @@
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
     </method>
 
-    <method name="RestoreBackup">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <arg type="s" name="backup_file" direction="in" />
-    </method>
-
     <!-- Signals --> 
     <signal name="Status">
       <arg type="d" name="elapsed_time" />
diff --git a/src/tracker-indexer/tracker-indexer.c b/src/tracker-indexer/tracker-indexer.c
index 202a407..efd7e49 100644
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@ -2116,56 +2116,6 @@ tracker_indexer_volume_update_state (TrackerIndexer         *indexer,
 }
 #endif
 
-static void
-restore_backup_cb (const gchar *subject,
-		   const gchar *predicate,
-		   const gchar *object,
-		   gpointer     user_data)
-{
-	tracker_data_insert_statement (subject, predicate, object);
-
-	g_main_context_iteration (NULL, FALSE);
-}
-
-void
-tracker_indexer_restore_backup (TrackerIndexer         *indexer,
-				const gchar            *backup_file,
-				DBusGMethodInvocation  *context,
-				GError                **error)
-{
-	guint request_id;
-	GError *err = NULL;
-
-	request_id = tracker_dbus_get_next_request_id ();
-
-	tracker_dbus_async_return_if_fail (TRACKER_IS_INDEXER (indexer), context);
-
-	tracker_dbus_request_new (request_id,
-				  "DBus request to restore backup data from '%s'",
-				  backup_file);
-
-	tracker_data_backup_restore (backup_file,
-				     restore_backup_cb,
-				     indexer,
-				     &err);
-
-	if (err) {
-		GError *actual_error = NULL;
-
-		tracker_dbus_request_failed (request_id,
-					     &actual_error,
-					     err->message);
-
-		dbus_g_method_return_error (context, actual_error);
-
-		g_error_free (actual_error);
-		g_error_free (err);
-	} else {
-		dbus_g_method_return (context);
-		tracker_dbus_request_success (request_id);
-	}
-}
-
 
 void
 tracker_indexer_shutdown (TrackerIndexer	 *indexer,
diff --git a/src/tracker-store/tracker-backup.c b/src/tracker-store/tracker-backup.c
index 62497dc..d19500f 100644
--- a/src/tracker-store/tracker-backup.c
+++ b/src/tracker-store/tracker-backup.c
@@ -87,6 +87,17 @@ tracker_backup_save (TrackerBackup          *object,
 	}
 }
 
+static void
+restore_backup_cb (const gchar *subject,
+		   const gchar *predicate,
+		   const gchar *object,
+		   gpointer     user_data)
+{
+	tracker_data_insert_statement (subject, predicate, object);
+
+	g_main_context_iteration (NULL, FALSE);
+}
+
 void
 tracker_backup_restore (TrackerBackup          *object,
 			const gchar            *path,
@@ -115,9 +126,10 @@ tracker_backup_restore (TrackerBackup          *object,
 		return;
 	}
 
-	org_freedesktop_Tracker_Indexer_restore_backup (tracker_dbus_indexer_get_proxy (),
-							path, 
-							&restore_error);
+	tracker_data_backup_restore (path,
+				     restore_backup_cb,
+				     NULL,
+				     &restore_error);
 
 	if (restore_error) {
 		GError *actual_error = NULL;