From f2183ef2e4aa015a751c7d3357d7478465d88a76 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sun, 5 Jul 2015 20:11:32 +0200
Subject: tracker-preferences: Use the new command line tool

We resort to the tracker CLI for restart/reindex, the calls have
changed to use Posix.system() as there's some operations that are
now mutually exclusive in the CLI tool (eg. reset and start daemons)
and still need to be performed in a single step here.

https://bugzilla.gnome.org/show_bug.cgi?id=748677
---
 src/tracker-preferences/Makefile.am              |  2 +-
 src/tracker-preferences/tracker-preferences.vala | 33 +++---------------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 97fb4f2be..09b32a668 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -11,7 +11,7 @@ appdata_DATA =  tracker-preferences.appdata.xml
 pkgdata_DATA = tracker-preferences.ui
 
 AM_VALAFLAGS =                                         \
-	--pkg gtk+-3.0 --pkg gmodule-2.0               \
+	--pkg gtk+-3.0 --pkg gmodule-2.0 --pkg posix   \
 	$(BUILD_VALAFLAGS)                             \
 	config.vapi                                    \
 	tracker-config.vapi
diff --git a/src/tracker-preferences/tracker-preferences.vala b/src/tracker-preferences/tracker-preferences.vala
index 675973451..d8511631b 100644
--- a/src/tracker-preferences/tracker-preferences.vala
+++ b/src/tracker-preferences/tracker-preferences.vala
@@ -21,6 +21,7 @@
 using Gtk;
 using GLib;
 using Tracker;
+using Posix;
 
 [CCode (cname = "TRACKER_UI_DIR")]
 extern static const string UIDIR;
@@ -244,39 +245,11 @@ public class Tracker.Preferences {
 	}
 
 	void reindex () {
-		string output, errors;
-		int status;
-
-		try {
-			Process.spawn_sync (null, /* working dir */
-			                    {"tracker-control", "--hard-reset", "--start" },
-			                    null, /* env */
-			                    SpawnFlags.SEARCH_PATH,
-			                    null,
-			                    out output,
-			                    out errors,
-			                    out status);
-		} catch (GLib.Error e) {
-			stderr.printf ("Could not reindex: %s", e.message);
-		}
+		Posix.system ("tracker reset --hard && tracker daemon --start");
 	}
 
 	void restart () {
-		string output, errors;
-		int status;
-
-		try {
-			Process.spawn_sync (null, /* working dir */
-			                    {"tracker-control", "--terminate=miners", "--terminate=store", "--start" },
-			                    null, /* env */
-			                    SpawnFlags.SEARCH_PATH,
-			                    null,
-			                    out output,
-			                    out errors,
-			                    out status);
-		} catch (GLib.Error e) {
-			stderr.printf ("Could not restart: %s", e.message);
-		}
+		Posix.system ("tracker daemon --terminate=miners --terminate=store && tracker daemon --start");
 	}
 
 	// This function is used to fix up the parameter ordering for callbacks
-- 
cgit v1.2.1