Merge Ted's changes. I should have used bzr bind.

1 files changed, 9 insertions, 2 deletions

diff --git a/libindicate/indicator.h b/libindicate/indicator.h
index 77fd82f..3c8efc8 100644
--- a/libindicate/indicator.h
+++ b/libindicate/indicator.h
@@ -11,11 +11,13 @@
 #define INDICATE_IS_INDICATOR(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), INDICATE_TYPE_INDICATOR))
 #define INDICATE_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), INDICATE_TYPE_INDICATOR, IndicateIndicatorClass))
 #define INDICATE_IS_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), INDICATE_TYPE_INDICATOR))
-#define INDICATE_INDICATOR_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), INDICATE_TYPE_INDICATOR, IndicateIndicatorCLass))
+#define INDICATE_INDICATOR_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), INDICATE_TYPE_INDICATOR, IndicateIndicatorClass))
 
 /* This is a signal that signals to the indicator that the user
  * has done an action where they'd like this indicator to be
  * displayed. */
+#define INDICATE_INDICATOR_SIGNAL_HIDE  "hide"
+#define INDICATE_INDICATOR_SIGNAL_SHOW  "show"
 #define INDICATE_INDICATOR_SIGNAL_DISPLAY  "user-display"
 
 typedef struct _IndicateIndicator IndicateIndicator;
@@ -27,15 +29,18 @@ struct _IndicateIndicator {
 	GObject parent;
 
 	guint id;
+	gboolean is_visible;
 	IndicateServer * server;
 };
 
 struct _IndicateIndicatorClass {
 	GObjectClass parent_class;
 
+	void (*hide) (IndicateIndicator * indicator, gpointer data);
+	void (*show) (IndicateIndicator * indicator, gpointer data);
 	void (*user_display) (IndicateIndicator * indicator, gpointer data);
 
-	gchar * (*get_type) (IndicateIndicator * indicator);
+	const gchar * (*get_type) (IndicateIndicator * indicator);
 };
 
 IndicateIndicator * indicate_indicator_new (void);
@@ -47,6 +52,8 @@ void indicate_indicator_set_property (IndicateIndicator * indicator, const gchar
 void indicate_indicator_show (IndicateIndicator * indicator);
 void indicate_indicator_hide (IndicateIndicator * indicator);
 
+gboolean indicate_indicator_is_visible (IndicateIndicator * indicator);
+
 /* Every entry has an ID, here's how to get it */
 guint indicate_indicator_get_id (IndicateIndicator * indicator);