From bf1efc1c4c15401798a7d3a3b8ebb9533a9e79a5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Oct 2009 14:11:58 -0500 Subject: Header comments and a new signal that we'll need to deal with. --- src/libcustomindicator/custom-indicator.h | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'src/libcustomindicator/custom-indicator.h') diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h index 0ac8808..a311c63 100644 --- a/src/libcustomindicator/custom-indicator.h +++ b/src/libcustomindicator/custom-indicator.h @@ -52,12 +52,46 @@ typedef enum { /*< prefix=CUSTOM_INDICATOR_STATUS >*/ typedef struct _CustomIndicator CustomIndicator; typedef struct _CustomIndicatorClass CustomIndicatorClass; +/** + CustomIndicatorClass: + @parent_class: Mia familia + @connection_changed: Slot for #CustomIndicator::connection-changed. + @custom_indicator_reserved_1: Reserved for future use. + @custom_indicator_reserved_2: Reserved for future use. + @custom_indicator_reserved_3: Reserved for future use. + @custom_indicator_reserved_4: Reserved for future use. + + The signals and external functions that make up the #CustomIndicator + class object. +*/ struct _CustomIndicatorClass { + /* Parent */ GObjectClass parent_class; + + /* Signals */ + void (* connection_changed) (CustomIndicator * indicator, + gboolean connected, + gpointer user_data); + + /* Reserved */ + void (*custom_indicator_reserved_1)(void); + void (*custom_indicator_reserved_2)(void); + void (*custom_indicator_reserved_3)(void); + void (*custom_indicator_reserved_4)(void); }; +/** + CustomIndicator: + @parent: Parent object. + + A custom indicator represents the values that are needed to show a + unique status in the panel for an application. In general, applications + should try to fit in the other indicators that are available on the + panel before using this. But, sometimes it is necissary. +*/ struct _CustomIndicator { GObject parent; + /* None. We're a very private object. */ }; /* GObject Stuff */ -- cgit v1.2.3 From 6587e75ac6f1c20b53b37afd49c936c59eaa99d1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Oct 2009 14:35:26 -0500 Subject: Adding in the dbus signals from that interface. --- src/libcustomindicator/custom-indicator.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/libcustomindicator/custom-indicator.h') diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h index a311c63..d9322e7 100644 --- a/src/libcustomindicator/custom-indicator.h +++ b/src/libcustomindicator/custom-indicator.h @@ -55,6 +55,9 @@ typedef struct _CustomIndicatorClass CustomIndicatorClass; /** CustomIndicatorClass: @parent_class: Mia familia + @new_icon: Slot for #CustomIndicator::new-icon. + @new_attention_icon: Slot for #CustomIndicator::new-attention-icon. + @new_status: Slot for #CustomIndicator::new-status. @connection_changed: Slot for #CustomIndicator::connection-changed. @custom_indicator_reserved_1: Reserved for future use. @custom_indicator_reserved_2: Reserved for future use. @@ -68,7 +71,16 @@ struct _CustomIndicatorClass { /* Parent */ GObjectClass parent_class; - /* Signals */ + /* DBus Signals */ + void (* new_icon) (CustomIndicator * indicator, + gpointer user_data); + void (* new_attention_icon) (CustomIndicator * indicator, + gpointer user_data); + void (* new_status) (CustomIndicator * indicator, + gchar * status_string, + gpointer user_data); + + /* Local Signals */ void (* connection_changed) (CustomIndicator * indicator, gboolean connected, gpointer user_data); -- cgit v1.2.3 From 9dbe19dd59b0d42a4b4c33150bed0db4c31295f2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Oct 2009 16:22:24 -0500 Subject: Boom, there are some signals. --- src/libcustomindicator/custom-indicator.c | 82 ++++++++++++++++++++++++++++++- src/libcustomindicator/custom-indicator.h | 5 ++ 2 files changed, 86 insertions(+), 1 deletion(-) (limited to 'src/libcustomindicator/custom-indicator.h') diff --git a/src/libcustomindicator/custom-indicator.c b/src/libcustomindicator/custom-indicator.c index 7fb8fb8..314493f 100644 --- a/src/libcustomindicator/custom-indicator.c +++ b/src/libcustomindicator/custom-indicator.c @@ -7,14 +7,31 @@ #include "libcustomindicator/custom-indicator.h" #include "libcustomindicator/custom-indicator-enum-types.h" +/** + CustomIndicatorPrivate: + + All of the private data in an instance of a + custom indicator. +*/ typedef struct _CustomIndicatorPrivate CustomIndicatorPrivate; struct _CustomIndicatorPrivate { int placeholder; }; +/* Signals Stuff */ +enum { + NEW_ICON, + NEW_ATTENTION_ICON, + NEW_STATUS, + CONNECTION_CHANGED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + /* Enum for the properties so that they can be quickly found and looked up. */ -enum properties { +enum { PROP_0, PROP_ID, PROP_CATEGORY, @@ -108,6 +125,69 @@ custom_indicator_class_init (CustomIndicatorClass *klass) DBUSMENU_TYPE_SERVER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /* Signals */ + + /** + CustomIndicator::new-icon: + @arg0: The #CustomIndicator object + + Signaled when there is a new icon set for the + object. + */ + signals[NEW_ICON] = g_signal_new (CUSTOM_INDICATOR_SIGNAL_NEW_ICON, + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (CustomIndicatorClass, new_icon), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, G_TYPE_NONE); + + /** + CustomIndicator::new-attention-icon: + @arg0: The #CustomIndicator object + + Signaled when there is a new attention icon set for the + object. + */ + signals[NEW_ATTENTION_ICON] = g_signal_new (CUSTOM_INDICATOR_SIGNAL_NEW_ATTENTION_ICON, + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (CustomIndicatorClass, new_attention_icon), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, G_TYPE_NONE); + + /** + CustomIndicator::new-status: + @arg0: The #CustomIndicator object + @arg1: The string value of the #CustomIndicatorStatus enum. + + Signaled when the status of the indicator changes. + */ + signals[NEW_STATUS] = g_signal_new (CUSTOM_INDICATOR_SIGNAL_NEW_STATUS, + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (CustomIndicatorClass, new_status), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE); + + /** + CustomIndicator::connection-changed: + @arg0: The #CustomIndicator object + @arg1: Whether we're connected or not + + Signaled when we connect to a watcher, or when it drops + away. + */ + signals[CONNECTION_CHANGED] = g_signal_new (CUSTOM_INDICATOR_SIGNAL_CONNECTION_CHANGED, + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (CustomIndicatorClass, connection_changed), + NULL, NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE); + return; } diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h index d9322e7..a4fc3f1 100644 --- a/src/libcustomindicator/custom-indicator.h +++ b/src/libcustomindicator/custom-indicator.h @@ -13,6 +13,11 @@ G_BEGIN_DECLS #define IS_CUSTOM_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CUSTOM_INDICATOR_TYPE)) #define CUSTOM_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CUSTOM_INDICATOR_TYPE, CustomIndicatorClass)) +#define CUSTOM_INDICATOR_SIGNAL_NEW_ICON "new-icon" +#define CUSTOM_INDICATOR_SIGNAL_NEW_ATTENTION_ICON "new-attention-icon" +#define CUSTOM_INDICATOR_SIGNAL_NEW_STATUS "new-status" +#define CUSTOM_INDICATOR_SIGNAL_CONNECTION_CHANGED "connection-changed" + /** CustomIndicatorCategory: @CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS: The indicator is used to display the status of the application. -- cgit v1.2.3 From 08c19ed67d51834c079f4f1ccf12393628740731 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 20 Oct 2009 17:18:48 -0500 Subject: Filling out some prototypes. --- src/libcustomindicator/custom-indicator.c | 90 +++++++++++++++++++++++++++++++ src/libcustomindicator/custom-indicator.h | 3 +- 2 files changed, 92 insertions(+), 1 deletion(-) (limited to 'src/libcustomindicator/custom-indicator.h') diff --git a/src/libcustomindicator/custom-indicator.c b/src/libcustomindicator/custom-indicator.c index a4081cd..127084d 100644 --- a/src/libcustomindicator/custom-indicator.c +++ b/src/libcustomindicator/custom-indicator.c @@ -558,3 +558,93 @@ check_connect (CustomIndicator * self) } + + +/* ************************* */ +/* Public Functions */ +/* ************************* */ + +void +custom_indicator_set_id (CustomIndicator * ci, const gchar * id) +{ + + return; +} + +void +custom_indicator_set_category (CustomIndicator * ci, CustomIndicatorCategory category) +{ + + return; +} + +void +custom_indicator_set_status (CustomIndicator * ci, CustomIndicatorStatus status) +{ + + return; +} + +void custom_indicator_set_icon (CustomIndicator * ci, const gchar * icon_name) +{ + + return; +} + +void +custom_indicator_set_attention_icon (CustomIndicator * ci, const gchar * icon_name) +{ + + return; +} + +void +custom_indicator_set_menu (CustomIndicator * ci, void * menu) +{ + + return; +} + +const gchar * +custom_indicator_get_id (CustomIndicator * ci) +{ + + return NULL; +} + +CustomIndicatorCategory +custom_indicator_get_category (CustomIndicator * ci) +{ + + return CUSTOM_INDICATOR_CATEGORY_OTHER; +} + +CustomIndicatorStatus +custom_indicator_get_status (CustomIndicator * ci) +{ + + return CUSTOM_INDICATOR_STATUS_OFF; +} + +const gchar * +custom_indicator_get_icon (CustomIndicator * ci) +{ + + return NULL; +} + +const gchar * +custom_indicator_get_attention_icon (CustomIndicator * ci) +{ + + return NULL; +} + +DbusmenuServer * +custom_indicator_get_menu (CustomIndicator * ci) +{ + + return NULL; +} + + diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h index a4fc3f1..b6bb228 100644 --- a/src/libcustomindicator/custom-indicator.h +++ b/src/libcustomindicator/custom-indicator.h @@ -3,6 +3,7 @@ #include #include +#include G_BEGIN_DECLS @@ -134,7 +135,7 @@ CustomIndicatorCategory custom_indicator_get_category (CustomIndic CustomIndicatorStatus custom_indicator_get_status (CustomIndicator * ci); const gchar * custom_indicator_get_icon (CustomIndicator * ci); const gchar * custom_indicator_get_attention_icon (CustomIndicator * ci); -void * custom_indicator_get_menu (CustomIndicator * ci); +DbusmenuServer * custom_indicator_get_menu (CustomIndicator * ci); G_END_DECLS -- cgit v1.2.3 From e932bfa4e6ba766d12fb4193cd4d2e7c24645784 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 20 Oct 2009 22:07:29 -0500 Subject: Fleshing out the set functions. --- src/libcustomindicator/custom-indicator.c | 74 ++++++++++++++++++++++++++++--- src/libcustomindicator/custom-indicator.h | 2 +- 2 files changed, 68 insertions(+), 8 deletions(-) (limited to 'src/libcustomindicator/custom-indicator.h') diff --git a/src/libcustomindicator/custom-indicator.c b/src/libcustomindicator/custom-indicator.c index 127084d..530f035 100644 --- a/src/libcustomindicator/custom-indicator.c +++ b/src/libcustomindicator/custom-indicator.c @@ -564,44 +564,104 @@ check_connect (CustomIndicator * self) /* Public Functions */ /* ************************* */ +/** + custom_indicator_set_id: + @ci: The #CustomIndicator object to use + @id: ID to set for this indicator + + Wrapper function for property #CustomIndicator::id. +*/ void custom_indicator_set_id (CustomIndicator * ci, const gchar * id) { - + GValue value = {0}; + g_value_init(&value, G_TYPE_STRING); + g_value_set_string(&value, id); + g_object_set_property(G_OBJECT(ci), PROP_ID_S, &value); return; } +/** + custom_indicator_set_category: + @ci: The #CustomIndicator object to use + @category: The category to set for this indicator + + Wrapper function for property #CustomIndicator::category. +*/ void custom_indicator_set_category (CustomIndicator * ci, CustomIndicatorCategory category) { - + GValue value = {0}; + g_value_init(&value, G_TYPE_ENUM); + g_value_set_enum(&value, category); + g_object_set_property(G_OBJECT(ci), PROP_CATEGORY_S, &value); return; } +/** + custom_indicator_set_status: + @ci: The #CustomIndicator object to use + @status: The status to set for this indicator + + Wrapper function for property #CustomIndicator::status. +*/ void custom_indicator_set_status (CustomIndicator * ci, CustomIndicatorStatus status) { - + GValue value = {0}; + g_value_init(&value, G_TYPE_ENUM); + g_value_set_enum(&value, status); + g_object_set_property(G_OBJECT(ci), PROP_STATUS_S, &value); return; } +/** + custom_indicator_set_icon: + @ci: The #CustomIndicator object to use + @icon_name: The name of the icon to set for this indicator + + Wrapper function for property #CustomIndicator::icon. +*/ void custom_indicator_set_icon (CustomIndicator * ci, const gchar * icon_name) { - + GValue value = {0}; + g_value_init(&value, G_TYPE_STRING); + g_value_set_string(&value, icon_name); + g_object_set_property(G_OBJECT(ci), PROP_ICON_NAME_S, &value); return; } +/** + custom_indicator_set_attention_icon: + @ci: The #CustomIndicator object to use + @icon_name: The name of the attention icon to set for this indicator + + Wrapper function for property #CustomIndicator::attention-icon. +*/ void custom_indicator_set_attention_icon (CustomIndicator * ci, const gchar * icon_name) { - + GValue value = {0}; + g_value_init(&value, G_TYPE_STRING); + g_value_set_string(&value, icon_name); + g_object_set_property(G_OBJECT(ci), PROP_ATTENTION_ICON_NAME_S, &value); return; } +/** + custom_indicator_set_menu: + @ci: The #CustomIndicator object to use + @menu: The object with the menu for the indicator + + Wrapper function for property #CustomIndicator::menu. +*/ void -custom_indicator_set_menu (CustomIndicator * ci, void * menu) +custom_indicator_set_menu (CustomIndicator * ci, DbusmenuServer * menu) { - + GValue value = {0}; + g_value_init(&value, G_TYPE_OBJECT); + g_value_set_object(&value, G_OBJECT(menu)); + g_object_set_property(G_OBJECT(ci), PROP_MENU_S, &value); return; } diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h index b6bb228..fd2ddc7 100644 --- a/src/libcustomindicator/custom-indicator.h +++ b/src/libcustomindicator/custom-indicator.h @@ -127,7 +127,7 @@ void custom_indicator_set_icon (CustomIndic void custom_indicator_set_attention_icon (CustomIndicator * ci, const gchar * icon_name); void custom_indicator_set_menu (CustomIndicator * ci, - void * menu); + DbusmenuServer * menu); /* Get properties */ const gchar * custom_indicator_get_id (CustomIndicator * ci); -- cgit v1.2.3 From 0df50d723494e795aa7447c02ac0f15611b2bfd8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 21 Oct 2009 15:42:13 -0500 Subject: Change the enums to match the KDE ones to make life simpler even though I dislike the names. --- src/libcustomindicator/custom-indicator.c | 10 +++++----- src/libcustomindicator/custom-indicator.h | 8 ++++---- tests/test-libcustomindicator.c | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/libcustomindicator/custom-indicator.h') 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)); -- cgit v1.2.3