Change the enums to match the KDE ones to make life simpler even though I dislike the names.

3 files changed, 16 insertions, 16 deletions

diff --git a/src/libcustomindicator/custom-indicator.c b/src/libcustomindicator/custom-indicator.c
index 002db14..6efccc0 100644
--- a/src/libcustomindicator/custom-indicator.c
+++ b/src/libcustomindicator/custom-indicator.c
@@ -125,7 +125,7 @@ custom_indicator_class_init (CustomIndicatorClass *klass)
 	                                                  "Indicator Status",
 	                                                  "Whether the indicator is shown or requests attention.  Defaults to 'off'.",
 	                                                  CUSTOM_INDICATOR_TYPE_INDICATOR_STATUS,
-	                                                  CUSTOM_INDICATOR_STATUS_OFF,
+	                                                  CUSTOM_INDICATOR_STATUS_PASSIVE,
 	                                                  G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property(object_class, PROP_ICON_NAME,
@@ -235,7 +235,7 @@ custom_indicator_init (CustomIndicator *self)
 
 	priv->id = NULL;
 	priv->category = CUSTOM_INDICATOR_CATEGORY_OTHER;
-	priv->status = CUSTOM_INDICATOR_STATUS_OFF;
+	priv->status = CUSTOM_INDICATOR_STATUS_PASSIVE;
 	priv->icon_name = NULL;
 	priv->attention_icon_name = NULL;
 	priv->menu = NULL;
@@ -268,8 +268,8 @@ custom_indicator_dispose (GObject *object)
 	CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self);
 	g_return_if_fail(priv != NULL);
 
-	if (priv->status != CUSTOM_INDICATOR_STATUS_OFF) {
-		custom_indicator_set_status(self, CUSTOM_INDICATOR_STATUS_OFF);
+	if (priv->status != CUSTOM_INDICATOR_STATUS_PASSIVE) {
+		custom_indicator_set_status(self, CUSTOM_INDICATOR_STATUS_PASSIVE);
 	}
 
 	if (priv->menu != NULL) {
@@ -299,7 +299,7 @@ custom_indicator_finalize (GObject *object)
 	CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self);
 	g_return_if_fail(priv != NULL);
 
-	if (priv->status != CUSTOM_INDICATOR_STATUS_OFF) {
+	if (priv->status != CUSTOM_INDICATOR_STATUS_PASSIVE) {
 		g_warning("Finalizing Custom Status with the status set to: %d", priv->status);
 	}
 
diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h
index fd2ddc7..2e9045c 100644
--- a/src/libcustomindicator/custom-indicator.h
+++ b/src/libcustomindicator/custom-indicator.h
@@ -40,8 +40,8 @@ typedef enum { /*< prefix=CUSTOM_INDICATOR_CATEGORY >*/
 
 /**
 	CustomIndicatorStatus:
-	@CUSTOM_INDICATOR_STATUS_OFF: The indicator should not be shown to the user.
-	@CUSTOM_INDICATOR_STATUS_ON: The indicator should be shown in it's default state.
+	@CUSTOM_INDICATOR_STATUS_PASSIVE: The indicator should not be shown to the user.
+	@CUSTOM_INDICATOR_STATUS_ACTIVE: The indicator should be shown in it's default state.
 	@CUSTOM_INDICATOR_STATUS_ATTENTION: The indicator should show it's attention icon.
 
 	These are the states that the indicator can be on in
@@ -50,8 +50,8 @@ typedef enum { /*< prefix=CUSTOM_INDICATOR_CATEGORY >*/
 	shown by setting it to @CUSTOM_INDICATOR_STATUS_ON.
 */
 typedef enum { /*< prefix=CUSTOM_INDICATOR_STATUS >*/
-	CUSTOM_INDICATOR_STATUS_OFF,
-	CUSTOM_INDICATOR_STATUS_ON,
+	CUSTOM_INDICATOR_STATUS_PASSIVE,
+	CUSTOM_INDICATOR_STATUS_ACTIVE,
 	CUSTOM_INDICATOR_STATUS_ATTENTION
 } CustomIndicatorStatus;
 
diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c
index b4b4084..b3ead63 100644
--- a/tests/test-libcustomindicator.c
+++ b/tests/test-libcustomindicator.c
@@ -67,15 +67,15 @@ test_libcustomindicator_prop_signals (void)
 
 
 	signaled = FALSE;
-	custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_OFF);
+	custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_PASSIVE);
 	g_assert(!signaled);
 
 	signaled = FALSE;
-	custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON);
+	custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ACTIVE);
 	g_assert(signaled);
 
 	signaled = FALSE;
-	custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON);
+	custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ACTIVE);
 	g_assert(!signaled);
 
 	signaled = FALSE;
@@ -93,14 +93,14 @@ test_libcustomindicator_init_set_props (void)
 
 	custom_indicator_set_id(ci, "my-id");
 	custom_indicator_set_category(ci, CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS);
-	custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON);
+	custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ACTIVE);
 	custom_indicator_set_icon(ci, "my-name");
 	custom_indicator_set_attention_icon(ci, "my-attention-name");
 
 	g_assert(!g_strcmp0("my-id", custom_indicator_get_id(ci)));
 	g_assert(!g_strcmp0("my-name", custom_indicator_get_icon(ci)));
 	g_assert(!g_strcmp0("my-attention-name", custom_indicator_get_attention_icon(ci)));
-	g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ON);
+	g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ACTIVE);
 	g_assert(custom_indicator_get_category(ci) == CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
 	g_object_unref(G_OBJECT(ci));
@@ -113,7 +113,7 @@ test_libcustomindicator_init_with_props (void)
 	CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, 
 	                                                     "id", "my-id",
 	                                                     "category", CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS,
-	                                                     "status", CUSTOM_INDICATOR_STATUS_ON,
+	                                                     "status", CUSTOM_INDICATOR_STATUS_ACTIVE,
 	                                                     "icon-name", "my-name",
 	                                                     "attention-icon-name", "my-attention-name",
 	                                                     NULL));
@@ -122,7 +122,7 @@ test_libcustomindicator_init_with_props (void)
 	g_assert(!g_strcmp0("my-id", custom_indicator_get_id(ci)));
 	g_assert(!g_strcmp0("my-name", custom_indicator_get_icon(ci)));
 	g_assert(!g_strcmp0("my-attention-name", custom_indicator_get_attention_icon(ci)));
-	g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ON);
+	g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ACTIVE);
 	g_assert(custom_indicator_get_category(ci) == CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
 	g_object_unref(G_OBJECT(ci));