Tracker: headers diff between 1.0.1 and 1.1.2 versions

	tracker-generated.h	tracker-generated.h
	#if !defined (__LIBTRACKER_SPARQL_INSIDE__) && !defined (TRACKER_COMPILATIO N)	#if !defined (__LIBTRACKER_SPARQL_INSIDE__) && !defined (TRACKER_COMPILATIO N)
	#error "only <libtracker-sparql/tracker-sparql.h> must be included directly ."	#error "only <libtracker-sparql/tracker-sparql.h> must be included directly ."
	#endif	#endif

	/* tracker-generated-no-checks.h generated by valac 0.24.0.36-e935, the Val a compiler, do not modify */	/* tracker-generated-no-checks.h generated by valac 0.24.0.131-42e78, the V ala compiler, do not modify */

	#ifndef __TRACKER_GENERATED_NO_CHECKS_H__	#ifndef __TRACKER_GENERATED_NO_CHECKS_H__
	#define __TRACKER_GENERATED_NO_CHECKS_H__	#define __TRACKER_GENERATED_NO_CHECKS_H__

	#include <glib.h>	#include <glib.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <stdlib.h>	#include <stdlib.h>
	#include <string.h>	#include <string.h>
	#include <time.h>	#include <time.h>
	#include <float.h>	#include <float.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	tracker-indexing-tree.h	tracker-indexing-tree.h

	skipping to change at line 49	skipping to change at line 49
	#define TRACKER_INDEXING_TREE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_INDEXING_TREE, TrackerIndexingTreeClass))	#define TRACKER_INDEXING_TREE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_INDEXING_TREE, TrackerIndexingTreeClass))

	/**	/**
	* TrackerIndexingTree:	* TrackerIndexingTree:
	*	*
	* Base object used to configure indexing within #TrackerMinerFS items.	* Base object used to configure indexing within #TrackerMinerFS items.
	*/	*/

	typedef struct _TrackerIndexingTree TrackerIndexingTree;	typedef struct _TrackerIndexingTree TrackerIndexingTree;


	struct _TrackerIndexingTree	struct _TrackerIndexingTree {
	{
	GObject parent_instance;	GObject parent_instance;
	gpointer priv;	gpointer priv;
	};	};

	/**	/**
	* TrackerIndexingTreeClass:	* TrackerIndexingTreeClass:
	* @parent_class: parent object class	* @parent_class: parent object class
	* @directory_added: Called when a directory is added.	* @directory_added: Called when a directory is added.
	* @directory_removed: Called when a directory is removed.	* @directory_removed: Called when a directory is removed.
	* @directory_updated: Called when a directory is updated.	* @directory_updated: Called when a directory is updated.

	skipping to change at line 81	skipping to change at line 80
	GFile *directory);	GFile *directory);
	void (* directory_updated) (TrackerIndexingTree *indexing_tree,	void (* directory_updated) (TrackerIndexingTree *indexing_tree,
	GFile *directory);	GFile *directory);

	/* <Private> */	/* <Private> */
	gpointer padding[10];	gpointer padding[10];
	} TrackerIndexingTreeClass;	} TrackerIndexingTreeClass;

	GType tracker_indexing_tree_get_type (void) G_GNUC_CONST;	GType tracker_indexing_tree_get_type (void) G_GNUC_CONST;


	TrackerIndexingTree * tracker_indexing_tree_new (void);	TrackerIndexingTree * tracker_indexing_tree_new (GFile *root);

	void tracker_indexing_tree_add (TrackerIndexingTree *tree,	void tracker_indexing_tree_add (TrackerIndexingTree *tree,
	GFile *directory,	GFile *directory,
	TrackerDirectoryFlags flags);	TrackerDirectoryFlags flags);
	void tracker_indexing_tree_remove (TrackerIndexingTree *tree,	void tracker_indexing_tree_remove (TrackerIndexingTree *tree,
	GFile *directory);	GFile *directory);

	void tracker_indexing_tree_add_filter (TrackerIndexingTree *tree,	void tracker_indexing_tree_add_filter (TrackerIndexingTree *tree,
	TrackerFilterType filter,	TrackerFilterType filter,
	const gchar *glob_string);	const gchar *glob_string);

	skipping to change at line 118	skipping to change at line 117

	TrackerFilterPolicy tracker_indexing_tree_get_default_policy (TrackerIndexi ngTree *tree,	TrackerFilterPolicy tracker_indexing_tree_get_default_policy (TrackerIndexi ngTree *tree,
	TrackerFilter Type filter);	TrackerFilter Type filter);
	void tracker_indexing_tree_set_default_policy (TrackerIndexi ngTree *tree,	void tracker_indexing_tree_set_default_policy (TrackerIndexi ngTree *tree,
	TrackerFilter Type filter,	TrackerFilter Type filter,
	TrackerFilter Policy policy);	TrackerFilter Policy policy);

	GFile * tracker_indexing_tree_get_root (TrackerIndexingTree *tree,	GFile * tracker_indexing_tree_get_root (TrackerIndexingTree *tree,
	GFile *file,	GFile *file,
	TrackerDirectoryFlags *directory_flags);	TrackerDirectoryFlags *directory_flags);

		GFile * tracker_indexing_tree_get_master_root (TrackerIndexingTree
		*tree);

	gboolean tracker_indexing_tree_file_is_root (TrackerIndexingTree *tree,	gboolean tracker_indexing_tree_file_is_root (TrackerIndexingTree *tree,
	GFile *file);	GFile *file);

	GList * tracker_indexing_tree_list_roots (TrackerIndexingTree *tree);	GList * tracker_indexing_tree_list_roots (TrackerIndexingTree *tree);

	G_END_DECLS	G_END_DECLS

	#endif /* __TRACKER_INDEXING_TREE_H__ */	#endif /* __TRACKER_INDEXING_TREE_H__ */

