From 36826dcea61c5bcf6be1fa50a80c205d58283e62 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 28 Jan 2011 14:14:13 -0600
Subject: Adding a signal for events

---
 libdbusmenu-glib/menuitem.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index b40195c..83d98fa 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -71,6 +71,7 @@ enum {
 	REALIZED,
 	SHOW_TO_USER,
 	ABOUT_TO_SHOW,
+	EVENT,
 	LAST_SIGNAL
 };
 
@@ -244,6 +245,23 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                          NULL, NULL,
 	                                          _dbusmenu_menuitem_marshal_VOID__VOID,
 	                                          G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
+	/**
+		DbusmenuMenuitem::event:
+		@arg0: The #DbusmenuMenuitem object.
+		@arg1: Name of the event
+		@arg2: Information passed along with the event
+		@arg3: X11 timestamp of when the event happened
+
+		Emitted when an event is passed through.  The event is signalled
+		after handle_event is called.
+	*/
+	signals[EVENT] =             g_signal_new(DBUSMENU_MENUITEM_SIGNAL_EVENT,
+	                                          G_TYPE_FROM_CLASS(klass),
+	                                          G_SIGNAL_RUN_LAST,
+	                                          G_STRUCT_OFFSET(DbusmenuMenuitemClass, event),
+	                                          NULL, NULL,
+	                                          _dbusmenu_menuitem_marshal_VOID__STRING_VARIANT_UINT,
+	                                          G_TYPE_BOOLEAN, 3, G_TYPE_STRING, G_TYPE_VARIANT, G_TYPE_UINT);
 
 	g_object_class_install_property (object_class, PROP_ID,
 	                                 g_param_spec_int(PROP_ID_S, "ID for the menu item",
-- 
cgit v1.2.3


From d7e867eebbd24717dcf6886555eec6fe5c8ba450 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 28 Jan 2011 14:18:29 -0600
Subject: Now emit that signal appropriately

---
 libdbusmenu-glib/menuitem.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 83d98fa..7a279b1 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1441,6 +1441,9 @@ dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVari
 	if (class->handle_event != NULL) {
 		return class->handle_event(mi, name, variant, timestamp);
 	}
+
+	g_signal_emit(G_OBJECT(mi), EVENT, g_quark_from_string(name), name, variant, timestamp, TRUE);
+
 	return;
 }
 
-- 
cgit v1.2.3


From bafe476c0fa84277c6136605680c3d349430db50 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Wed, 16 Feb 2011 20:34:17 +0100
Subject: Fix GI annotations for Dbusmenu

Now everything is introspectable except for
dbusmenu_client_add_type_handler{,_full}(). These do not take a standard
GDestroyNotify argument, and thus the newfunc callback cannot get any valid
scope annotation. To fix this we need to break the API and ABI.
---
 libdbusmenu-glib/menuitem.c | 723 ++++++++++++++++++++++----------------------
 1 file changed, 362 insertions(+), 361 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 159463b..b5a87a4 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -95,7 +95,7 @@ static void set_property (GObject * obj, guint id, const GValue * value, GParamS
 static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
 static void g_value_transform_STRING_BOOLEAN (const GValue * in, GValue * out);
 static void g_value_transform_STRING_INT (const GValue * in, GValue * out);
-static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp);
 static void send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 /* GObject stuff */
@@ -428,12 +428,12 @@ send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gp
 /* Public interface */
 
 /**
-	dbusmenu_menuitem_new:
-
-	Create a new #DbusmenuMenuitem with all default values.
-
-	Return value: A newly allocated #DbusmenuMenuitem.
-*/
+ * dbusmenu_menuitem_new:
+ * 
+ * Create a new #DbusmenuMenuitem with all default values.
+ * 
+ * Return value: A newly allocated #DbusmenuMenuitem.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_new (void)
 {
@@ -441,13 +441,13 @@ dbusmenu_menuitem_new (void)
 }
 
 /**
-	dbusmenu_menuitem_new_with_id:
-	@id: ID to use for this menuitem
-
-	This creates a blank #DbusmenuMenuitem with a specific ID.
-
-	Return value: A newly allocated #DbusmenuMenuitem.
-*/
+ * dbusmenu_menuitem_new_with_id:
+ * @id: ID to use for this menuitem
+ * 
+ * This creates a blank #DbusmenuMenuitem with a specific ID.
+ * 
+ * Return value: A newly allocated #DbusmenuMenuitem.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_new_with_id (gint id)
 {
@@ -457,13 +457,13 @@ dbusmenu_menuitem_new_with_id (gint id)
 }
 
 /**
-	dbusmenu_menuitem_get_id:
-	@mi: The #DbusmenuMenuitem to query.
-
-	Gets the unique ID for @mi.
-
-	Return value: The ID of the @mi.
-*/
+ * dbusmenu_menuitem_get_id:
+ * @mi: The #DbusmenuMenuitem to query.
+ * 
+ * Gets the unique ID for @mi.
+ * 
+ * Return value: The ID of the @mi.
+ */
 gint
 dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi)
 {
@@ -480,17 +480,17 @@ dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_realized:
-	@mi: #DbusmenuMenuitem to check on
-
-	This function returns whether the menuitem has been realized or
-	not.  This is significant mostly in client implementations that
-	can use this additional state to see if the second layers of
-	the implementation have been built yet.
-
-	Return value: Returns whether or not the menu item has been realized
-		yet or not.
-*/
+ * dbusmenu_menuitem_realized:
+ * @mi: #DbusmenuMenuitem to check on
+ * 
+ * This function returns whether the menuitem has been realized or
+ * not.  This is significant mostly in client implementations that
+ * can use this additional state to see if the second layers of
+ * the implementation have been built yet.
+ * 
+ * Return value: Returns whether or not the menu item has been realized
+ * 	yet or not.
+ */
 gboolean
 dbusmenu_menuitem_realized (DbusmenuMenuitem * mi)
 {
@@ -500,12 +500,12 @@ dbusmenu_menuitem_realized (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_set_realized:
-	@mi: #DbusmenuMenuitem to realize
-
-	Sets the internal variable tracking whether it's been realized and
-	signals the DbusmenuMenuitem::realized event.
-*/
+ * dbusmenu_menuitem_set_realized:
+ * @mi: #DbusmenuMenuitem to realize
+ * 
+ * Sets the internal variable tracking whether it's been realized and
+ * signals the DbusmenuMenuitem::realized event.
+ */
 void
 dbusmenu_menuitem_set_realized (DbusmenuMenuitem * mi)
 {
@@ -520,15 +520,15 @@ dbusmenu_menuitem_set_realized (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_get_children:
-	@mi: The #DbusmenuMenuitem to query.
-
-	Returns simply the list of children that this menu item
-	has.  The list is valid until another child related function
-	is called, where it might be changed.
-
-	Return value: A #GList of pointers to #DbusmenuMenuitem objects.
-*/
+ * dbusmenu_menuitem_get_children:
+ * @mi: The #DbusmenuMenuitem to query.
+ * 
+ * Returns simply the list of children that this menu item
+ * has.  The list is valid until another child related function
+ * is called, where it might be changed.
+ * 
+ * Return value: (transfer none): A #GList of pointers to #DbusmenuMenuitem objects.
+ */
 GList *
 dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi)
 {
@@ -551,18 +551,18 @@ take_children_signal (gpointer data, gpointer user_data)
 }
 
 /**
-	dbusmenu_menuitem_take_children:
-	@mi: The #DbusmenMenuitem to take the children from.
-
-	While the name sounds devious that's exactly what this function
-	does.  It takes the list of children from the @mi and clears the
-	internal list.  The calling function is now in charge of the ref's
-	on the children it has taken.  A lot of responsibility involved
-	in taking children.
-
-	Return value: (transfer full) (array) (element-type Dbusmenu.Menuitem)
-	A #GList of pointers to #DbusmenuMenuitem objects.
-*/
+ * dbusmenu_menuitem_take_children:
+ * @mi: The #DbusmenMenuitem to take the children from.
+ * 
+ * While the name sounds devious that's exactly what this function
+ * does.  It takes the list of children from the @mi and clears the
+ * internal list.  The calling function is now in charge of the ref's
+ * on the children it has taken.  A lot of responsibility involved
+ * in taking children.
+ * 
+ * Return value: (transfer full) (element-type Dbusmenu.Menuitem):
+ *    A #GList of pointers to #DbusmenuMenuitem objects.
+ */
 GList *
 dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi)
 {
@@ -579,16 +579,16 @@ dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_get_position:
-	@mi: The #DbusmenuMenuitem to find the position of
-	@parent: The #DbusmenuMenuitem who's children contain @mi
-
-	This function returns the position of the menu item @mi
-	in the children of @parent.  It will return zero if the
-	menu item can't be found.
-
-	Return value: The position of @mi in the children of @parent.
-*/
+ * dbusmenu_menuitem_get_position:
+ * @mi: The #DbusmenuMenuitem to find the position of
+ * @parent: The #DbusmenuMenuitem who's children contain @mi
+ * 
+ * This function returns the position of the menu item @mi
+ * in the children of @parent.  It will return zero if the
+ * menu item can't be found.
+ * 
+ * Return value: The position of @mi in the children of @parent.
+ */
 guint
 dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent)
 {
@@ -618,15 +618,15 @@ dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent
 }
 
 /**
-	dbusmenu_menuitem_get_position_realized:
-	@mi: The #DbusmenuMenuitem to find the position of
-	@parent: The #DbusmenuMenuitem who's children contain @mi
-
-	This function is very similar to #dbusmenu_menuitem_get_position
-	except that it only counts in the children that have been realized.
-
-	Return value: The position of @mi in the realized children of @parent.
-*/
+ * dbusmenu_menuitem_get_position_realized:
+ * @mi: The #DbusmenuMenuitem to find the position of
+ * @parent: The #DbusmenuMenuitem who's children contain @mi
+ * 
+ * This function is very similar to #dbusmenu_menuitem_get_position
+ * except that it only counts in the children that have been realized.
+ * 
+ * Return value: The position of @mi in the realized children of @parent.
+ */
 guint
 dbusmenu_menuitem_get_position_realized (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent)
 {
@@ -662,15 +662,15 @@ dbusmenu_menuitem_get_position_realized (DbusmenuMenuitem * mi, DbusmenuMenuitem
 }
 
 /**
-	dbusmenu_menuitem_child_append:
-	@mi: The #DbusmenuMenuitem which will become a new parent
-	@child: The #DbusmenMenuitem that will be a child
-
-	This function adds @child to the list of children on @mi at
-	the end of that list.
-
-	Return value: Whether the child has been added successfully.
-*/
+ * dbusmenu_menuitem_child_append:
+ * @mi: The #DbusmenuMenuitem which will become a new parent
+ * @child: The #DbusmenMenuitem that will be a child
+ * 
+ * This function adds @child to the list of children on @mi at
+ * the end of that list.
+ * 
+ * Return value: Whether the child has been added successfully.
+ */
 gboolean
 dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 {
@@ -694,15 +694,15 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 }
 
 /**
-	dbusmenu_menuitem_child_prepend:
-	@mi: The #DbusmenuMenuitem which will become a new parent
-	@child: The #DbusmenMenuitem that will be a child
-
-	This function adds @child to the list of children on @mi at
-	the beginning of that list.
-
-	Return value: Whether the child has been added successfully.
-*/
+ * dbusmenu_menuitem_child_prepend:
+ * @mi: The #DbusmenuMenuitem which will become a new parent
+ * @child: The #DbusmenMenuitem that will be a child
+ * 
+ * This function adds @child to the list of children on @mi at
+ * the beginning of that list.
+ * 
+ * Return value: Whether the child has been added successfully.
+ */
 gboolean
 dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 {
@@ -726,16 +726,16 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child
 }
 
 /**
-	dbusmenu_menuitem_child_delete:
-	@mi: The #DbusmenuMenuitem which has @child as a child
-	@child: The child #DbusmenuMenuitem that you want to no longer
-	    be a child of @mi.
-	
-	This function removes @child from the children list of @mi.  It does
-	not call #g_object_unref on @child.
-
-	Return value: If we were able to delete @child.
-*/
+ * dbusmenu_menuitem_child_delete:
+ * @mi: The #DbusmenuMenuitem which has @child as a child
+ * @child: The child #DbusmenuMenuitem that you want to no longer
+ *     be a child of @mi.
+ * 
+ * This function removes @child from the children list of @mi.  It does
+ * not call #g_object_unref on @child.
+ * 
+ * Return value: If we were able to delete @child.
+ */
 gboolean
 dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 {
@@ -758,17 +758,17 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 }
 
 /**
-	dbusmenu_menuitem_child_add_position:
-	@mi: The #DbusmenuMenuitem that we're adding the child @child to.
-	@child: The #DbusmenuMenuitem to make a child of @mi.
-	@position: Where in @mi object's list of chidren @child should be placed.
-
-	Puts @child in the list of children for @mi at the location
-	specified in @position.  If there is not enough entires available
-	then @child will be placed at the end of the list.
-
-	Return value: Whether @child was added successfully.
-*/
+ * dbusmenu_menuitem_child_add_position:
+ * @mi: The #DbusmenuMenuitem that we're adding the child @child to.
+ * @child: The #DbusmenuMenuitem to make a child of @mi.
+ * @position: Where in @mi object's list of chidren @child should be placed.
+ * 
+ * Puts @child in the list of children for @mi at the location
+ * specified in @position.  If there is not enough entires available
+ * then @child will be placed at the end of the list.
+ * 
+ * Return value: Whether @child was added successfully.
+ */
 gboolean
 dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position)
 {
@@ -792,17 +792,17 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem *
 }
 
 /**
-	dbusmenu_menuitem_child_reorder:
-	@base: The #DbusmenuMenuitem that has children needing realignment
-	@child: The #DbusmenuMenuitem that is a child needing to be moved
-	@position: The position in the list to place it in
-
-	This function moves a child on the list of children.  It is
-	for a child that is already in the list, but simply needs a 
-	new location.
-
-	Return value: Whether the move was successful.
-*/
+ * dbusmenu_menuitem_child_reorder:
+ * @mi: The #DbusmenuMenuitem that has children needing realignment
+ * @child: The #DbusmenuMenuitem that is a child needing to be moved
+ * @position: The position in the list to place it in
+ * 
+ * This function moves a child on the list of children.  It is
+ * for a child that is already in the list, but simply needs a 
+ * new location.
+ * 
+ * Return value: Whether the move was successful.
+ */
 gboolean
 dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position)
 {
@@ -832,16 +832,16 @@ dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * mi, DbusmenuMenuitem * child,
 }
 
 /**
-	dbusmenu_menuitem_child_find:
-	@mi: The #DbusmenuMenuitem who's children to look on
-	@id: The ID of the child that we're looking for.
-
-	Search the children of @mi to find one with the ID of @id.
-	If it doesn't exist then we return #NULL.
-
-	Return value: The menu item with the ID @id or #NULL if it
-	   can't be found.
-*/
+ * dbusmenu_menuitem_child_find:
+ * @mi: The #DbusmenuMenuitem who's children to look on
+ * @id: The ID of the child that we're looking for.
+ * 
+ * Search the children of @mi to find one with the ID of @id.
+ * If it doesn't exist then we return #NULL.
+ * 
+ * Return value: (transfer none): The menu item with the ID @id or #NULL if it
+ *    can't be found.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_child_find (DbusmenuMenuitem * mi, gint id)
 {
@@ -885,18 +885,18 @@ find_id_helper (gpointer in_mi, gpointer in_find_id)
 }
 
 /**
-	dbusmenu_menuitem_find_id:
-	@mi: #DbusmenuMenuitem at the top of the tree to search
-	@id: ID of the #DbusmenuMenuitem to search for
-
-	This function searchs the whole tree of children that
-	are attached to @mi.  This could be quite a few nodes, all
-	the way down the tree.  It is a depth first search.
-
-	Return value: The #DbusmenuMenuitem with the ID of @id
-		or #NULL if there isn't such a menu item in the tree
-		represented by @mi.
-*/
+ * dbusmenu_menuitem_find_id:
+ * @mi: #DbusmenuMenuitem at the top of the tree to search
+ * @id: ID of the #DbusmenuMenuitem to search for
+ * 
+ * This function searchs the whole tree of children that
+ * are attached to @mi.  This could be quite a few nodes, all
+ * the way down the tree.  It is a depth first search.
+ * 
+ * Return value: (transfer none): The #DbusmenuMenuitem with the ID of @id
+ * 	or #NULL if there isn't such a menu item in the tree
+ * 	represented by @mi.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id)
 {
@@ -913,20 +913,20 @@ dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id)
 }
 
 /**
-	dbusmenu_menuitem_property_set:
-	@mi: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@value: The value of the property.
-
-	Takes the pair of @property and @value and places them as a
-	property on @mi.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal #DbusmenuMenuitem::prop-changed will be
-	emitted by this function.
-
-	Return value:  A boolean representing if the property value was set.
-*/
+ * dbusmenu_menuitem_property_set:
+ * @mi: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @value: The value of the property.
+ * 
+ * Takes the pair of @property and @value and places them as a
+ * property on @mi.  If a property already exists by that name,
+ * then the value is set to the new value.  If not, the property
+ * is added.  If the value is changed or the property was previously
+ * unset then the signal #DbusmenuMenuitem::prop-changed will be
+ * emitted by this function.
+ * 
+ * Return value:  A boolean representing if the property value was set.
+ */
 gboolean
 dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value)
 {
@@ -938,20 +938,20 @@ dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, c
 }
 
 /**
-	dbusmenu_menuitem_property_set_bool:
-	@mi: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@value: The value of the property.
-
-	Takes a boolean @value and sets it on @property as a
-	property on @mi.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal #DbusmenuMenuitem::prop-changed will be
-	emitted by this function.
-
-	Return value:  A boolean representing if the property value was set.
-*/
+ * dbusmenu_menuitem_property_set_bool:
+ * @mi: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @value: The value of the property.
+ * 
+ * Takes a boolean @value and sets it on @property as a
+ * property on @mi.  If a property already exists by that name,
+ * then the value is set to the new value.  If not, the property
+ * is added.  If the value is changed or the property was previously
+ * unset then the signal #DbusmenuMenuitem::prop-changed will be
+ * emitted by this function.
+ * 
+ * Return value:  A boolean representing if the property value was set.
+ */
 gboolean
 dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value)
 {
@@ -960,20 +960,20 @@ dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * proper
 }
 
 /**
-	dbusmenu_menuitem_property_set_int:
-	@mi: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@value: The value of the property.
-
-	Takes a boolean @value and sets it on @property as a
-	property on @mi.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal #DbusmenuMenuitem::prop-changed will be
-	emitted by this function.
-
-	Return value:  A boolean representing if the property value was set.
-*/
+ * dbusmenu_menuitem_property_set_int:
+ * @mi: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @value: The value of the property.
+ * 
+ * Takes a boolean @value and sets it on @property as a
+ * property on @mi.  If a property already exists by that name,
+ * then the value is set to the new value.  If not, the property
+ * is added.  If the value is changed or the property was previously
+ * unset then the signal #DbusmenuMenuitem::prop-changed will be
+ * emitted by this function.
+ * 
+ * Return value:  A boolean representing if the property value was set.
+ */
 gboolean
 dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value)
 {
@@ -982,20 +982,20 @@ dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * propert
 }
 
 /**
-	dbusmenu_menuitem_property_set_variant:
-	@mi: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@value: The value of the property.
-
-	Takes the pair of @property and @value and places them as a
-	property on @mi.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal #DbusmenuMenuitem::prop-changed will be
-	emitted by this function.
-
-	Return value:  A boolean representing if the property value was set.
-*/
+ * dbusmenu_menuitem_property_set_variant:
+ * @mi: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @value: The value of the property.
+ * 
+ * Takes the pair of @property and @value and places them as a
+ * property on @mi.  If a property already exists by that name,
+ * then the value is set to the new value.  If not, the property
+ * is added.  If the value is changed or the property was previously
+ * unset then the signal #DbusmenuMenuitem::prop-changed will be
+ * emitted by this function.
+ * 
+ * Return value:  A boolean representing if the property value was set.
+ */
 gboolean
 dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, GVariant * value)
 {
@@ -1034,18 +1034,18 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 }
 
 /**
-	dbusmenu_menuitem_property_get:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to grab.
-
-	Look up a property on @mi and return the value of it if
-	it exits.  #NULL will be returned if the property doesn't
-	exist.
-
-	Return value: A string with the value of the property
-		that shouldn't be free'd.  Or #NULL if the property
-		is not set or is not a string.
-*/
+ * dbusmenu_menuitem_property_get:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to grab.
+ * 
+ * Look up a property on @mi and return the value of it if
+ * it exits.  #NULL will be returned if the property doesn't
+ * exist.
+ * 
+ * Return value: (transfer none): A string with the value of the property
+ * 	that shouldn't be free'd.  Or #NULL if the property
+ * 	is not set or is not a string.
+ */
 const gchar *
 dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1056,16 +1056,16 @@ dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 }
 
 /**
-	dbusmenu_menuitem_property_get_variant:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to grab.
-
-	Look up a property on @mi and return the value of it if
-	it exits.  #NULL will be returned if the property doesn't
-	exist.
-
-	Return value: A GVariant for the property.
-*/
+ * dbusmenu_menuitem_property_get_variant:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to grab.
+ * 
+ * Look up a property on @mi and return the value of it if
+ * it exits.  #NULL will be returned if the property doesn't
+ * exist.
+ * 
+ * Return value: (transfer none): A GVariant for the property.
+ */
 GVariant *
 dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1078,15 +1078,15 @@ dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * pro
 }
 
 /**
-	dbusmenu_menuitem_property_get_bool:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to grab.
-
-	Look up a property on @mi and return the value of it if
-	it exits.  Returns #FALSE if the property doesn't exist.
-
-	Return value: The value of the property or #FALSE.
-*/
+ * dbusmenu_menuitem_property_get_bool:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to grab.
+ * 
+ * Look up a property on @mi and return the value of it if
+ * it exits.  Returns #FALSE if the property doesn't exist.
+ * 
+ * Return value: The value of the property or #FALSE.
+ */
 gboolean
 dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1112,15 +1112,15 @@ dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * proper
 }
 
 /**
-	dbusmenu_menuitem_property_get_int:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to grab.
-
-	Look up a property on @mi and return the value of it if
-	it exits.  Returns zero if the property doesn't exist.
-
-	Return value: The value of the property or zero.
-*/
+ * dbusmenu_menuitem_property_get_int:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to grab.
+ * 
+ * Look up a property on @mi and return the value of it if
+ * it exits.  Returns zero if the property doesn't exist.
+ * 
+ * Return value: The value of the property or zero.
+ */
 gint
 dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1142,15 +1142,15 @@ dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * propert
 
 
 /**
-	dbusmenu_menuitem_property_exit:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to look for.
-
-	Checkes to see if a particular property exists on @mi and 
-	returns #TRUE if so.
-
-	Return value: A boolean checking to see if the property is available
-*/
+ * dbusmenu_menuitem_property_exit:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to look for.
+ * 
+ * Checkes to see if a particular property exists on @mi and 
+ * returns #TRUE if so.
+ * 
+ * Return value: A boolean checking to see if the property is available
+ */
 gboolean
 dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1165,12 +1165,12 @@ dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property)
 }
 
 /**
-	dbusmenu_menuitem_property_remove:
-	@mi: The #DbusmenuMenuitem to remove the property on.
-	@property: The property to look for.
-
-	Removes a property from the menuitem.
-*/
+ * dbusmenu_menuitem_property_remove:
+ * @mi: The #DbusmenuMenuitem to remove the property on.
+ * @property: The property to look for.
+ * 
+ * Removes a property from the menuitem.
+ */
 void
 dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1185,15 +1185,16 @@ dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property
 }
 
 /**
-	dbusmenu_menuitem_properties_list:
-	@mi: #DbusmenuMenuitem to list the properties on
-
-	This functiong gets a list of the names of all the properties
-	that are set on this menu item.  This data on the list is owned
-	by the menuitem but the list is not and should be freed using
-	g_list_free() when the calling function is done with it.
-
-	Return value: A list of strings or NULL if there are none.
+ * dbusmenu_menuitem_properties_list:
+ * @mi: #DbusmenuMenuitem to list the properties on
+ * 
+ * This functiong gets a list of the names of all the properties
+ * that are set on this menu item.  This data on the list is owned
+ * by the menuitem but the list is not and should be freed using
+ * g_list_free() when the calling function is done with it.
+ * 
+ * Return value: (transfer container): A list of strings or NULL if there are
+ *     none.
 */
 GList *
 dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi)
