[tracker/writeback-refactor-rebase] squash

[Philip Van Hoof <pvanhoof src gnome org>]

commit 544a9ffb11bf093a0078552ce7d444dc252c0cd1
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Jul 18 13:20:12 2011 +0200

    squash

 src/miners/fs/tracker-writeback-dispatcher.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/miners/fs/tracker-writeback-dispatcher.c b/src/miners/fs/tracker-writeback-dispatcher.c
index bb7ae6c..cd41828 100644
--- a/src/miners/fs/tracker-writeback-dispatcher.c
+++ b/src/miners/fs/tracker-writeback-dispatcher.c
@@ -246,7 +246,9 @@ self_weak_notify (gpointer data, GObject *where_the_object_was)
 	WritebackFileData *udata = data;
 	/* Shut down while retrying writeback */
 	g_debug ("Shutdown while retrying WRITEBACK after unmount, not retrying anymore");
-	g_source_remove (udata->retry_timeout);
+	if (udata->retry_timeout != 0) {
+		g_source_remove (udata->retry_timeout);
+	}
 	udata->self = NULL;
 	writeback_file_data_free (udata);
 }
@@ -341,6 +343,7 @@ writeback_dispatcher_writeback_file (TrackerMinerFS *fs,
 
 	g_variant_builder_close (&builder);
 
+	data->retry_timeout = 0;
 	data->self = self;
 	g_object_weak_ref (G_OBJECT (data->self), self_weak_notify, data);
 	data->fs = g_object_ref (fs);