[tracker/tracker-0.10: 2/3] tracker-extract: Ensure that --disable-shutdown still works

[Philip Van Hoof <pvanhoof src gnome org>]

commit 3480500352c435833afb944dfa72f59f62ab9e64
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Dec 16 15:33:09 2011 +0100

    tracker-extract: Ensure that --disable-shutdown still works

 src/tracker-extract/tracker-main.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 91cedb4..19b5c92 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -264,7 +264,9 @@ tracker_main_timeout_reset (void)
 	 * 25*1000 msec (gdbusconnection.c at g_dbus_connection_send_message_
 	 * with_reply_unlocked), so 25 seconds. */
 
-	alarm (25);
+	if (!disable_shutdown) {
+		alarm (25);
+	}
 #endif /* G_OS_WIN32 */
 }
 
@@ -392,6 +394,9 @@ main (int argc, char *argv[])
 
 	config = tracker_config_new ();
 
+	/* Set initial alarm timeout */
+	tracker_main_timeout_reset ();
+
 	/* Set conditions when we use stand alone settings */
 	if (filename) {
 		return run_standalone ();
@@ -450,9 +455,6 @@ main (int argc, char *argv[])
 	tracker_locale_init ();
 	tracker_albumart_init ();
 
-	/* Set initial alarm timeout */
-	tracker_main_timeout_reset ();
-
 	/* Main loop */
 	main_loop = g_main_loop_new (NULL, FALSE);
 	g_main_loop_run (main_loop);