@@ -1219,18 +1220,18 @@ copy_helper (gpointer in_key, gpointer in_value, gpointer in_data)
 }
 
 /**
-	dbusmenu_menuitem_properties_copy:
-	@mi: #DbusmenuMenuitem that we're interested in the properties of
-
-	This function takes the properties of a #DbusmenuMenuitem
-	and puts them into a #GHashTable that is referenced by the
-	key of a string and has the value of a string.  The hash
-	table may not have any entries if there aren't any or there
-	is an error in processing.  It is the caller's responsibility
-	to destroy the created #GHashTable.
-
-	Return value: A brand new #GHashTable that contains all of the
-		properties that are on this #DbusmenuMenuitem @mi.
+ * dbusmenu_menuitem_properties_copy:
+ * @mi: #DbusmenuMenuitem that we're interested in the properties of
+ * 
+ * This function takes the properties of a #DbusmenuMenuitem
+ * and puts them into a #GHashTable that is referenced by the
+ * key of a string and has the value of a string.  The hash
+ * table may not have any entries if there aren't any or there
+ * is an error in processing.  It is the caller's responsibility
+ * to destroy the created #GHashTable.
+ * 
+ * Return value: (transfer full): A brand new #GHashTable that contains all of
+ *    theroperties that are on this #DbusmenuMenuitem @mi.
 */
 GHashTable *
 dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi)
