[tracker] Renamed the Writeback() DBus method to IgnoreNextUpdate()



commit 0bdb9bbee6794e36be967bf6ed02d8e8a5501584
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Feb 10 11:38:02 2010 +0100

    Renamed the Writeback() DBus method to IgnoreNextUpdate()

 data/dbus/tracker-miner.xml                    |    4 +-
 src/libtracker-miner/tracker-miner-dbus.h      |    2 +-
 src/libtracker-miner/tracker-miner-fs.c        |  103 +++++++++++------------
 src/libtracker-miner/tracker-miner-fs.h        |   11 +--
 src/libtracker-miner/tracker-miner-manager.c   |   16 ++--
 src/libtracker-miner/tracker-miner-manager.h   |    7 +-
 src/libtracker-miner/tracker-miner.c           |   40 +++++-----
 src/libtracker-miner/tracker-miner.h           |   11 ++-
 src/tracker-miner-fs/tracker-miner-files.c     |   20 +++--
 src/tracker-writeback/tracker-writeback-file.c |   10 +-
 10 files changed, 110 insertions(+), 114 deletions(-)
---
diff --git a/data/dbus/tracker-miner.xml b/data/dbus/tracker-miner.xml
index 07e3ece..dba7abb 100644
--- a/data/dbus/tracker-miner.xml
+++ b/data/dbus/tracker-miner.xml
@@ -27,9 +27,9 @@
       <arg type="i" name="cookie" direction="in" />
     </method>
 
-    <method name="Writeback">
+    <method name="IgnoreNextUpdate">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <arg type="as" name="subjects" direction="in" />
+      <arg type="as" name="urls" direction="in" />
     </method>
 
     <!-- Signals -->
diff --git a/src/libtracker-miner/tracker-miner-dbus.h b/src/libtracker-miner/tracker-miner-dbus.h
index 59d00e0..86c1df7 100644
--- a/src/libtracker-miner/tracker-miner-dbus.h
+++ b/src/libtracker-miner/tracker-miner-dbus.h
@@ -54,7 +54,7 @@ void tracker_miner_dbus_resume            (TrackerMiner           *miner,
                                            gint                    cookie,
                                            DBusGMethodInvocation  *context,
                                            GError                **error);