End of changes. 3 change blocks.
	3 lines changed or deleted	5 lines changed or added

	tracker-miner-enums.h	tracker-miner-enums.h

	skipping to change at line 112	skipping to change at line 112
	**/	**/
	typedef enum {	typedef enum {
	TRACKER_NETWORK_TYPE_NONE,	TRACKER_NETWORK_TYPE_NONE,
	TRACKER_NETWORK_TYPE_UNKNOWN,	TRACKER_NETWORK_TYPE_UNKNOWN,
	TRACKER_NETWORK_TYPE_GPRS,	TRACKER_NETWORK_TYPE_GPRS,
	TRACKER_NETWORK_TYPE_EDGE,	TRACKER_NETWORK_TYPE_EDGE,
	TRACKER_NETWORK_TYPE_3G,	TRACKER_NETWORK_TYPE_3G,
	TRACKER_NETWORK_TYPE_LAN	TRACKER_NETWORK_TYPE_LAN
	} TrackerNetworkType;	} TrackerNetworkType;


		/**
		* TrackerCrawlFlags:
		* @TRACKER_CRAWL_FLAG_NONE: No flags.
		* @TRACKER_CRAWL_FLAG_NO_STAT: For cases where the content being crawled b
		y the
		* #TrackerEnumerator is not local (e.g. it's on a server somewhere),
		* use the #TRACKER_CRAWL_FLAG_NO_STAT flag. The default is to use
		* stat() and assume we're mining a local or mounted file system.
		* @TRACKER_CRAWL_FLAG_FOLLOW_SYMLINKS: The enumerator should follow
		* symlinks. This is disabled by default because it's easy for Tracker
		* to get into recursive loop situations with symlinks. For those
		* using interesting scenarios like git-annex or software heavily
		* using symlinks (and properly) this is for you.
		*
		* Flags used when crawling directory structures. This can be
		* dependent on the #TrackerEnumerator employed at the time of course.
		*/
		typedef enum {
		TRACKER_CRAWL_FLAG_NONE = 0,
		TRACKER_CRAWL_FLAG_NO_STAT = 1 << 1,
		TRACKER_CRAWL_FLAG_FOLLOW_SYMLINKS = 1 << 2,
		} TrackerCrawlFlags;

	G_END_DECLS	G_END_DECLS

	#endif /* __TRACKER_MINER_ENUMS_H__ */	#endif /* __TRACKER_MINER_ENUMS_H__ */

