[tracker/tracker-0.12] libtracker-miner: ignore next update is deprecated

[Martyn James Russell <mr src gnome org>]

commit d088764718e0be59f41319cf621a5a29db780a4a
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Thu Dec 15 16:55:05 2011 +0100

    libtracker-miner: ignore next update is deprecated
    
    Fix deprecation comment and include the method between guards.
    
    Conflicts:
    
    	src/libtracker-miner/tracker-miner-manager.c

 docs/reference/libtracker-miner/Makefile.am  |    2 +-
 src/libtracker-miner/tracker-miner-manager.c |    6 +++++-
 src/libtracker-miner/tracker-miner-manager.h |    9 ++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index cf1744b..0864745 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -9,7 +9,7 @@ DOC_MODULE=libtracker-miner
 DOC_MAIN_SGML_FILE=libtracker-miner-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-# SCAN_OPTIONS=--deprecated-guards="G_GNUC_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards="TRACKER_DISABLE_DEPRECATED"
 
 # Extra options to pass to gtkdoc-scangobj
 # SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)"
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index 65f59c8..2cf1f82 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -1339,6 +1339,7 @@ tracker_miner_manager_get_description (TrackerMinerManager *manager,
 	return NULL;
 }
 
+#ifndef TRACKER_DISABLE_DEPRECATED
 
 /**
  * tracker_miner_manager_ignore_next_update:
@@ -1354,7 +1355,8 @@ tracker_miner_manager_get_description (TrackerMinerManager *manager,
  * Returns: %TRUE on success, otherwise %FALSE.
  *
  * Since: 0.8
- * Deprecated since 0.12
+ *
+ * Deprecated: 0.12
  **/
 gboolean
 tracker_miner_manager_ignore_next_update (TrackerMinerManager *manager,
@@ -1394,6 +1396,8 @@ tracker_miner_manager_ignore_next_update (TrackerMinerManager *manager,
 	return TRUE;
 }
 
+#endif /* TRACKER_DISABLE_DEPRECATED */
+
 /**
  * tracker_miner_manager_error_quark (skip):
  *
diff --git a/src/libtracker-miner/tracker-miner-manager.h b/src/libtracker-miner/tracker-miner-manager.h
index 83cd3b9..8e25907 100644
--- a/src/libtracker-miner/tracker-miner-manager.h
+++ b/src/libtracker-miner/tracker-miner-manager.h
@@ -124,9 +124,6 @@ gboolean             tracker_miner_manager_get_status         (TrackerMinerManag
                                                                gchar               **status,
                                                                gdouble              *progress,
                                                                gint                 *remaining_time);
-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,
@@ -139,6 +136,12 @@ gboolean             tracker_miner_manager_index_file          (TrackerMinerMana
                                                                 GFile                *file,
                                                                 GError              **error);
 
+#ifndef TRACKER_DISABLE_DEPRECATED
+gboolean             tracker_miner_manager_ignore_next_update (TrackerMinerManager  *manager,
+                                                               const gchar          *miner,
+                                                               const gchar         **urls) G_GNUC_DEPRECATED;
+#endif /* TRACKER_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __LIBTRACKER_MINER_MANAGER_H__ */