-void tracker_miner_dbus_writeback         (TrackerMiner           *miner,
+void tracker_miner_dbus_ignore_next_update(TrackerMiner           *miner,
                                            const GStrv             subjects,
                                            DBusGMethodInvocation  *context,
                                            GError                **error);
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index abe49fd..2fb7370 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -83,7 +83,7 @@ struct TrackerMinerFSPrivate {
 	GQueue         *items_updated;
 	GQueue         *items_deleted;
 	GQueue         *items_moved;
-	GHashTable     *items_writeback;
+	GHashTable     *items_ignore_next_update;
 
 	GQuark          quark_ignore_file;
 
@@ -129,7 +129,7 @@ enum {
 	QUEUE_UPDATED,
 	QUEUE_DELETED,
 	QUEUE_MOVED,
-	QUEUE_WRITEBACK
+	QUEUE_IGNORE_NEXT_UPDATE
 };
 
 enum {
@@ -138,7 +138,7 @@ enum {
 	CHECK_DIRECTORY_CONTENTS,
 	MONITOR_DIRECTORY,
 	PROCESS_FILE,
-	WRITEBACK_FILE,
+	IGNORE_NEXT_UPDATE_FILE,
 	FINISHED,
 	LAST_SIGNAL
 };
@@ -168,7 +168,7 @@ static void           miner_started                (TrackerMiner   *miner);
 static void           miner_stopped                (TrackerMiner   *miner);
 static void           miner_paused                 (TrackerMiner   *miner);
 static void           miner_resumed                (TrackerMiner   *miner);
-static void           miner_writeback              (TrackerMiner   *miner,
+static void           miner_ignore_next_update     (TrackerMiner   *miner,
                                                     const GStrv     subjects);
 
 static DirectoryData *directory_data_new           (GFile          *file,
@@ -242,7 +242,7 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 	miner_class->stopped = miner_stopped;
 	miner_class->paused  = miner_paused;
 	miner_class->resumed = miner_resumed;
-	miner_class->writeback = miner_writeback;
+	miner_class->ignore_next_update = miner_ignore_next_update;
 
 	fs_class->check_file        = fs_defaults;
 	fs_class->check_directory   = fs_defaults;
@@ -380,14 +380,14 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 		              3, G_TYPE_FILE, TRACKER_TYPE_SPARQL_BUILDER, G_TYPE_CANCELLABLE),
 
 		/**
-		 * TrackerMinerFS::writeback-file:
+		 * TrackerMinerFS::ignore-next-update-file:
 		 * @miner_fs: the #TrackerMinerFS
 		 * @file: a #GFile
 		 * @builder: a #TrackerSparqlBuilder
 		 * @cancellable: a #GCancellable
 		 *
-		 * The ::writeback-file signal is emitted whenever a file should
-		 * be marked as writeback, and it's metadata prepared for that.
+		 * The ::ignore-next-update-file signal is emitted whenever a file should
+		 * be marked as to ignore on next update, and it's metadata prepared for that.
 		 *
 		 * @builder is the #TrackerSparqlBuilder where all sparql updates
 		 * to be performed for @file will be appended.
@@ -395,11 +395,11 @@ tracker_miner_fs_class_init (TrackerMinerFSClass *klass)
 		 * Returns: %TRUE on success
 		 *          %FALSE on failure
 		 **/
-		signals[WRITEBACK_FILE] =
-		g_signal_new ("writeback-file",
+		signals[IGNORE_NEXT_UPDATE_FILE] =
+		g_signal_new ("ignore-next-update-file",
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_LAST,
-		              G_STRUCT_OFFSET (TrackerMinerFSClass, writeback_file),
+		              G_STRUCT_OFFSET (TrackerMinerFSClass, ignore_next_update_file),
 		              NULL, NULL,
 		              tracker_marshal_BOOLEAN__OBJECT_OBJECT_OBJECT,
 		              G_TYPE_BOOLEAN,
@@ -451,9 +451,9 @@ tracker_miner_fs_init (TrackerMinerFS *object)
 	priv->items_updated = g_queue_new ();
 	priv->items_deleted = g_queue_new ();
 	priv->items_moved = g_queue_new ();
-	priv->items_writeback = g_hash_table_new_full (g_str_hash, g_str_equal,
-	                                               (GDestroyNotify) g_free,
-	                                               (GDestroyNotify) NULL);
+	priv->items_ignore_next_update = g_hash_table_new_full (g_str_hash, g_str_equal,
+	                                                        (GDestroyNotify) g_free,
+	                                                        (GDestroyNotify) NULL);
 
 	/* Set up the crawlers now we have config and hal */
 	priv->crawler = tracker_crawler_new ();
@@ -585,7 +585,7 @@ fs_finalize (GObject *object)
 	g_queue_foreach (priv->items_created, (GFunc) g_object_unref, NULL);
 	g_queue_free (priv->items_created);
 
-	g_hash_table_unref (priv->items_writeback);
+	g_hash_table_unref (priv->items_ignore_next_update);
 
 	G_OBJECT_CLASS (tracker_miner_fs_parent_class)->finalize (object);
 }
@@ -718,16 +718,16 @@ miner_resumed (TrackerMiner *miner)
 
 
 static void
-miner_writeback (TrackerMiner *miner, const GStrv subjects)
+miner_ignore_next_update (TrackerMiner *miner, const GStrv urls)
 {
 	TrackerMinerFS *fs;
 	guint n;
 
 	fs = TRACKER_MINER_FS (miner);
 
-	for (n = 0; subjects[n] != NULL; n++) {
-		g_hash_table_insert (fs->private->items_writeback,
-		                     g_strdup (subjects[n]),
+	for (n = 0; urls[n] != NULL; n++) {
+		g_hash_table_insert (fs->private->items_ignore_next_update,
+		                     g_strdup (urls[n]),
 		                     GINT_TO_POINTER (TRUE));
 	}
 
@@ -1149,9 +1149,9 @@ item_remove (TrackerMinerFS *fs,
 }
 
 static gboolean
-item_writeback (TrackerMinerFS *fs,
-                GFile          *file,
-                GFile          *source_file)
+item_ignore_next_update (TrackerMinerFS *fs,
+                         GFile          *file,
+                         GFile          *source_file)
 {
 	TrackerSparqlBuilder *sparql;
 	gchar *uri;
@@ -1159,20 +1159,20 @@ item_writeback (TrackerMinerFS *fs,
 	GCancellable *cancellable;
 	GFile *working_file;
 
-	/* While we are in writeback:
+	/* While we are in ignore-on-next-update:
 	 * o. We always ignore deletes because it's never the final operation
-	 *    of a writeback. We have a delete when both are null.
-	 * o. A create means the writeback used rename(). This is the final
-	 *    operation of a writeback and thus we make the update query.
+	 *    of a write. We have a delete when both are null.
+	 * o. A create means the write used rename(). This is the final
+	 *    operation of a write and thus we make the update query.
 	 *    We have a create when file == null and source_file != null
-	 * o. A move means the writeback used rename(). This is the final
-	 *    operation of a writeback and thus we make the update query.
+	 * o. A move means the write used rename(). This is the final
+	 *    operation of a write and thus we make the update query.
 	 *    We have a move when both file and source_file aren't null.
-	 * o. A update means the writeback didn't use rename(). This is the
-	 *    final operation of a writeback and thus we make the update query.
+	 * o. A update means the write didn't use rename(). This is the
+	 *    final operation of a write and thus we make the update query.
 	 *    An update means that file != null and source_file == null. */
 
-	/* Happens on delete while in writeback */
+	/* Happens on delete while in write */
 	if (!file && !source_file) {
 		return TRUE;
 	}
@@ -1180,28 +1180,23 @@ item_writeback (TrackerMinerFS *fs,
 	/* Create or update, we are the final one so we make the update query */
 
 	if (!file && source_file) {
-		/* Happens on create while in writeback */
+		/* Happens on create while in write */
 		working_file = source_file;
 	} else {
-		/* Happens on update while in writeback */
+		/* Happens on update while in write */
 		working_file = file;
 	}
 
 	uri = g_file_get_uri (working_file);
 
-	g_debug ("Updating item: '%s' (Writeback event)", uri);
-
-	/* if (!item_query_exists (fs, working_file, NULL, NULL)) {
-		g_debug ("  File does not exist anyway (uri:'%s')", uri);
-		return TRUE;
-	} */
+	g_debug ("Updating item: '%s' (IgnoreNextUpdate event)", uri);
 
 	cancellable = g_cancellable_new ();
 	sparql = tracker_sparql_builder_new_update ();
 	g_object_ref (working_file);
 
-	/* Writeback */
-	g_signal_emit (fs, signals[WRITEBACK_FILE], 0,
+	/* IgnoreNextUpdate */
+	g_signal_emit (fs, signals[IGNORE_NEXT_UPDATE_FILE], 0,
 	               working_file, sparql, cancellable, &success);
 
 	if (success) {
@@ -1231,7 +1226,7 @@ item_writeback (TrackerMinerFS *fs,
 		g_free (query);
 	}
 
-	g_hash_table_remove (fs->private->items_writeback, uri);
+	g_hash_table_remove (fs->private->items_ignore_next_update, uri);
 
 	g_object_unref (sparql);
 	g_object_unref (working_file);
@@ -1451,10 +1446,10 @@ item_move (TrackerMinerFS *fs,
 }
 
 static gboolean
-check_writeback (TrackerMinerFS *fs, GFile *queue_file)
+check_ignore_next_update (TrackerMinerFS *fs, GFile *queue_file)
 {
 	gchar *uri = g_file_get_uri (queue_file);
-	if (g_hash_table_lookup (fs->private->items_writeback, uri)) {
+	if (g_hash_table_lookup (fs->private->items_ignore_next_update, uri)) {
 		g_free (uri);
 		return TRUE;
 	}
@@ -1474,9 +1469,9 @@ item_queue_get_next_file (TrackerMinerFS  *fs,
 	queue_file = g_queue_pop_head (fs->private->items_deleted);
 	if (queue_file) {
 		*source_file = NULL;
-		if (check_writeback (fs, queue_file)) {
+		if (check_ignore_next_update (fs, queue_file)) {
 			*file = NULL;
-			return QUEUE_WRITEBACK;
+			return QUEUE_IGNORE_NEXT_UPDATE;
 		}
 		*file = queue_file;
 		return QUEUE_DELETED;
@@ -1485,10 +1480,10 @@ item_queue_get_next_file (TrackerMinerFS  *fs,
 	/* Created items next */
 	queue_file = g_queue_pop_head (fs->private->items_created);
 	if (queue_file) {
-		if (check_writeback (fs, queue_file)) {
+		if (check_ignore_next_update (fs, queue_file)) {
 			*file = NULL;
 			*source_file = queue_file;
-			return QUEUE_WRITEBACK;
+			return QUEUE_IGNORE_NEXT_UPDATE;
 		}
 		*file = queue_file;
 		*source_file = NULL;
@@ -1500,8 +1495,8 @@ item_queue_get_next_file (TrackerMinerFS  *fs,
 	if (queue_file) {
 		*file = queue_file;
 		*source_file = NULL;
-		if (check_writeback (fs, queue_file))
-			return QUEUE_WRITEBACK;
+		if (check_ignore_next_update (fs, queue_file))
+			return QUEUE_IGNORE_NEXT_UPDATE;
 		return QUEUE_UPDATED;
 	}
 
@@ -1511,8 +1506,8 @@ item_queue_get_next_file (TrackerMinerFS  *fs,
 		*file = g_object_ref (data->file);
 		*source_file = g_object_ref (data->source_file);
 		item_moved_data_free (data);
-		if (check_writeback (fs, *file))
-			return QUEUE_WRITEBACK;
+		if (check_ignore_next_update (fs, *file))
+			return QUEUE_IGNORE_NEXT_UPDATE;
 		return QUEUE_MOVED;
 	}
 
@@ -1653,8 +1648,8 @@ item_queue_handlers_cb (gpointer user_data)
 	case QUEUE_UPDATED:
 		keep_processing = item_add_or_update (fs, file);
 		break;
-	case QUEUE_WRITEBACK:
-		keep_processing = item_writeback (fs, file, source_file);
+	case QUEUE_IGNORE_NEXT_UPDATE:
+		keep_processing = item_ignore_next_update (fs, file, source_file);
 		break;
 	default:
 		g_assert_not_reached ();
diff --git a/src/libtracker-miner/tracker-miner-fs.h b/src/libtracker-miner/tracker-miner-fs.h
index a9d1989..f212173 100644
--- a/src/libtracker-miner/tracker-miner-fs.h
+++ b/src/libtracker-miner/tracker-miner-fs.h
@@ -57,7 +57,7 @@ struct TrackerMinerFS {
  * @check_directory: Called when a directory should be checked for further processing
  * @check_directory_contents: Called when a directory should be checked for further processing, based on the directory contents.
  * @process_file: Called when the metadata associated to a file is requested.
- * @writeback_file: Called after a writeback event happens on a file.
+ * @ignore_next_update_file: Called after a writeback event happens on a file.
  * @monitor_directory: Called to check whether a directory should be modified.
  * @finished: Called when all processing has been performed.
  *
@@ -79,11 +79,10 @@ typedef struct {
 	                                    GFile                *file,
 	                                    TrackerSparqlBuilder *builder,
 	                                    GCancellable         *cancellable);
-	gboolean (* writeback_file)        (TrackerMinerFS       *fs,
-	                                    GFile                *file,
-	                                    TrackerSparqlBuilder *builder,
-	                                    GCancellable         *cancellable);
-
+	gboolean (* ignore_next_update_file) (TrackerMinerFS       *fs,
+	                                      GFile                *file,
+	                                      TrackerSparqlBuilder *builder,
+	                                      GCancellable         *cancellable);
 	gboolean (* monitor_directory)     (TrackerMinerFS       *fs,
 	                                    GFile                *file);
 	void     (* finished)              (TrackerMinerFS       *fs);
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index 06e7220..c0d2930 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -932,19 +932,19 @@ tracker_miner_manager_get_description (TrackerMinerManager *manager,
 
 
 /**
- * tracker_miner_manager_writeback:
+ * tracker_miner_manager_ignore_next_update:
  * @manager: a #TrackerMinerManager.
  * @miner: miner reference
- * @subjects: subjects to mark as writeback
+ * @urls: subjects to mark as writeback
  *
  * Asks @miner to mark @subjects as writeback
  *
- * Returns: %TRUE if the miner was asked to writeback successfully.
+ * Returns: %TRUE if the miner was asked to ignore on next update successfully.
  **/
 gboolean
-tracker_miner_manager_writeback (TrackerMinerManager *manager,
-                                 const gchar         *miner,
-                                 const gchar        **subjects)
+tracker_miner_manager_ignore_next_update (TrackerMinerManager *manager,
+                                          const gchar         *miner,
+                                          const gchar        **urls)
 {
 	DBusGProxy *proxy;
 	const gchar *app_name;
@@ -971,10 +971,10 @@ tracker_miner_manager_writeback (TrackerMinerManager *manager,
 		app_name = "TrackerMinerManager client";
 	}
 
-	org_freedesktop_Tracker1_Miner_writeback (proxy, subjects, &error);
+	org_freedesktop_Tracker1_Miner_ignore_next_update (proxy, urls, &error);
 
 	if (error) {
-		g_warning ("Could not writeback miner '%s': %s", miner, error->message);
+		g_warning ("Could not ignore next update for miner '%s': %s", miner, error->message);
 		g_error_free (error);
 		return FALSE;
 	}
diff --git a/src/libtracker-miner/tracker-miner-manager.h b/src/libtracker-miner/tracker-miner-manager.h
index 8d3ae77..ca66ab4 100644
--- a/src/libtracker-miner/tracker-miner-manager.h
+++ b/src/libtracker-miner/tracker-miner-manager.h
@@ -92,10 +92,9 @@ gboolean tracker_miner_manager_get_status (TrackerMinerManager  *manager,
                                            const gchar          *miner,
                                            gchar               **status,
                                            gdouble              *progress);
-gboolean tracker_miner_manager_writeback  (TrackerMinerManager *manager,
-                                           const gchar         *miner,
-                                           const gchar        **subjects);
-
+gboolean tracker_miner_manager_ignore_next_update    (TrackerMinerManager *manager,
+                                                      const gchar         *miner,
+                                                      const gchar        **urls);
 const gchar * tracker_miner_manager_get_display_name (TrackerMinerManager *manager,
                                                       const gchar         *miner);
 const gchar * tracker_miner_manager_get_description  (TrackerMinerManager *manager,
diff --git a/src/libtracker-miner/tracker-miner.c b/src/libtracker-miner/tracker-miner.c
index 82aea72..85203dd 100644
--- a/src/libtracker-miner/tracker-miner.c
+++ b/src/libtracker-miner/tracker-miner.c
@@ -99,7 +99,7 @@ enum {
 	RESUMED,
 	PROGRESS,
 	ERROR,
-	WRITEBACK,
+	IGNORE_NEXT_UPDATE,
 	LAST_SIGNAL
 };
 
@@ -248,19 +248,19 @@ tracker_miner_class_init (TrackerMinerClass *klass)
 		              G_TYPE_POINTER);
 
 	/**
-	 * TrackerMiner::writeback:
+	 * TrackerMiner::ignore-next-update:
 	 * @miner: the #TrackerMiner
-	 * @subjects: the subjects to mark as writeback
+	 * @urls: the urls to mark as ignore on next update
 	 *
-	 * the ::writeback signal is emitted in the miner
-	 * right after it has been asked to mark @subjects as writeback through
-	 * tracker_miner_writeback().
+	 * the ::ignore-next-update signal is emitted in the miner
+	 * right after it has been asked to mark @urls as to ignore on next update
+	 * through tracker_miner_ignore_next_update().
 	 **/
-	signals[WRITEBACK] =
-		g_signal_new ("writeback",
+	signals[IGNORE_NEXT_UPDATE] =
+		g_signal_new ("ignore-next-update",
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_LAST,
-		              G_STRUCT_OFFSET (TrackerMinerClass, writeback),
+		              G_STRUCT_OFFSET (TrackerMinerClass, ignore_next_update),
 		              NULL, NULL,
 		              g_cclosure_marshal_VOID__BOXED,
 		              G_TYPE_NONE, 1,
@@ -954,19 +954,19 @@ tracker_miner_stop (TrackerMiner *miner)
 }
 
 /**
- * tracker_miner_writeback:
+ * tracker_miner_ignore_next_update:
  * @miner: a #TrackerMiner
- * @subjects: the subjects to mark as writeback
+ * @urls: the urls to mark as to ignore on next update
  *
- * Tells the miner to mark @subjects are writeback.
+ * Tells the miner to mark @urls are to ignore on next update.
  **/
 void
-tracker_miner_writeback (TrackerMiner *miner,
-                         const GStrv   subjects)
+tracker_miner_ignore_next_update (TrackerMiner *miner,
+                                  const GStrv   urls)
 {
 	g_return_if_fail (TRACKER_IS_MINER (miner));
 
-	g_signal_emit (miner, signals[WRITEBACK], 0, subjects);
+	g_signal_emit (miner, signals[IGNORE_NEXT_UPDATE], 0, urls);
 }
 
 /**
@@ -1501,10 +1501,10 @@ tracker_miner_dbus_resume (TrackerMiner           *miner,
 }
 
 void
-tracker_miner_dbus_writeback (TrackerMiner           *miner,
-                              const GStrv             subjects,
-                              DBusGMethodInvocation  *context,
-                              GError                **error)
+tracker_miner_dbus_ignore_next_update (TrackerMiner           *miner,
+                                       const GStrv             urls,
+                                       DBusGMethodInvocation  *context,
+                                       GError                **error)
 {
 	guint request_id;
 
@@ -1514,7 +1514,7 @@ tracker_miner_dbus_writeback (TrackerMiner           *miner,
 
 	tracker_dbus_request_new (request_id, context, "%s()", __PRETTY_FUNCTION__);
 
-	tracker_miner_writeback (miner, subjects);
+	tracker_miner_ignore_next_update (miner, urls);
 
 	tracker_dbus_request_success (request_id, context);
 	dbus_g_method_return (context);
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index 29197b0..74af0dd 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -59,7 +59,7 @@ struct TrackerMiner {
  * @terminated: terminated.
  * @progress: progress.
  * @error: error.
- * @writeback: Called after writeback event happens.
+ * @ignore_next_update: Called after ignore on next update event happens.
  *
  * Virtual methods left to implement.
  **/
@@ -79,8 +79,9 @@ typedef struct {
 
 	void (* error)      (TrackerMiner *miner,
 	                     GError       *error);
-	void (* writeback)  (TrackerMiner *miner,
-	                     const GStrv   subjects);
+	void (* ignore_next_update)
+	                    (TrackerMiner *miner,
+	                     const GStrv   urls);
 } TrackerMinerClass;
 
 GType            tracker_miner_get_type                    (void) G_GNUC_CONST;
@@ -88,8 +89,8 @@ GQuark           tracker_miner_error_quark                 (void);
 
 void             tracker_miner_start                       (TrackerMiner         *miner);
 void             tracker_miner_stop                        (TrackerMiner         *miner);
-void             tracker_miner_writeback                   (TrackerMiner         *miner,
-                                                            const GStrv           subjects);
+void             tracker_miner_ignore_next_update          (TrackerMiner         *miner,
+                                                            const GStrv           urls);
 gboolean         tracker_miner_is_started                  (TrackerMiner         *miner);
 gint             tracker_miner_pause                       (TrackerMiner         *miner,
                                                             const gchar          *reason,
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index ff69a6f..08d27d1 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -142,7 +142,7 @@ static gboolean    miner_files_process_file             (TrackerMinerFS       *f
                                                          GCancellable         *cancellable);
 static gboolean    miner_files_monitor_directory        (TrackerMinerFS       *fs,
                                                          GFile                *file);
-static gboolean    miner_files_writeback_file           (TrackerMinerFS       *fs,
+static gboolean    miner_files_ignore_next_update_file  (TrackerMinerFS       *fs,
                                                          GFile                *file,
                                                          TrackerSparqlBuilder *sparql,
                                                          GCancellable         *cancellable);
@@ -165,7 +165,7 @@ tracker_miner_files_class_init (TrackerMinerFilesClass *klass)
 	miner_fs_class->check_directory_contents = miner_files_check_directory_contents;
 	miner_fs_class->monitor_directory = miner_files_monitor_directory;
 	miner_fs_class->process_file = miner_files_process_file;
-	miner_fs_class->writeback_file = miner_files_writeback_file;
+	miner_fs_class->ignore_next_update_file = miner_files_ignore_next_update_file;
 
 	g_object_class_install_property (object_class,
 	                                 PROP_CONFIG,
@@ -1599,10 +1599,10 @@ miner_files_process_file (TrackerMinerFS       *fs,
 }
 
 static gboolean
-miner_files_writeback_file (TrackerMinerFS       *fs,
-                            GFile                *file,
-                            TrackerSparqlBuilder *sparql,
-                            GCancellable         *cancellable)
+miner_files_ignore_next_update_file (TrackerMinerFS       *fs,
+                                     GFile                *file,
+                                     TrackerSparqlBuilder *sparql,
+                                     GCancellable         *cancellable)
 {
 	const gchar *attrs;
 	const gchar *mime_type;
@@ -1623,7 +1623,7 @@ miner_files_writeback_file (TrackerMinerFS       *fs,
 	                               cancellable, &error);
 
 	if (error) {
-		g_warning ("Can't writeback: '%s'", error->message);
+		g_warning ("Can't ignore-next-update: '%s'", error->message);
 		g_clear_error (&error);
 		return FALSE;
 	}
@@ -1631,8 +1631,10 @@ miner_files_writeback_file (TrackerMinerFS       *fs,
 	uri = g_file_get_uri (file);
 	mime_type = g_file_info_get_content_type (file_info);
 
-	/* For writeback we only write a few properties back. These properties
-	 * should NEVER be marked as tracker:writeback in the ontology ! */
+	/* For ignore-next-update we only write a few properties back. These properties
+	 * should NEVER be marked as tracker:writeback in the ontology! (else you break
+	 * the tracker-writeback feature) */
+
 	tracker_sparql_builder_insert_open (sparql, uri);
 
 	tracker_sparql_builder_subject_variable (sparql, "urn");
diff --git a/src/tracker-writeback/tracker-writeback-file.c b/src/tracker-writeback/tracker-writeback-file.c
index 8ca323d..ae18743 100644
--- a/src/tracker-writeback/tracker-writeback-file.c
+++ b/src/tracker-writeback/tracker-writeback-file.c
@@ -68,7 +68,7 @@ tracker_writeback_file_update_metadata (TrackerWriteback *writeback,
 	gboolean retval;
 	GFile *file;
 	GFileInfo *file_info;
-	const gchar *subjects[2] = { NULL, NULL };
+	const gchar *urls[2] = { NULL, NULL };
 	GStrv row;
 	TrackerWritebackFile *self;
 	const gchar * const *content_types;
@@ -126,11 +126,11 @@ tracker_writeback_file_update_metadata (TrackerWriteback *writeback,
 
 		tracker_file_lock (file);
 
-		subjects[0] = row[0];
+		urls[0] = row[0];
 
-		tracker_miner_manager_writeback (tracker_writeback_get_miner_manager (),
-		                                 "org.freedesktop.Tracker1.Miner.Files",
-		                                 subjects);
+		tracker_miner_manager_ignore_next_update (tracker_writeback_get_miner_manager (),
+		                                          "org.freedesktop.Tracker1.Miner.Files",
+		                                          urls);
 
 		retval = (writeback_file_class->update_file_metadata) (TRACKER_WRITEBACK_FILE (writeback),
 		                                                       file, values, client);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]