[tracker/tracker-0.12] libtracker-data: Fix dead code with disabled journal

[Martyn James Russell <mr src gnome org>]

commit 009b2e297d9e743dab53785cdd342684a3921028
Author: JÃrg Billeter <j bitron ch>
Date:   Thu Jan 26 16:15:09 2012 +0100

    libtracker-data: Fix dead code with disabled journal

 src/libtracker-data/tracker-data-manager.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index cb998c3..88b1763 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -3864,6 +3864,7 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 			return FALSE;
 		}
 
+#ifndef DISABLE_JOURNAL
 		if (uri_id_map) {
 			/* restore all IDs from ontology journal */
 			GHashTableIter iter;
@@ -3878,9 +3879,7 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 				if (internal_error) {
 					g_propagate_error (error, internal_error);
 
-#ifndef DISABLE_JOURNAL
 					tracker_db_journal_shutdown (NULL);
-#endif /* DISABLE_JOURNAL */
 					tracker_db_manager_shutdown ();
 					tracker_ontologies_shutdown ();
 					if (!reloading) {
@@ -3892,6 +3891,7 @@ tracker_data_manager_init (TrackerDBManagerFlags   flags,
 				}
 			}
 		}
+#endif /* DISABLE_JOURNAL */
 
 		/* store ontology in database */
 		for (l = sorted; l; l = l->next) {