diff options
| author | Ted Gould <ted@canonical.com> | 2009-10-21 15:42:13 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-10-21 15:42:13 -0500 |
| commit | 0df50d723494e795aa7447c02ac0f15611b2bfd8 (patch) | |
| tree | 1c6699141c68f36c7ccc2a4cf4305b0b6a113a65 /src | |
| parent | 5e34573c2cff345a2aa3c972ec4a0150f4c4183e (diff) | |
| download | ayatana-indicator-application-0df50d723494e795aa7447c02ac0f15611b2bfd8.tar.gz ayatana-indicator-application-0df50d723494e795aa7447c02ac0f15611b2bfd8.tar.bz2 ayatana-indicator-application-0df50d723494e795aa7447c02ac0f15611b2bfd8.zip | |
Change the enums to match the KDE ones to make life simpler even though I dislike the names.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcustomindicator/custom-indicator.c | 10 | ||||
| -rw-r--r-- | src/libcustomindicator/custom-indicator.h | 8 |
2 files changed, 9 insertions, 9 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; |