End of changes. 1 change blocks.
	0 lines changed or deleted	23 lines changed or added

	tracker-miner-fs.h	tracker-miner-fs.h

	skipping to change at line 33	skipping to change at line 33
	#if !defined (__LIBTRACKER_MINER_H_INSIDE__) && !defined (TRACKER_COMPILATI ON)	#if !defined (__LIBTRACKER_MINER_H_INSIDE__) && !defined (TRACKER_COMPILATI ON)
	#error "Only <libtracker-miner/tracker-miner.h> can be included directly."	#error "Only <libtracker-miner/tracker-miner.h> can be included directly."
	#endif	#endif

	#include <glib-object.h>	#include <glib-object.h>
	#include <gio/gio.h>	#include <gio/gio.h>

	#include <libtracker-sparql/tracker-sparql.h>	#include <libtracker-sparql/tracker-sparql.h>

	#include "tracker-miner-object.h"	#include "tracker-miner-object.h"

	#include "tracker-indexing-tree.h"

	#include "tracker-miner-common.h"	#include "tracker-miner-common.h"

		#include "tracker-data-provider.h"
		#include "tracker-indexing-tree.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TRACKER_TYPE_MINER_FS (tracker_miner_fs_get_type())	#define TRACKER_TYPE_MINER_FS (tracker_miner_fs_get_type())
	#define TRACKER_MINER_FS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRA CKER_TYPE_MINER_FS, TrackerMinerFS))	#define TRACKER_MINER_FS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRA CKER_TYPE_MINER_FS, TrackerMinerFS))
	#define TRACKER_MINER_FS_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKE R_TYPE_MINER_FS, TrackerMinerFSClass))	#define TRACKER_MINER_FS_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKE R_TYPE_MINER_FS, TrackerMinerFSClass))
	#define TRACKER_IS_MINER_FS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRA CKER_TYPE_MINER_FS))	#define TRACKER_IS_MINER_FS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRA CKER_TYPE_MINER_FS))
	#define TRACKER_IS_MINER_FS_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACK ER_TYPE_MINER_FS))	#define TRACKER_IS_MINER_FS_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACK ER_TYPE_MINER_FS))
	#define TRACKER_MINER_FS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRAC KER_TYPE_MINER_FS, TrackerMinerFSClass))	#define TRACKER_MINER_FS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRAC KER_TYPE_MINER_FS, TrackerMinerFSClass))


	skipping to change at line 70	skipping to change at line 70
	* TrackerMinerFSClass:	* TrackerMinerFSClass:
	* @parent: parent object class	* @parent: parent object class
	* @process_file: Called when the metadata associated to a file is	* @process_file: Called when the metadata associated to a file is
	* requested.	* requested.
	* @ignore_next_update_file: Called after a writeback event happens on	* @ignore_next_update_file: Called after a writeback event happens on
	* a file (deprecated since 0.12).	* a file (deprecated since 0.12).
	* @finished: Called when all processing has been performed.	* @finished: Called when all processing has been performed.
	* @process_file_attributes: Called when the metadata associated with	* @process_file_attributes: Called when the metadata associated with
	* a file's attributes changes, for example, the mtime.	* a file's attributes changes, for example, the mtime.
	* @writeback_file: Called when a file must be written back	* @writeback_file: Called when a file must be written back

		* @finished_root: Called when all resources on a particular root URI
		* have been processed.
	* @padding: Reserved for future API improvements.	* @padding: Reserved for future API improvements.


	*	*
	* Prototype for the abstract class, @process_file must be implemented	* Prototype for the abstract class, @process_file must be implemented
	* in the deriving class in order to actually extract data.	* in the deriving class in order to actually extract data.
	**/	**/
	typedef struct {	typedef struct {
	TrackerMinerClass parent;	TrackerMinerClass parent;

	gboolean (* process_file) (TrackerMinerFS *fs,	gboolean (* process_file) (TrackerMinerFS *fs,
	GFile *file,	GFile *file,
	TrackerSparqlBuilder *builder ,	TrackerSparqlBuilder *builder ,
	GCancellable *cancell able);	GCancellable *cancell able);
	gboolean (* ignore_next_update_file) (TrackerMinerFS *fs,	gboolean (* ignore_next_update_file) (TrackerMinerFS *fs,
	GFile *file,	GFile *file,
	TrackerSparqlBuilder *builder ,	TrackerSparqlBuilder *builder ,
	GCancellable *cancell able);	GCancellable *cancell able);

	void (* finished) (TrackerMinerFS *fs);	void (* finished) (TrackerMinerFS *fs,
		gdouble elapsed
		,
		gint directo
		ries_found,
		gint directo
		ries_ignored,
		gint files_f
		ound,
		gint files_i
		gnored);
	gboolean (* process_file_attributes) (TrackerMinerFS *fs,	gboolean (* process_file_attributes) (TrackerMinerFS *fs,
	GFile *file,	GFile *file,
	TrackerSparqlBuilder *builder ,	TrackerSparqlBuilder *builder ,
	GCancellable *cancell able);	GCancellable *cancell able);
	gboolean (* writeback_file) (TrackerMinerFS *fs,	gboolean (* writeback_file) (TrackerMinerFS *fs,
	GFile *file,	GFile *file,
	GStrv rdf_typ es,	GStrv rdf_typ es,
	GPtrArray *results );	GPtrArray *results );

		void (* finished_root) (TrackerMinerFS *fs,
		GFile *root,
		gint directo
		ries_found,
		gint directo
		ries_ignored,
		gint files_f
		ound,
		gint files_i
		gnored);

	/* <Private> */	/* <Private> */

	gpointer padding[10];	gpointer padding[9];
	} TrackerMinerFSClass;	} TrackerMinerFSClass;


	GType tracker_miner_fs_get_type (void) G_GNUC_C	/**
	ONST;	* TrackerMinerFSError:
	void tracker_miner_fs_directory_add (TrackerMinerFS	* @TRACKER_MINER_FS_ERROR_INIT: There was an error during
	*fs,	* initialization of the object. The specific details are in the
	GFile	* message.
	*file,	*
	gboolean	* Possible errors returned when calling creating new objects based on
	recurse);	* the #TrackerMinerFS type and other APIs available with this class.
	gboolean tracker_miner_fs_directory_remove (TrackerMinerFS	*
	*fs,	* Since: 1.2.
	GFile	**/
	*file);	typedef enum {
	gboolean tracker_miner_fs_directory_remove_full (TrackerMinerF	TRACKER_MINER_FS_ERROR_INIT,
	S *fs,	} TrackerMinerFSError;
	GFile
	*file);	GType tracker_miner_fs_get_type (void) G_GNUC_
	void tracker_miner_fs_check_file_with_priority (TrackerMin	CONST;
	erFS *fs,	GQuark tracker_miner_fs_error_quark (void);
	GFile
	*file,	/* Properties */
	gint	TrackerIndexingTree * tracker_miner_fs_get_indexing_tree (TrackerMinerF
	priority,	S *fs);
	gboolean	TrackerDataProvider * tracker_miner_fs_get_data_provider (TrackerMinerF
	check_parents);	S *fs);
	void tracker_miner_fs_check_directory_with_priority (Track	gdouble tracker_miner_fs_get_throttle (TrackerMinerF
	erMinerFS *fs,	S *fs);
	GFile	gboolean tracker_miner_fs_get_mtime_checking (TrackerMinerF
	*file,	S *fs);
	gint	gboolean tracker_miner_fs_get_initial_crawling (TrackerMinerF
	priority,	S *fs);
	gbool
	ean check_parents);	void tracker_miner_fs_set_throttle (TrackerMinerF
	void tracker_miner_fs_check_file (TrackerMinerFS	S *fs,
	*fs,	gdouble
	GFile	throttle);
	*file,	void tracker_miner_fs_set_mtime_checking (TrackerMinerF
	gboolean	S *fs,
	check_parents);	gboolean
	void tracker_miner_fs_writeback_file (TrackerMinerFS	mtime_checking);
	*fs,	void tracker_miner_fs_set_initial_crawling (TrackerMinerF
	GFile	S *fs,
	*file,	gboolean
	GStrv	do_initial_crawling);
	rdf_types,
	GPtrArray	/* Setting locations to be processed in IndexingTree */
	*results);	void tracker_miner_fs_add_directory_without_parent
	void tracker_miner_fs_writeback_notify (TrackerMinerFS	(TrackerMinerF
	*fs,	S *fs,
	GFile	GFile
	*file,	*file);
	const GError
	*error);	void tracker_miner_fs_directory_add (TrackerMinerF
	void tracker_miner_fs_check_directory (TrackerMinerFS	S *fs,
	*fs,	GFile
	GFile	*file,
	*file,	gboolean
	gboolean	recurse);
	check_parents);	gboolean tracker_miner_fs_directory_remove (TrackerMinerF
	void tracker_miner_fs_file_notify (TrackerMinerFS	S *fs,
	*fs,	GFile
	GFile	*file);
	*file,	gboolean tracker_miner_fs_directory_remove_full (TrackerMinerF
	const GError	S *fs,
	*error);	GFile
	void tracker_miner_fs_set_throttle (TrackerMinerFS	*file);
	*fs,	void tracker_miner_fs_force_mtime_checking (TrackerMinerF
	gdouble	S *fs,
	throttle);	GFile
	gdouble tracker_miner_fs_get_throttle (TrackerMinerFS	*directory);
	*fs);
	const gchar *tracker_miner_fs_get_urn (TrackerMinerFS	/* Queueing files to be processed AFTER checking rules in IndexingTree */
	*fs,	void tracker_miner_fs_check_file (TrackerMinerF
	GFile	S *fs,
	*file);	GFile
	const gchar *tracker_miner_fs_get_parent_urn (TrackerMinerFS	*file,
	*fs,	gboolean
	GFile	check_parents);
	*file);	void tracker_miner_fs_check_file_with_priority
	gchar *tracker_miner_fs_query_urn (TrackerMinerFS	(TrackerMinerF
	*fs,	S *fs,
	GFile	GFile
	*file);	*file,
	void tracker_miner_fs_force_recheck (TrackerMinerFS	gint
	*fs);	priority,
		gboolean
	void tracker_miner_fs_set_mtime_checking (TrackerMinerFS	check_parents);
	*fs,	void tracker_miner_fs_check_directory (TrackerMinerF
	gboolean	S *fs,
	mtime_checking);	GFile
	void tracker_miner_fs_set_initial_crawling (TrackerMinerFS	*file,
	*fs,	gboolean
	gboolean	check_parents);
	do_initial_crawling);	void tracker_miner_fs_check_directory_with_priority
	gboolean tracker_miner_fs_get_mtime_checking (TrackerMinerFS	(TrackerMinerF
	*fs);	S *fs,
	gboolean tracker_miner_fs_get_initial_crawling (TrackerMinerFS	GFile
	*fs);	*file,
		gint
	gboolean tracker_miner_fs_has_items_to_process (TrackerMinerFS	priority,
	*fs);	gboolean
		check_parents);
	void tracker_miner_fs_add_directory_without_parent (Tracke
	rMinerFS *fs,	void tracker_miner_fs_force_recheck (TrackerMinerF
	GFile	S *fs);
	*file);	void tracker_miner_fs_writeback_file (TrackerMinerF
	void tracker_miner_fs_force_mtime_checking (TrackerMinerFS	S *fs,
	*fs,	GFile
	GFile	*file,
	*directory);	GStrv
		rdf_types,
		GPtrArray
		*results);

		/* Continuation for async functions when signalled with ::process-file */
		void tracker_miner_fs_writeback_notify (TrackerMinerF
		S *fs,
		GFile
		*file,
		const GError
		*error);
		void tracker_miner_fs_file_notify (TrackerMinerF
		S *fs,
		GFile
		*file,
		const GError
		*error);

		/* URNs */
		const gchar *tracker_miner_fs_get_urn (TrackerMinerF
		S *fs,
		GFile
		*file);
		const gchar *tracker_miner_fs_get_parent_urn (TrackerMinerF
		S *fs,
		GFile
		*file);
		gchar *tracker_miner_fs_query_urn (TrackerMinerF
		S *fs,
		GFile
		*file);


	TrackerIndexingTree * tracker_miner_fs_get_indexing_tree (TrackerMinerFS	/* Progress */
	*fs);	gboolean tracker_miner_fs_has_items_to_process (TrackerMinerF
		S *fs);

	G_END_DECLS	G_END_DECLS

	#endif /* __LIBTRACKER_MINER_MINER_FS_H__ */	#endif /* __LIBTRACKER_MINER_MINER_FS_H__ */

