[tracker/tracker-0.10] tracker-control: Better name for internal ENABLED macros

[Martyn James Russell <mr src gnome org>]

commit fbb2103f8811c457f815972dd37c3412238e137d
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Mon Mar 21 12:00:50 2011 +0100

    tracker-control: Better name for internal ENABLED macros

 src/tracker-control/tracker-control-general.c |    6 +++---
 src/tracker-control/tracker-control-miners.c  |    6 +++---
 src/tracker-control/tracker-control-status.c  |    7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/src/tracker-control/tracker-control-general.c b/src/tracker-control/tracker-control-general.c
index cc40fda..c2314a2 100644
--- a/src/tracker-control/tracker-control-general.c
+++ b/src/tracker-control/tracker-control-general.c
@@ -43,7 +43,7 @@ typedef enum {
 
 /* Note:
  * Every time a new option is added, make sure it is considered in the
- * 'ENABLED' macro below
+ * 'GENERAL_OPTIONS_ENABLED' macro below
  */
 static gboolean list_processes;
 static TermOption kill_option = TERM_NONE;
@@ -53,7 +53,7 @@ static gboolean soft_reset;
 static gboolean remove_config;
 static gboolean start;
 
-#define ENABLED()	  \
+#define GENERAL_OPTIONS_ENABLED() \
 	(list_processes || \
 	 kill_option != TERM_NONE || \
 	 terminate_option != TERM_NONE || \
@@ -94,7 +94,7 @@ static GOptionEntry entries[] = {
 gboolean
 tracker_control_general_options_enabled (void)
 {
-	return ENABLED ();
+	return GENERAL_OPTIONS_ENABLED ();
 }
 
 static GSList *
diff --git a/src/tracker-control/tracker-control-miners.c b/src/tracker-control/tracker-control-miners.c
index 7dec193..b092e16 100644
--- a/src/tracker-control/tracker-control-miners.c
+++ b/src/tracker-control/tracker-control-miners.c
@@ -28,7 +28,7 @@
 
 /* Note:
  * Every time a new option is added, make sure it is considered in the
- * 'ENABLED' macro below
+ * 'MINERS_OPTIONS_ENABLED' macro below
  */
 static const gchar **reindex_mime_types;
 static gchar *index_file;
@@ -39,7 +39,7 @@ static gboolean list_miners_running;
 static gboolean list_miners_available;
 static gboolean pause_details;
 
-#define ENABLED()	  \
+#define MINERS_OPTIONS_ENABLED() \
 	(reindex_mime_types || \
 	 index_file || \
 	 miner_name || \
@@ -86,7 +86,7 @@ static GOptionEntry entries[] = {
 gboolean
 tracker_control_miners_options_enabled (void)
 {
-	return ENABLED ();
+	return MINERS_OPTIONS_ENABLED ();
 }
 
 static gint
diff --git a/src/tracker-control/tracker-control-status.c b/src/tracker-control/tracker-control-status.c
index 9fca609..6cbb111 100644
--- a/src/tracker-control/tracker-control-status.c
+++ b/src/tracker-control/tracker-control-status.c
@@ -36,13 +36,14 @@ static gint paused_length = 0;
 
 /* Note:
  * Every time a new option is added, make sure it is considered in the
- * 'ENABLED' macro below
+ * 'STATUS_OPTIONS_ENABLED' macro below
  */
 static gboolean status;
 static gboolean follow;
 static gboolean list_common_statuses;
 
-#define ENABLED() (status || follow || list_common_statuses)
+#define STATUS_OPTIONS_ENABLED() \
+	(status || follow || list_common_statuses)
 
 /* Make sure our statuses are translated (all from libtracker-miner except one) */
 static const gchar *statuses[7] = {
@@ -74,7 +75,7 @@ static GOptionEntry entries[] = {
 gboolean
 tracker_control_status_options_enabled (void)
 {
-	return ENABLED ();
+	return STATUS_OPTIONS_ENABLED ();
 }
 
 static void