@@ -1255,14 +1256,14 @@ variant_helper (gpointer in_key, gpointer in_value, gpointer user_data)
 }
 
 /**
-	dbusmenu_menuitem_properties_variant:
-	@mi: #DbusmenuMenuitem to get properties from
-
-	Grabs the properties of the menuitem as a GVariant with the
-	type "a{sv}".
-
-	Return Value: A GVariant of type "a{sv}" or NULL on error.
-*/
+ * dbusmenu_menuitem_properties_variant:
+ * @mi: #DbusmenuMenuitem to get properties from
+ * 
+ * Grabs the properties of the menuitem as a GVariant with the
+ * type "a{sv}".
+ * 
+ * Return Value: (transfer full): A GVariant of type "a{sv}" or NULL on error.
+ */
 GVariant *
 dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi)
 {
@@ -1285,15 +1286,15 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_set_root:
-	@mi: #DbusmenuMenuitem to set whether it's root
-	@root: Whether @mi is a root node or not
-
-	This function sets the internal value of whether this is a
-	root node or not.
-
-	Return value: None
-*/
+ * dbusmenu_menuitem_set_root:
+ * @mi: #DbusmenuMenuitem to set whether it's root
+ * @root: Whether @mi is a root node or not
+ * 
+ * This function sets the internal value of whether this is a
+ * root node or not.
+ * 
+ * Return value: None
+ */
 void
 dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root)
 {
@@ -1304,14 +1305,14 @@ dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root)
 }
 
 /**
-	dbusmenu_menuitem_get_root:
-	@mi: #DbusmenuMenuitem to see whether it's root
-
-	This function returns the internal value of whether this is a
-	root node or not.
-
-	Return value: #TRUE if this is a root node
-*/
+ * dbusmenu_menuitem_get_root:
+ * @mi: #DbusmenuMenuitem to see whether it's root
+ * 
+ * This function returns the internal value of whether this is a
+ * root node or not.
+ * 
+ * Return value: #TRUE if this is a root node
+ */
 gboolean
 dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi)
 {
@@ -1322,16 +1323,16 @@ dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi)
 
 
 /**
-	dbusmenu_menuitem_buildxml:
-	@mi: #DbusmenuMenuitem to represent in XML
-	@array: (element-type utf8): A list of string that will be turned into an XML file
-
-	This function will add strings to the array @array.  It will put
-	at least one entry if this menu item has no children.  If it has
-	children it will put two for this entry, one representing the
-	start tag and one that is a closing tag.  It will allow it's
-	children to place their own tags in the array in between those two.
-*/
+ * dbusmenu_menuitem_buildxml:
+ * @mi: #DbusmenuMenuitem to represent in XML
+ * @array: (element-type utf8): A list of string that will be turned into an XML file
+ * 
+ * This function will add strings to the array @array.  It will put
+ * at least one entry if this menu item has no children.  If it has
+ * children it will put two for this entry, one representing the
+ * start tag and one that is a closing tag.  It will allow it's
+ * children to place their own tags in the array in between those two.
+ */
 void
 dbusmenu_menuitem_buildxml (DbusmenuMenuitem * mi, GPtrArray * array)
 {
@@ -1369,15 +1370,15 @@ foreach_helper (gpointer data, gpointer user_data)
 }
 
 /**
-	dbusmenu_menuitem_foreach:
-	@mi: The #DbusmenItem to start from
-	@func: Function to call on every node in the tree
-	@data: (closure): User data to pass to the function
-
-	This calls the function @func on this menu item and all
-	of the children of this item.  And their children.  And
-	their children.  And... you get the point.  It will get
-	called on the whole tree.
+ * dbusmenu_menuitem_foreach:
+ * @mi: The #DbusmenItem to start from
+ * @func: Function to call on every node in the tree
+ * @data: (closure): User data to pass to the function
+ * 
+ * This calls the function @func on this menu item and all
+ * of the children of this item.  And their children.  And
+ * their children.  And... you get the point.  It will get
+ * called on the whole tree.
 */
 void
 dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem * mi, gpointer data), gpointer data)
