[tracker/tracker-0.10] libtracker-data: Move journal reader shutdown out of init_file

[Martyn James Russell <mr src gnome org>]

commit b75c3378f8e2555a5841f3f0232d5190668577ab
Author: Jürg Billeter <j bitron ch>
Date:   Tue May 17 16:08:02 2011 +0200

    libtracker-data: Move journal reader shutdown out of init_file
    
    Journal reader shutdown frees journal filename, however, we still want
    to use that in the propagated error message.

 src/libtracker-data/tracker-db-journal.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/src/libtracker-data/tracker-db-journal.c b/src/libtracker-data/tracker-db-journal.c
index fc5956a..9068428 100644
--- a/src/libtracker-data/tracker-db-journal.c
+++ b/src/libtracker-data/tracker-db-journal.c
@@ -1337,7 +1337,6 @@ db_journal_reader_init_file (JournalReader  *jreader,
 		g_set_error (error, TRACKER_DB_JOURNAL_ERROR,
 		             TRACKER_DB_JOURNAL_ERROR_BEGIN_OF_JOURNAL,
 		             "Damaged journal entry at begin of journal");
-		tracker_db_journal_reader_shutdown ();
 		return FALSE;
 	}
 
@@ -1392,8 +1391,6 @@ db_journal_reader_init (JournalReader  *jreader,
 
 		g_error_free (n_error);
 		g_free (filename_open);
-		g_free (jreader->filename);
-		jreader->filename = NULL;
 
 		tracker_db_journal_reader_shutdown ();
 		return FALSE;
@@ -1483,6 +1480,7 @@ reader_next_file (GError **error)
 
 	if (!db_journal_reader_init_file (&reader, filename_open, error)) {
 		g_free (filename_open);
+		tracker_db_journal_reader_shutdown ();
 		return FALSE;
 	}