[tracker] Bugfix for critical messages when using tracker-control
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker] Bugfix for critical messages when using tracker-control
- Date: Fri, 22 Jan 2010 12:00:22 +0000 (UTC)
commit 25723f00a96c981ac569f04d7e3e2ed837d471cf
Author: Philip Van Hoof <philip codeminded be>
Date: Fri Jan 22 12:56:17 2010 +0100
Bugfix for critical messages when using tracker-control
src/libtracker-db/tracker-db-journal.c | 4 ++--
src/libtracker-db/tracker-db-manager.c | 26 +++++++++++++++-----------
2 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/src/libtracker-db/tracker-db-journal.c b/src/libtracker-db/tracker-db-journal.c
index f23002b..836577f 100644
--- a/src/libtracker-db/tracker-db-journal.c
+++ b/src/libtracker-db/tracker-db-journal.c
@@ -294,8 +294,8 @@ tracker_db_journal_get_size (void)
const gchar *
tracker_db_journal_get_filename (void)
{
- g_return_val_if_fail (writer.journal > 0, FALSE);
-
+ /* Journal doesn't have to be open to get the filename, for example when
+ * the file didn't exist and it was attempted opened in only read mode. */
return (const gchar*) writer.journal_filename;
}
diff --git a/src/libtracker-db/tracker-db-manager.c b/src/libtracker-db/tracker-db-manager.c
index 3a3f127..7e1d7ce 100644
--- a/src/libtracker-db/tracker-db-manager.c
+++ b/src/libtracker-db/tracker-db-manager.c
@@ -915,17 +915,21 @@ db_manager_remove_all (gboolean rm_journal)
}
if (rm_journal) {
- GFile *file;
- gchar *cpath;
-
- cpath = g_strdup (tracker_db_journal_get_filename ());
- tracker_db_journal_shutdown ();
- g_message (" Removing journal:'%s'",
- cpath);
- file = g_file_new_for_path (cpath);
- g_file_delete (file, NULL, NULL);
- g_object_unref (file);
- g_free (cpath);
+ const gchar *opath = tracker_db_journal_get_filename ();
+
+ if (opath) {
+ GFile *file;
+ gchar *cpath;
+
+ cpath = g_strdup (opath);
+ tracker_db_journal_shutdown ();
+ g_message (" Removing journal:'%s'",
+ cpath);
+ file = g_file_new_for_path (cpath);
+ g_file_delete (file, NULL, NULL);
+ g_object_unref (file);
+ g_free (cpath);
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]