@@ -1393,23 +1394,23 @@ dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem
 }
 
 /**
-	dbusmenu_menuitem_handle_event:
-	@mi: The #DbusmenuMenuitem to send the signal on.
-	@name: The name of the signal
-	@variant: A value that could be set for the event
-	@timestamp: The timestamp of when the event happened
-
-	This function is called to create an event.  It is likely
-	to be overrided by subclasses.  The default menu item
-	will respond to the activate signal and do:
-
-	Emits the #DbusmenuMenuitem::item-activate signal on this
-	menu item.  Called by server objects when they get the
-	appropriate DBus signals from the client.
-
-	If you subclass this function you should really think
-	about calling the parent function unless you have a good
-	reason not to.
+ * dbusmenu_menuitem_handle_event:
+ * @mi: The #DbusmenuMenuitem to send the signal on.
+ * @name: The name of the signal
+ * @variant: A value that could be set for the event
+ * @timestamp: The timestamp of when the event happened
+ * 
+ * This function is called to create an event.  It is likely
+ * to be overrided by subclasses.  The default menu item
+ * will respond to the activate signal and do:
+ * 
+ * Emits the #DbusmenuMenuitem::item-activate signal on this
+ * menu item.  Called by server objects when they get the
+ * appropriate DBus signals from the client.
+ * 
+ * If you subclass this function you should really think
+ * about calling the parent function unless you have a good
+ * reason not to.
 */
 void
 dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