End of changes. 9 change blocks.
	116 lines changed or deleted	170 lines changed or added

	tracker-miner-manager.h	tracker-miner-manager.h

	skipping to change at line 20	skipping to change at line 20
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.
	*	*
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the	* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.	* Boston, MA 02110-1301, USA.
	*/	*/


	#ifndef __LIBTRACKER_MINER_MANAGER_H__	#ifndef __LIBTRACKER_CONTROL_MANAGER_H__
	#define __LIBTRACKER_MINER_MANAGER_H__	#define __LIBTRACKER_CONTROL_MANAGER_H__

	#if !defined (__LIBTRACKER_CONTROL_H_INSIDE__) && !defined (TRACKER_COMPILA TION)	#if !defined (__LIBTRACKER_CONTROL_H_INSIDE__) && !defined (TRACKER_COMPILA TION)

	#error "Only <libtracker-miner/tracker-miner.h> can be included directly."	#error "Only <libtracker-control/tracker-control.h> can be included directl y."
	#endif	#endif

	#include <gio/gio.h>	#include <gio/gio.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TRACKER_TYPE_MINER_MANAGER (tracker_miner_manager_get_type( ))	#define TRACKER_TYPE_MINER_MANAGER (tracker_miner_manager_get_type( ))
	#define TRACKER_MINER_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o) , TRACKER_TYPE_MINER_MANAGER, TrackerMinerManager))	#define TRACKER_MINER_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o) , TRACKER_TYPE_MINER_MANAGER, TrackerMinerManager))
	#define TRACKER_MINER_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_MINER_MANAGER, TrackerMinerManagerClass))	#define TRACKER_MINER_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_MINER_MANAGER, TrackerMinerManagerClass))
	#define TRACKER_IS_MINER_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o) , TRACKER_TYPE_MINER_MANAGER))	#define TRACKER_IS_MINER_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o) , TRACKER_TYPE_MINER_MANAGER))

	skipping to change at line 154	skipping to change at line 154
	GError **error);	GError **error);

	#ifndef TRACKER_DISABLE_DEPRECATED	#ifndef TRACKER_DISABLE_DEPRECATED
	gboolean tracker_miner_manager_ignore_next_update (TrackerMiner Manager *manager,	gboolean tracker_miner_manager_ignore_next_update (TrackerMiner Manager *manager,
	const gchar *miner,	const gchar *miner,
	const gchar **urls) G_GNUC_DEPRECATED;	const gchar **urls) G_GNUC_DEPRECATED;
	#endif /* TRACKER_DISABLE_DEPRECATED */	#endif /* TRACKER_DISABLE_DEPRECATED */

	G_END_DECLS	G_END_DECLS


	#endif /* __LIBTRACKER_MINER_MANAGER_H__ */	#endif /* __LIBTRACKER_CONTROL_MANAGER_H__ */

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	tracker-miner-object.h	tracker-miner-object.h

	skipping to change at line 34	skipping to change at line 34
	#error "Only <libtracker-miner/tracker-miner.h> can be included directly."	#error "Only <libtracker-miner/tracker-miner.h> can be included directly."
	#endif	#endif

	#include <glib-object.h>	#include <glib-object.h>
	#include <gio/gio.h>	#include <gio/gio.h>

	#include <libtracker-sparql/tracker-sparql.h>	#include <libtracker-sparql/tracker-sparql.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


		/* Common definitions for all miners */
		#define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker1.Miner"
		#define TRACKER_MINER_DBUS_NAME_PREFIX "org.freedesktop.Tracker1.Miner."
		#define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker1/Miner/"

	#define TRACKER_TYPE_MINER (tracker_miner_get_type())	#define TRACKER_TYPE_MINER (tracker_miner_get_type())
	#define TRACKER_MINER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKE R_TYPE_MINER, TrackerMiner))	#define TRACKER_MINER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKE R_TYPE_MINER, TrackerMiner))
	#define TRACKER_MINER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKE R_TYPE_MINER, TrackerMinerClass))	#define TRACKER_MINER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKE R_TYPE_MINER, TrackerMinerClass))
	#define TRACKER_IS_MINER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKE R_TYPE_MINER))	#define TRACKER_IS_MINER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKE R_TYPE_MINER))
	#define TRACKER_IS_MINER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKE R_TYPE_MINER))	#define TRACKER_IS_MINER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKE R_TYPE_MINER))
	#define TRACKER_MINER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKE R_TYPE_MINER, TrackerMinerClass))	#define TRACKER_MINER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKE R_TYPE_MINER, TrackerMinerClass))

	#define TRACKER_MINER_ERROR_DOMAIN "TrackerMiner"	#define TRACKER_MINER_ERROR_DOMAIN "TrackerMiner"
	#define TRACKER_MINER_ERROR tracker_miner_error_quark()	#define TRACKER_MINER_ERROR tracker_miner_error_quark()


	skipping to change at line 91	skipping to change at line 96
	const gchar *status,	const gchar *status,
	gdouble progress);	gdouble progress);

	void (* ignore_next_update) (TrackerMiner *miner,	void (* ignore_next_update) (TrackerMiner *miner,
	const GStrv urls);	const GStrv urls);

	/* <Private> */	/* <Private> */
	gpointer padding[10];	gpointer padding[10];
	} TrackerMinerClass;	} TrackerMinerClass;


		/**
		* TrackerMinerError:
		* @TRACKER_MINER_ERROR_NAME_MISSING: No name was given when creating
		* the miner. The name is crucial for D-Bus presence and a host of
		* other things.
		* @TRACKER_MINER_ERROR_NAME_UNAVAILABLE: The name trying to be used
		* for the miner was not available, possibly because the miner is
		* already running with the same name in another process.
		* @TRACKER_MINER_ERROR_PAUSED: Given by miners when an API is used at
		* the time the miner itself is paused and such actions should be avoided.
		* @TRACKER_MINER_ERROR_PAUSED_ALREADY: The pause request has already
		* been given by the same application with the same reason. Duplicate
		* pause calls with the same reason by the same application can not
		* be carried out.
		* @TRACKER_MINER_ERROR_INVALID_COOKIE: When pausing a miner, a cookie
		* (or @gint based ID) is given. That cookie must be used to resume a
		* previous pause request. If the cookie is unrecognised, this error
		* is given.
		*
		* Possible errors returned when calling #TrackerMiner APIs or
		* subclassed miners where the error is generic to all miners.
		**/
		typedef enum {
		TRACKER_MINER_ERROR_NAME_MISSING,
		TRACKER_MINER_ERROR_NAME_UNAVAILABLE,
		TRACKER_MINER_ERROR_PAUSED,
		TRACKER_MINER_ERROR_PAUSED_ALREADY,
		TRACKER_MINER_ERROR_INVALID_COOKIE
		} TrackerMinerError;

	GType tracker_miner_get_type (void) G_GNUC_CO NST;	GType tracker_miner_get_type (void) G_GNUC_CO NST;
	GQuark tracker_miner_error_quark (void);	GQuark tracker_miner_error_quark (void);

	void tracker_miner_start (TrackerMiner *miner);	void tracker_miner_start (TrackerMiner *miner);
	void tracker_miner_stop (TrackerMiner *miner);	void tracker_miner_stop (TrackerMiner *miner);
	void tracker_miner_ignore_next_update (TrackerMiner *miner,	void tracker_miner_ignore_next_update (TrackerMiner *miner,
	const GStrv urls);	const GStrv urls);
	gboolean tracker_miner_is_started (TrackerMiner *miner);	gboolean tracker_miner_is_started (TrackerMiner *miner);
	gboolean tracker_miner_is_paused (TrackerMiner *miner);	gboolean tracker_miner_is_paused (TrackerMiner *miner);


