IndicatorObject: add parent_window parameter to IndicatorEntry

2 files changed, 8 insertions, 3 deletions

diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index 40f114e..0a1a04e 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -314,6 +314,7 @@ indicator_object_init (IndicatorObject *self)
 	priv->entry.image = NULL;
 	priv->entry.accessible_desc = NULL;
 	priv->entry.name_hint = NULL;
+	priv->entry.parent_window = 0;
 
 	priv->gotten_entries = FALSE;
 	priv->default_visibility = TRUE;
@@ -527,6 +528,10 @@ get_entries_default (IndicatorObject * io)
 			priv->entry.name_hint = class->get_name_hint(io);
 		}
 
+		if (class->get_parent_window) {
+			priv->entry.parent_window = class->get_parent_window(io);
+		}
+
 		priv->gotten_entries = TRUE;
 	}
 
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index 5c8de4b..e542c0d 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -145,12 +145,12 @@ struct _IndicatorObjectClass {
 	void       (*secondary_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
 
 	gint       (*get_position) (IndicatorObject *io);
+	guint      (*get_parent_window) (IndicatorObject *io);
 
 	/* Reserved */
 	void       (*reserved1)     (void);
 	void       (*reserved2)     (void);
 	void       (*reserved3)     (void);
-	void       (*reserved4)     (void);
 };
 
 /**
@@ -174,11 +174,11 @@ struct _IndicatorObject {
 		of the indicator
 	@name_hint: A name to describe the indicator being placed to allow
 		the caller to be more aware of the individual entries.
+	@parent_window: the id of the parent window of the indicator entry (if any).
 
 	@reserved1: Reserved for future use
 	@reserved2: Reserved for future use
 	@reserved3: Reserved for future use
-	@reserved4: Reserved for future use
 */
 struct _IndicatorObjectEntry {
 	IndicatorObject * parent_object;
@@ -187,11 +187,11 @@ struct _IndicatorObjectEntry {
 	GtkMenu  * menu;
 	const gchar * accessible_desc;
 	const gchar * name_hint;
+	guint parent_window;
 
 	void       (*reserved1)     (void);
 	void       (*reserved2)     (void);
 	void       (*reserved3)     (void);
-	void       (*reserved4)     (void);
 };
 
 GType indicator_object_get_type (void);