@@ -1427,16 +1428,16 @@ dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVari
 }
 
 /**
-	dbusmenu_menuitem_send_about_to_show:
-	@mi: The #DbusmenuMenuitem to send the signal on.
-	@cb: Callback to call when the call has returned.
-	@cb_data: (closure): Data to pass to the callback.
-
-	This function is used to send the even that the submenu
-	of this item is about to be shown.  Callers to this event
-	should delay showing the menu until their callback is
-	called if possible.
-*/
+ * dbusmenu_menuitem_send_about_to_show:
+ * @mi: The #DbusmenuMenuitem to send the signal on.
+ * @cb: Callback to call when the call has returned.
+ * @cb_data: (closure): Data to pass to the callback.
+ * 
+ * This function is used to send the even that the submenu
+ * of this item is about to be shown.  Callers to this event
+ * should delay showing the menu until their callback is
+ * called if possible.
+ */
 void
 dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data)
 {
@@ -1456,14 +1457,14 @@ dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (Dbusmen
 }
 
 /**
-	dbusmenu_menuitem_show_to_user:
-	@mi: #DbusmenuMenuitem to show
-	@timestamp: The time that the user requested it to be shown
-
-	Signals that this menu item should be shown to the user.  If this is
-	server side the server will then take it and send it over the
-	bus.
-*/
+ * dbusmenu_menuitem_show_to_user:
+ * @mi: #DbusmenuMenuitem to show
+ * @timestamp: The time that the user requested it to be shown
+ * 
+ * Signals that this menu item should be shown to the user.  If this is
+ * server side the server will then take it and send it over the
+ * bus.
+ */
 void
 dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp)
 {
-- 
cgit v1.2.3


From 9a4a97ad2363328818d5a7983ab2a5e3f7c46b72 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Feb 2011 13:21:14 -0600
Subject: Adding a stub for exposed checking

---
 libdbusmenu-glib/menuitem.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 54d2540..cca20a4 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1507,3 +1507,12 @@ dbusmenu_menuitem_property_is_default (DbusmenuMenuitem * mi, const gchar * prop
 	/* No defaults system yet */
 	return FALSE;
 }
+
+/* Check to see if this menu item has been sent into the bus yet or
+   not.  If no one cares we can give less info */
+gboolean
+dbusmenu_menuitem_exposed (DbusmenuMenuitem * mi)
+{
+
+	return TRUE;
+}
-- 
cgit v1.2.3


From 18fad06951c3293c268eb910d421960e15bcc371 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Feb 2011 13:25:50 -0600
Subject: Tracking whether we've been exposed

---
 libdbusmenu-glib/menuitem.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index cca20a4..23f3783 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -59,6 +59,7 @@ struct _DbusmenuMenuitemPrivate
 	GHashTable * properties;
 	gboolean root;
 	gboolean realized;
+	gboolean exposed;
 };
 
 /* Signals */
@@ -312,6 +313,7 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self)
 
 	priv->root = FALSE;
 	priv->realized = FALSE;
+	priv->exposed = FALSE;
 	
 	return;
 }
@@ -1338,6 +1340,8 @@ GVariant *
 dbusmenu_menuitem_build_variant (DbusmenuMenuitem * mi, const gchar ** properties, gint recurse)
 {
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+	priv->exposed = TRUE;
 
 	gint id = 0;
 	if (!dbusmenu_menuitem_get_root(mi)) {
@@ -1513,6 +1517,7 @@ dbusmenu_menuitem_property_is_default (DbusmenuMenuitem * mi, const gchar * prop
 gboolean
 dbusmenu_menuitem_exposed (DbusmenuMenuitem * mi)
 {
-
-	return TRUE;
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+	return priv->exposed;
 }
-- 
cgit v1.2.3


From a128fd2e85e2f442522c280a6d1d22663e8cdfea Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 18 Feb 2011 13:53:45 -0600
Subject: Handle a request for selective properties and give less data back

---
 libdbusmenu-glib/menuitem.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 54d2540..bc38e24 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1274,7 +1274,7 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi, const gchar ** prop
 
 	GVariant * final_variant = NULL;
 
-	if (g_hash_table_size(priv->properties) > 0) {
+	if (properties == NULL && g_hash_table_size(priv->properties) > 0) {
 		GVariantBuilder builder;
 		g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
 
@@ -1283,6 +1283,33 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi, const gchar ** prop
 		final_variant = g_variant_builder_end(&builder);
 	}
 
+	if (properties != NULL) {
+		GVariantBuilder builder;
+		gboolean builder_init = FALSE;
+		int i = 0; const gchar * prop;
+
+		for (prop = properties[i]; prop != NULL; prop = properties[++i]) {
+			GVariant * propvalue = dbusmenu_menuitem_property_get_variant(mi, prop);
+
+			if (propvalue == NULL) {
+				continue;
+			}
+
+			if (!builder_init) {
+				builder_init = TRUE;
+				g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+			}
+
+			GVariant * dict = g_variant_new_dict_entry(g_variant_new_string((gchar *)prop),
+			                                           g_variant_new_variant((GVariant *)propvalue));
+			g_variant_builder_add_value(&builder, dict);
+		}
+
+		if (builder_init) {
+			final_variant = g_variant_builder_end(&builder);
+		}
+	}
+
 	return final_variant;
 }
 
-- 
cgit v1.2.3


From 52380a969c8fcb140c35826a3bf55e8e835d65da Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 13:47:29 -0600
Subject: Fixing all the menuitem documentation

---
 libdbusmenu-glib/menuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index c994130..919552e 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1142,7 +1142,7 @@ dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * propert
 
 
 /**
- * dbusmenu_menuitem_property_exit:
+ * dbusmenu_menuitem_property_exist:
  * @mi: The #DbusmenuMenuitem to look for the property on.
  * @property: The property to look for.
  * 
-- 
cgit v1.2.3


From 8dd5384336a88c076429c621f8080bad947a9d23 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 17:35:19 -0600
Subject: Finally getting our very own reference for the defaults

---
 libdbusmenu-glib/menuitem.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index c994130..b6c5712 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -33,6 +33,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "menuitem.h"
 #include "menuitem-marshal.h"
 #include "menuitem-private.h"
+#include "defaults.h"
 
 #ifdef MASSIVEDEBUGGING
 #define LABEL(x)  dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(x), DBUSMENU_MENUITEM_PROP_LABEL)
@@ -59,6 +60,7 @@ struct _DbusmenuMenuitemPrivate
 	GHashTable * properties;
 	gboolean root;
 	gboolean realized;
+	DbusmenuDefaults * defaults;
 };
 
 /* Signals */
@@ -312,6 +314,8 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self)
 
 	priv->root = FALSE;
 	priv->realized = FALSE;
+
+	priv->defaults = dbusmenu_defaults_ref_default();
 	
 	return;
 }
@@ -328,6 +332,11 @@ dbusmenu_menuitem_dispose (GObject *object)
 	g_list_free(priv->children);
 	priv->children = NULL;
 
+	if (priv->defaults != NULL) {
+		g_object_unref(priv->defaults);
+		priv->defaults = NULL;
+	}
+
 	G_OBJECT_CLASS (dbusmenu_menuitem_parent_class)->dispose (object);
 	return;
 }
-- 
cgit v1.2.3


From 494adf9835825c711fd9f05b44143d6331bcab63 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:06:41 -0600
Subject: When we're setting a value check to see if it's the same as the
 default and clear it if so.

---
 libdbusmenu-glib/menuitem.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index b6c5712..c744435 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -434,6 +434,14 @@ send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gp
 	return;
 }
 