End of changes. 2 change blocks.
	0 lines changed or deleted	35 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	tracker-miner-enum-types.h	tracker-miner-enum-types.h

	skipping to change at line 21	skipping to change at line 21

	/* enumerations from "tracker-miner-enums.h" */	/* enumerations from "tracker-miner-enums.h" */
	GType tracker_directory_flags_get_type (void) G_GNUC_CONST;	GType tracker_directory_flags_get_type (void) G_GNUC_CONST;
	#define TRACKER_TYPE_DIRECTORY_FLAGS (tracker_directory_flags_get_type ())	#define TRACKER_TYPE_DIRECTORY_FLAGS (tracker_directory_flags_get_type ())
	GType tracker_filter_type_get_type (void) G_GNUC_CONST;	GType tracker_filter_type_get_type (void) G_GNUC_CONST;
	#define TRACKER_TYPE_FILTER_TYPE (tracker_filter_type_get_type ())	#define TRACKER_TYPE_FILTER_TYPE (tracker_filter_type_get_type ())
	GType tracker_filter_policy_get_type (void) G_GNUC_CONST;	GType tracker_filter_policy_get_type (void) G_GNUC_CONST;
	#define TRACKER_TYPE_FILTER_POLICY (tracker_filter_policy_get_type ())	#define TRACKER_TYPE_FILTER_POLICY (tracker_filter_policy_get_type ())
	GType tracker_network_type_get_type (void) G_GNUC_CONST;	GType tracker_network_type_get_type (void) G_GNUC_CONST;
	#define TRACKER_TYPE_NETWORK_TYPE (tracker_network_type_get_type ())	#define TRACKER_TYPE_NETWORK_TYPE (tracker_network_type_get_type ())

		GType tracker_crawl_flags_get_type (void) G_GNUC_CONST;
		#define TRACKER_TYPE_CRAWL_FLAGS (tracker_crawl_flags_get_type ())
	G_END_DECLS	G_END_DECLS

	#endif /* __TRACKER_ENUMS_TYPES_H__ */	#endif /* __TRACKER_ENUMS_TYPES_H__ */

	/* Generated data ends here */	/* Generated data ends here */