+/* A helper function to get the type of the menuitem, this might
+   be a candidate for optimization in the future. */
+static const gchar *
+menuitem_get_type (DbusmenuMenuitem * mi)
+{
+	return dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE);
+}
+
 /* Public interface */
 
 /**
@@ -1013,6 +1021,35 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
+	const gchar * type = menuitem_get_type(mi);
+	if (type != NULL) {
+		/* Check the defaults database to see if we have a default
+		   for this property. */
+		GVariant * default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
+		if (default_value != NULL) {
+			/* If we have a default we might also have an expected type */
+			GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
+
+			if (default_type != NULL) {
+				/* If we have an expected type we should check to see if
+				   the value we've been given is of the same type and generate
+				   a warning if it isn't */
+				if (!g_variant_is_of_type(value, default_type)) {
+					g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
+				}
+			}
+
+			/* Now see if we're setting this to the same value as the
+			   default.  If we are then we just want to swallow this variant
+			   and make the function behave like we're clearing it. */
+			if (g_variant_equal(default_value, value)) {
+				g_variant_ref_sink(value);
+				g_variant_unref(value);
+				value = NULL;
+			}
+		}
+	}
+
 	gboolean replaced = FALSE;
 	gpointer currentval = g_hash_table_lookup(priv->properties, property);
 
-- 
cgit v1.2.3


From 507b6ec86e0e6c4eacd41863f8900a90c023f915 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:09:31 -0600
Subject: Allow for signaling the default value if it makes sense

---
 libdbusmenu-glib/menuitem.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index c744435..d25e80d 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1022,10 +1022,11 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
 	const gchar * type = menuitem_get_type(mi);
+	GVariant * default_value = NULL;
 	if (type != NULL) {
 		/* Check the defaults database to see if we have a default
 		   for this property. */
-		GVariant * default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
+		default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
 		if (default_value != NULL) {
 			/* If we have a default we might also have an expected type */
 			GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
@@ -1073,7 +1074,15 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	   table.  But the fact that there was a value is
 	   the imporant part. */
 	if (currentval == NULL || replaced) {
-		g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, value, TRUE);
+		GVariant * signalval = value;
+
+		if (signalval == NULL) {
+			/* Might also be NULL, but if it is we're definitely
+			   clearing this thing. */
+			signalval = default_value;
+		}
+
+		g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, signalval, TRUE);
 	}
 
 	return TRUE;
-- 
cgit v1.2.3


From 32f2fccc8b40dc5ccea70acff83a5b6f0302ffea Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:11:48 -0600
Subject: Always check the type even if we don't have a value.

---
 libdbusmenu-glib/menuitem.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index d25e80d..a773755 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1024,22 +1024,21 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	const gchar * type = menuitem_get_type(mi);
 	GVariant * default_value = NULL;
 	if (type != NULL) {
+		/* Check the expected type to see if we want to have a warning */
+		GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
+		if (default_type != NULL) {
+			/* If we have an expected type we should check to see if
+			   the value we've been given is of the same type and generate
+			   a warning if it isn't */
+			if (!g_variant_is_of_type(value, default_type)) {
+				g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
+			}
+		}
+
 		/* Check the defaults database to see if we have a default
 		   for this property. */
 		default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
 		if (default_value != NULL) {
-			/* If we have a default we might also have an expected type */
-			GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
-
-			if (default_type != NULL) {
-				/* If we have an expected type we should check to see if
-				   the value we've been given is of the same type and generate
-				   a warning if it isn't */
-				if (!g_variant_is_of_type(value, default_type)) {
-					g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
-				}
-			}
-
 			/* Now see if we're setting this to the same value as the
 			   default.  If we are then we just want to swallow this variant
 			   and make the function behave like we're clearing it. */
-- 
cgit v1.2.3


From db5438c7f8721ca3b32df9be5b3cd980aebc6784 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:17:29 -0600
Subject: Always replace to ensure we don't leak references.

---
 libdbusmenu-glib/menuitem.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index a773755..2e3b8f0 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1054,13 +1054,18 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	gpointer currentval = g_hash_table_lookup(priv->properties, property);
 
 	if (value != NULL) {
-		gchar * lprop = g_strdup(property);
-		g_variant_ref_sink(value);
-
+		/* NOTE: We're only marking this as replaced if this is true
+		   but we're actually replacing it no matter.  This is so that
+		   the variant passed in sticks around which the caller may
+		   expect.  They shouldn't, but it's low cost to remove bugs. */
 		if (currentval == NULL || !g_variant_equal((GVariant*)currentval, value)) {
-			g_hash_table_replace(priv->properties, lprop, value);
 			replaced = TRUE;
 		}
+
+		gchar * lprop = g_strdup(property);
+		g_variant_ref_sink(value);
+
+		g_hash_table_replace(priv->properties, lprop, value);
 	} else {
 		if (currentval != NULL) {
 			g_hash_table_remove(priv->properties, property);
-- 
cgit v1.2.3


From f1fb82edb2ebcd07af0efbbf7ed98509ae297576 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:19:48 -0600
Subject: If we can't get the value from our database, let's check the
 defaults.

---
 libdbusmenu-glib/menuitem.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 2e3b8f0..a3369af 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1133,7 +1133,13 @@ dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * pro
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
-	return (GVariant *)g_hash_table_lookup(priv->properties, property);
+	GVariant * currentval = (GVariant *)g_hash_table_lookup(priv->properties, property);
+
+	if (currentval == NULL) {
+		currentval = dbusmenu_defaults_default_get(priv->defaults, menuitem_get_type(mi), property);
+	}
+
+	return currentval;
 }
 
 /**
-- 
cgit v1.2.3


From 5192d305b96683f10567f961913e74bbe23f6e37 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:22:37 -0600
Subject: The defaults database can, and should, handle NULL types with
 fallbacks.

---
 libdbusmenu-glib/menuitem.c | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index a3369af..862cf63 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1022,31 +1022,29 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
 	const gchar * type = menuitem_get_type(mi);
-	GVariant * default_value = NULL;
-	if (type != NULL) {
-		/* Check the expected type to see if we want to have a warning */
-		GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
-		if (default_type != NULL) {
-			/* If we have an expected type we should check to see if
-			   the value we've been given is of the same type and generate
-			   a warning if it isn't */
-			if (!g_variant_is_of_type(value, default_type)) {
-				g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
-			}
+
+	/* Check the expected type to see if we want to have a warning */
+	GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
+	if (default_type != NULL) {
+		/* If we have an expected type we should check to see if
+		   the value we've been given is of the same type and generate
+		   a warning if it isn't */
+		if (!g_variant_is_of_type(value, default_type)) {
+			g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
 		}
+	}
 
-		/* Check the defaults database to see if we have a default
-		   for this property. */
-		default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
-		if (default_value != NULL) {
-			/* Now see if we're setting this to the same value as the
-			   default.  If we are then we just want to swallow this variant
-			   and make the function behave like we're clearing it. */
-			if (g_variant_equal(default_value, value)) {
-				g_variant_ref_sink(value);
-				g_variant_unref(value);
-				value = NULL;
-			}
+	/* Check the defaults database to see if we have a default
+	   for this property. */
+	GVariant * default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
+	if (default_value != NULL) {
+		/* Now see if we're setting this to the same value as the
+		   default.  If we are then we just want to swallow this variant
+		   and make the function behave like we're clearing it. */
+		if (g_variant_equal(default_value, value)) {
+			g_variant_ref_sink(value);
+			g_variant_unref(value);
+			value = NULL;
 		}
 	}
 
-- 
cgit v1.2.3


From ac9229802235759397ce6fffc4d89f27be64ad3d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:27:13 -0600
Subject: Fleshing out the check for if a property is a default value.

---
 libdbusmenu-glib/menuitem.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 862cf63..bc2daf5 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1566,10 +1566,23 @@ dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp)
 
 /* Checks to see if the value of this property is unique or just the
    default value. */
-/* TODO: Implement this */
 gboolean
 dbusmenu_menuitem_property_is_default (DbusmenuMenuitem * mi, const gchar * property)
 {
-	/* No defaults system yet */
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	GVariant * currentval = (GVariant *)g_hash_table_lookup(priv->properties, property);
+	if (currentval != NULL) {
+		/* If we're storing it locally, then it shouldn't be a default */
+		return FALSE;
+	}
+
+	currentval = dbusmenu_defaults_default_get(priv->defaults, menuitem_get_type(mi), property);
+	if (currentval != NULL) {
+		return TRUE;
+	}
+
+	g_warn_if_reached();
 	return FALSE;
 }
-- 
cgit v1.2.3


From 75ecaddcbeb02eaa40d11bb8c3f858062a14471b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 21 Feb 2011 21:41:54 -0600
Subject: Ensure that we check the local db for the type and don't go all
 recursive.

---
 libdbusmenu-glib/menuitem.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index bc2daf5..ee18fab 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -439,7 +439,12 @@ send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gp
 static const gchar *
 menuitem_get_type (DbusmenuMenuitem * mi)
 {
-	return dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+	GVariant * currentval = (GVariant *)g_hash_table_lookup(priv->properties, DBUSMENU_MENUITEM_PROP_TYPE);
+	if (currentval != NULL) {
+		return g_variant_get_string(currentval, NULL);
+	}
+	return NULL;
 }
 
 /* Public interface */
-- 
cgit v1.2.3


From b4fcda58ac462d058d589524c7a68592cf60b56e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 22 Feb 2011 10:57:56 -0600
Subject: Should return VOID

---
 libdbusmenu-glib/menuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 7a279b1..b153900 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -261,7 +261,7 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                          G_STRUCT_OFFSET(DbusmenuMenuitemClass, event),
 	                                          NULL, NULL,
 	                                          _dbusmenu_menuitem_marshal_VOID__STRING_VARIANT_UINT,
-	                                          G_TYPE_BOOLEAN, 3, G_TYPE_STRING, G_TYPE_VARIANT, G_TYPE_UINT);
+	                                          G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_VARIANT, G_TYPE_UINT);
 
 	g_object_class_install_property (object_class, PROP_ID,
 	                                 g_param_spec_int(PROP_ID_S, "ID for the menu item",
-- 
cgit v1.2.3


From d69242596c18abf533cabb4eba80b5200496349d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 09:36:15 -0600
Subject: Switch signal handler to return bool so that we can signal if someone
 has handled it

---
 libdbusmenu-glib/menuitem.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index d8ae1a1..d420fd6 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -261,9 +261,9 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                          G_TYPE_FROM_CLASS(klass),
 	                                          G_SIGNAL_RUN_LAST,
 	                                          G_STRUCT_OFFSET(DbusmenuMenuitemClass, event),
-	                                          NULL, NULL,
-	                                          _dbusmenu_menuitem_marshal_VOID__STRING_VARIANT_UINT,
-	                                          G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_VARIANT, G_TYPE_UINT);
+	                                          g_signal_accumulator_true_handled, NULL,
+	                                          _dbusmenu_menuitem_marshal_BOOLEAN__STRING_VARIANT_UINT,
+	                                          G_TYPE_BOOLEAN, 3, G_TYPE_STRING, G_TYPE_VARIANT, G_TYPE_UINT);
 
 	g_object_class_install_property (object_class, PROP_ID,
 	                                 g_param_spec_int(PROP_ID_S, "ID for the menu item",
@@ -1533,12 +1533,13 @@ dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVari
 	#endif
 	DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi);
 
-	if (class->handle_event != NULL) {
+	gboolean handled = FALSE;
+	g_signal_emit(G_OBJECT(mi), EVENT, g_quark_from_string(name), name, variant, timestamp, &handled);
+
+	if (!handled && class->handle_event != NULL) {
 		return class->handle_event(mi, name, variant, timestamp);
 	}
 
-	g_signal_emit(G_OBJECT(mi), EVENT, g_quark_from_string(name), name, variant, timestamp, TRUE);
-
 	return;
 }
 
-- 
cgit v1.2.3


From 4c9b48b9f83801a398437f8fbf3f60a46d55b110 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 10:31:05 -0600
Subject: Redefine so that we don't recurse if we shouldn't

---
 libdbusmenu-glib/menuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index ee18fab..f252afa 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1433,7 +1433,7 @@ dbusmenu_menuitem_build_variant (DbusmenuMenuitem * mi, const gchar ** propertie
 
 	/* Pillage the children */
 	GList * children = dbusmenu_menuitem_get_children(mi);
-	if (children == NULL && recurse != 0) {
+	if (children == NULL || recurse == 0) {
 		g_variant_builder_add_value(&tupleb, g_variant_new_array(G_VARIANT_TYPE_VARIANT, NULL, 0));
 	} else {
 		GVariantBuilder childrenbuilder;
-- 
cgit v1.2.3


From 3887a48a9c3557c396b472f7a8bb95101a025d0d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 11:21:10 -0600
Subject: If there's a singular NULL entry we also want the full list

---
 libdbusmenu-glib/menuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index bc38e24..3c8ff8d 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1274,7 +1274,7 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi, const gchar ** prop
 
 	GVariant * final_variant = NULL;
 
-	if (properties == NULL && g_hash_table_size(priv->properties) > 0) {
+	if ((properties == NULL || properties[0] == NULL) && g_hash_table_size(priv->properties) > 0) {
 		GVariantBuilder builder;
 		g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
 
-- 
cgit v1.2.3


From c5550da0485ca4b51fb7721eba15322dc5f4f896 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 23 Feb 2011 13:24:04 -0600
Subject: Only look at defaults if we have a value to compare with.

---
 libdbusmenu-glib/menuitem.c | 47 ++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index ee18fab..cdd2109 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1025,31 +1025,34 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	g_return_val_if_fail(property != NULL, FALSE);
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+	GVariant * default_value = NULL;
 
-	const gchar * type = menuitem_get_type(mi);
-
-	/* Check the expected type to see if we want to have a warning */
-	GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
-	if (default_type != NULL) {
-		/* If we have an expected type we should check to see if
-		   the value we've been given is of the same type and generate
-		   a warning if it isn't */
-		if (!g_variant_is_of_type(value, default_type)) {
-			g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
+	if (value != NULL) {
+		const gchar * type = menuitem_get_type(mi);
+
+		/* Check the expected type to see if we want to have a warning */
+		GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
+		if (default_type != NULL) {
+			/* If we have an expected type we should check to see if
+			   the value we've been given is of the same type and generate
+			   a warning if it isn't */
+			if (!g_variant_is_of_type(value, default_type)) {
+				g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
+			}
 		}
-	}
 
-	/* Check the defaults database to see if we have a default
-	   for this property. */
-	GVariant * default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
-	if (default_value != NULL) {
-		/* Now see if we're setting this to the same value as the
-		   default.  If we are then we just want to swallow this variant
-		   and make the function behave like we're clearing it. */
-		if (g_variant_equal(default_value, value)) {
-			g_variant_ref_sink(value);
-			g_variant_unref(value);
-			value = NULL;
+		/* Check the defaults database to see if we have a default
+		   for this property. */
+		default_value = dbusmenu_defaults_default_get(priv->defaults, type, property);
+		if (default_value != NULL) {
+			/* Now see if we're setting this to the same value as the
+			   default.  If we are then we just want to swallow this variant
+			   and make the function behave like we're clearing it. */
+			if (g_variant_equal(default_value, value)) {
+				g_variant_ref_sink(value);
+				g_variant_unref(value);
+				value = NULL;
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From 37fb090b4f9fb1e1a894c5c57e7c3d28eb71f92d Mon Sep 17 00:00:00 2001
From: Chris Coulson <chrisccoulson@ubuntu.com>
Date: Thu, 24 Feb 2011 15:43:25 +0000
Subject: Hold a weak pointer to each DbusmenuMenuitems parent. This avoids
 using g_object_{get/set}_data for storing a nodes parent in the parser code,
 and the associated problems with that (ie, a child out-living its parent,
 leading to invalid reads

---
 libdbusmenu-glib/menuitem.c | 102 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 100 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 89b2b91..49b83ce 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -62,6 +62,7 @@ struct _DbusmenuMenuitemPrivate
 	gboolean realized;
 	DbusmenuDefaults * defaults;
 	gboolean exposed;
+	DbusmenuMenuitem * parent;
 };
 
 /* Signals */
@@ -339,6 +340,11 @@ dbusmenu_menuitem_dispose (GObject *object)
 		priv->defaults = NULL;
 	}
 
+	if (priv->parent) {
+		g_object_remove_weak_pointer(G_OBJECT(priv->parent), (gpointer *)&priv->parent);
+		priv->parent = NULL;
+	}
+
 	G_OBJECT_CLASS (dbusmenu_menuitem_parent_class)->dispose (object);
 	return;
 }
@@ -565,11 +571,12 @@ dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi)
 /* For all the taken children we need to signal
    that they were removed */
 static void
-take_children_signal (gpointer data, gpointer user_data)
+take_children_helper (gpointer data, gpointer user_data)
 {
 	#ifdef MASSIVEDEBUGGING
 	g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(user_data), LABEL(user_data), ID(data), LABEL(data));
 	#endif
+	dbusmenu_menuitem_unparent(DBUSMENU_MENUITEM(data));
 	g_signal_emit(G_OBJECT(user_data), signals[CHILD_REMOVED], 0, DBUSMENU_MENUITEM(data), TRUE);
 	return;
 }
@@ -595,7 +602,7 @@ dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi)
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	GList * children = priv->children;
 	priv->children = NULL;
-	g_list_foreach(children, take_children_signal, mi);
+	g_list_foreach(children, take_children_helper, mi);
 
 	dbusmenu_menuitem_property_remove(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY);
 	
@@ -704,6 +711,10 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE);
 
+	if (!dbusmenu_menuitem_set_parent(child, mi)) {
+		return FALSE;
+	}
+
 	if (priv->children == NULL && !dbusmenu_menuitem_property_exist(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY)) {
 		dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY, DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU);
 	}
@@ -736,6 +747,10 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE);
 
+	if (!dbusmenu_menuitem_set_parent(child, mi)) {
+		return FALSE;
+	}
+
 	if (priv->children == NULL && !dbusmenu_menuitem_property_exist(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY)) {
 		dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY, DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU);
 	}
@@ -768,6 +783,7 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	priv->children = g_list_remove(priv->children, child);
+	dbusmenu_menuitem_unparent(child);
 	#ifdef MASSIVEDEBUGGING
 	g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(mi), LABEL(mi), ID(child), LABEL(child));
 	#endif
@@ -802,6 +818,10 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem *
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE);
 
+	if (!dbusmenu_menuitem_set_parent(child, mi)) {
+		return FALSE;
+	}
+
 	if (priv->children == NULL && !dbusmenu_menuitem_property_exist(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY)) {
 		dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY, DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU);
 	}
@@ -936,6 +956,84 @@ dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id)
 	return find_id.mi;
 }
 