End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	tracker-miner.h	tracker-miner.h

	skipping to change at line 25	skipping to change at line 25
	* License along with this library; if not, write to the	* License along with this library; if not, write to the
	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.	* Boston, MA 02110-1301, USA.
	*/	*/

	#ifndef __LIBTRACKER_MINER_H__	#ifndef __LIBTRACKER_MINER_H__
	#define __LIBTRACKER_MINER_H__	#define __LIBTRACKER_MINER_H__

	#define __LIBTRACKER_MINER_H_INSIDE__	#define __LIBTRACKER_MINER_H_INSIDE__


		#include <libtracker-miner/tracker-data-provider.h>
	#include <libtracker-miner/tracker-decorator.h>	#include <libtracker-miner/tracker-decorator.h>
	#include <libtracker-miner/tracker-decorator-fs.h>	#include <libtracker-miner/tracker-decorator-fs.h>

		#include <libtracker-miner/tracker-enumerator.h>
	#include <libtracker-miner/tracker-miner-object.h>	#include <libtracker-miner/tracker-miner-object.h>
	#include <libtracker-miner/tracker-miner-online.h>	#include <libtracker-miner/tracker-miner-online.h>
	#include <libtracker-miner/tracker-miner-fs.h>	#include <libtracker-miner/tracker-miner-fs.h>
	#include <libtracker-miner/tracker-miner-enums.h>	#include <libtracker-miner/tracker-miner-enums.h>
	#include <libtracker-miner/tracker-miner-enum-types.h>	#include <libtracker-miner/tracker-miner-enum-types.h>
	#include <libtracker-miner/tracker-indexing-tree.h>	#include <libtracker-miner/tracker-indexing-tree.h>

	#undef __LIBTRACKER_MINER_H_INSIDE__	#undef __LIBTRACKER_MINER_H_INSIDE__

	#endif /* __LIBTRACKER_MINER_H__ */	#endif /* __LIBTRACKER_MINER_H__ */

End of changes. 2 change blocks.
	0 lines changed or deleted	2 lines changed or added