+/**
+ * dbusmenu_menuitem_set_parent:
+ * @mi: The #DbusmenuMenuitem for which to set the parent
+ * @parent: The new parent #DbusmenuMenuitem
+ *
+ * Sets the parent of @mi to @parent. If @mi already
+ * has a parent, then this call will fail. The parent will
+ * be set automatically when using the usual methods to add a
+ * child menuitem, so this function should not normally be 
+ * called directly 
+ *
+ * Return value: Whether the parent was set successfully
+ */
+gboolean
+dbusmenu_menuitem_set_parent (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent)
+{
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
+
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	if (priv->parent != NULL) {
+		g_warning ("Menu item already has a parent");
+		return FALSE;
+	}
+
+	priv->parent = parent;
+	g_object_add_weak_pointer(G_OBJECT(priv->parent), (gpointer *)&priv->parent);
+
+	return TRUE;
+}
+
+/**
+ * dbusmenu_menuitem_unparent:
+ * @mi: The #DbusmenuMenuitem to unparent
+ *
+ * Unparents the menu item @mi. If @mi doesn't have a
+ * parent, then this call will fail. The menuitem will
+ * be unparented automatically when using the usual methods
+ * to delete a child menuitem, so this function should not
+ * normally be called directly 
+ *
+ * Return value: Whether the menu item was unparented successfully
+ */
+gboolean
+dbusmenu_menuitem_unparent (DbusmenuMenuitem * mi)
+{
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	if (priv->parent == NULL) {
+		g_warning("Menu item doesn't have a parent");
+		return FALSE;
+	}
+
+	g_object_remove_weak_pointer(G_OBJECT(priv->parent), (gpointer *)&priv->parent);
+	priv->parent = NULL;
+
+	return TRUE;
+}
+
+/**
+ * dbusmenu_menuitem_get_parent:
+ * @mi: The #DbusmenuMenuitem for which to inspect the parent
+ *
+ * This function looks up the parent of @mi
+ *
+ * Return value: The parent of this menu item
+ */
+DbusmenuMenuitem *
+dbusmenu_menuitem_get_parent (DbusmenuMenuitem * mi)
+{
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	return priv->parent;
+}
+
 /**
  * dbusmenu_menuitem_property_set:
  * @mi: The #DbusmenuMenuitem to set the property on.
-- 
cgit v1.2.3


From 3cb0a087b79ef0af68b3ba73944f503823603bff Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 10:26:27 -0600
Subject: Checking to ensure we're the parent before deleting

---
 libdbusmenu-glib/menuitem.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 49b83ce..0bbce8c 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -781,6 +781,11 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE);
 
+	if (dbusmenu_menuitem_get_parent(child) != mi) {
+		g_warning("Trying to remove a child that doesn't believe we're it's parent.");
+		return FALSE;
+	}
+
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	priv->children = g_list_remove(priv->children, child);
 	dbusmenu_menuitem_unparent(child);
-- 
cgit v1.2.3


From 2dce5a22fac21e608b85630a825c36fc86c1c592 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 10:27:07 -0600
Subject: Adding a transfer annotation for the get_parent function

---
 libdbusmenu-glib/menuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 0bbce8c..de8a1ad 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1028,7 +1028,7 @@ dbusmenu_menuitem_unparent (DbusmenuMenuitem * mi)
  *
  * This function looks up the parent of @mi
  *
- * Return value: The parent of this menu item
+ * Return value: (transfer none): The parent of this menu item
  */
 DbusmenuMenuitem *
 dbusmenu_menuitem_get_parent (DbusmenuMenuitem * mi)
-- 
cgit v1.2.3


From 0e833536055614008cd6f75734d2c2a8c1e646bf Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 10:35:55 -0600
Subject: Fixing signal emition to use the saved value instead of the enum

---
 libdbusmenu-glib/menuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 3dd98df..fb138b6 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1671,7 +1671,7 @@ dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVari
 	DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi);
 
 	gboolean handled = FALSE;
-	g_signal_emit(G_OBJECT(mi), EVENT, g_quark_from_string(name), name, variant, timestamp, &handled);
+	g_signal_emit(G_OBJECT(mi), signals[EVENT], g_quark_from_string(name), name, variant, timestamp, &handled);
 
 	if (!handled && class->handle_event != NULL) {
 		return class->handle_event(mi, name, variant, timestamp);
-- 
cgit v1.2.3


From 78f43d50ded332c262d28cfc268ea1c9928aef7e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 24 Feb 2011 14:21:43 -0600
Subject: Marking as having details available in the signal

---
 libdbusmenu-glib/menuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdbusmenu-glib/menuitem.c')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index fb138b6..5202aa1 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -261,7 +261,7 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	*/
 	signals[EVENT] =             g_signal_new(DBUSMENU_MENUITEM_SIGNAL_EVENT,
 	                                          G_TYPE_FROM_CLASS(klass),
-	                                          G_SIGNAL_RUN_LAST,
+	                                          G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
 	                                          G_STRUCT_OFFSET(DbusmenuMenuitemClass, event),
 	                                          g_signal_accumulator_true_handled, NULL,
 	                                          _dbusmenu_menuitem_marshal_BOOLEAN__STRING_VARIANT_UINT,
-- 
cgit v1.2.3