From 3dcaae7b7da97aa3b84f94ed5ebc3f6fba86cc41 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 12 Oct 2010 16:14:21 -0500
Subject: Putting the pointer to the private area in the instance

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

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index ef037d1..e9b70d4 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -52,7 +52,6 @@ License version 3 and version 2.1 along with this program.  If not, see
 	out of data that we have.  They can still be gotten using
 	accessor functions, but are protected appropriately.
 */
-typedef struct _DbusmenuMenuitemPrivate DbusmenuMenuitemPrivate;
 struct _DbusmenuMenuitemPrivate
 {
 	gint id;
-- 
cgit v1.2.3


From e437868558658d3c949b787566ab5668a0194d3a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 12 Oct 2010 16:21:44 -0500
Subject: Switching to using the pointer in the instance

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

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index e9b70d4..73b765b 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -83,8 +83,7 @@ enum {
 
 #define PROP_ID_S  "id"
 
-#define DBUSMENU_MENUITEM_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemPrivate))
+#define DBUSMENU_MENUITEM_GET_PRIVATE(o)  (DBUSMENU_MENUITEM(o)->priv)
 
 /* Prototypes */
 static void dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass);
@@ -289,6 +288,8 @@ _g_value_free (gpointer data)
 static void
 dbusmenu_menuitem_init (DbusmenuMenuitem *self)
 {
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemPrivate);
+
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(self);
 
 	priv->id = -1; 
-- 
cgit v1.2.3


From 92942cc10074b24d7e0c13e76754ab149c27b923 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 14 Oct 2010 16:00:38 -0500
Subject: Adding a helper function to get the menuitem properties as a variant

---
 libdbusmenu-glib/menuitem-private.h |  1 +
 libdbusmenu-glib/menuitem.c         | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

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

diff --git a/libdbusmenu-glib/menuitem-private.h b/libdbusmenu-glib/menuitem-private.h
index 3a0c026..2028464 100644
--- a/libdbusmenu-glib/menuitem-private.h
+++ b/libdbusmenu-glib/menuitem-private.h
@@ -36,6 +36,7 @@ G_BEGIN_DECLS
 void dbusmenu_menuitem_buildxml (DbusmenuMenuitem * mi, GPtrArray * array);
 gboolean dbusmenu_menuitem_realized (DbusmenuMenuitem * mi);
 void dbusmenu_menuitem_set_realized (DbusmenuMenuitem * mi);
+GVariant * dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi);
 
 G_END_DECLS
 
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 73b765b..5e700a5 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1220,6 +1220,50 @@ dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi)
 	return ret;
 }
 
+/* Looks at each value in the hashtable and tries to convert it
+   into a variant and add it to our variant builder */
+static void
+variant_helper (gpointer in_key, gpointer in_value, gpointer user_data)
+{
+	GValue vval = {0};
+	g_value_init(&vval, G_TYPE_VARIANT);
+
+	if (!g_value_transform((GValue *)in_value, &vval)) {
+		g_warning("Unable to convert property '%s' of type '%s'", (gchar *)in_key, G_VALUE_TYPE_NAME(in_value));
+		return;
+	}
+
+	g_variant_builder_add((GVariantBuilder *)user_data, "{sv}", in_key, g_value_get_variant(&vval));
+	g_value_unset(&vval);
+
+	return;
+}
+
+/**
+	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.
+*/
+GVariant *
+dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi)
+{
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
+
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	GVariantBuilder * builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+
+	g_hash_table_foreach(priv->properties, variant_helper, builder);
+
+	GVariant * final_variant = g_variant_builder_end(builder);
+	g_variant_builder_unref(builder);
+	return final_variant;
+}
+
 /**
 	dbusmenu_menuitem_set_root:
 	@mi: #DbusmenuMenuitem to set whether it's root
-- 
cgit v1.2.3


From bf33041c44cc9edd029a2ebe1359a78103f8e9f9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 15 Nov 2010 16:25:49 -0600
Subject: Some stub functions so that we can compile

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

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 5e700a5..7497697 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1021,6 +1021,13 @@ dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * prope
 	return TRUE;
 }
 
+gboolean
+dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, const GVariant * value)
+{
+
+	return FALSE;
+}
+
 /**
 	dbusmenu_menuitem_property_get:
 	@mi: The #DbusmenuMenuitem to look for the property on.
@@ -1065,6 +1072,13 @@ dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * prope
 	return (const GValue *)g_hash_table_lookup(priv->properties, property);
 }
 
+const GVariant *
+dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property)
+{
+
+	return NULL;
+}
+
 /**
 	dbusmenu_menuitem_property_get_bool:
 	@mi: The #DbusmenuMenuitem to look for the property on.
-- 
cgit v1.2.3


From d2eaaa6de0019da3bb9202dc0cb194ca5ef9d79f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 16 Nov 2010 16:25:24 -0600
Subject: It doesn't really match standard GVariant syntax to have this be a
 const

---
 libdbusmenu-glib/menuitem.c | 2 +-
 libdbusmenu-glib/menuitem.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 7497697..80d9df4 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1072,7 +1072,7 @@ dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * prope
 	return (const GValue *)g_hash_table_lookup(priv->properties, property);
 }
 
-const GVariant *
+GVariant *
 dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property)
 {
 
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 802a8c4..1dbad9d 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -194,7 +194,7 @@ gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar
 gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value);
 const gchar * dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property);
 const GValue * dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * property);
-const GVariant * dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property);
+GVariant * dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property);
 gboolean dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property);
 gint dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property);
 gboolean dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property);
-- 
cgit v1.2.3


From f39b7fe067855d42dd79300d2d283b02eef48a03 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Nov 2010 16:25:52 -0600
Subject: Switch the internal hash table to be variant and implement the set
 and get functions.  Also TODOs around other needed changes.

---
 libdbusmenu-glib/menuitem.c | 80 ++++++++++++++++++++++++++++++++++++++-------
 libdbusmenu-glib/menuitem.h |  2 +-
 2 files changed, 70 insertions(+), 12 deletions(-)

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 80d9df4..28a711a 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -271,15 +271,12 @@ g_value_transform_STRING_INT (const GValue * in, GValue * out)
 
 static gint menuitem_next_id = 1;
 
-/* A small little function to both clear the insides of a 
-   value as well as the memory it itself uses. */
+/* Make the unref function match the prototype need for the
+   hashtable destructor */
 static void
-_g_value_free (gpointer data)
+_g_variant_unref (gpointer data)
 {
-	if (data == NULL) return;
-	GValue * value = (GValue*)data;
-	g_value_unset(value);
-	g_free(data);
+	g_variant_unref((GVariant *)data);
 	return;
 }
 
@@ -295,7 +292,7 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self)
 	priv->id = -1; 
 	priv->children = NULL;
 
-	priv->properties = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, _g_value_free);
+	priv->properties = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, _g_variant_unref);
 
 	priv->root = FALSE;
 	priv->realized = FALSE;
@@ -919,6 +916,7 @@ dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, c
 	GValue val = {0};
 	g_value_init(&val, G_TYPE_STRING);
 	g_value_set_static_string(&val, value);
+	/* TODO: Switch to use variant */
 	return dbusmenu_menuitem_property_set_value(mi, property, &val);
 }
 
@@ -943,6 +941,7 @@ dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * proper
 	GValue val = {0};
 	g_value_init(&val, G_TYPE_BOOLEAN);
 	g_value_set_boolean(&val, value);
+	/* TODO: Switch to use variant */
 	return dbusmenu_menuitem_property_set_value(mi, property, &val);
 }
 
@@ -967,11 +966,12 @@ dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * propert
 	GValue val = {0};
 	g_value_init(&val, G_TYPE_INT);
 	g_value_set_int(&val, value);
+	/* TODO: Switch to use variant */
 	return dbusmenu_menuitem_property_set_value(mi, property, &val);
 }
 
 /**
-	dbusmenu_menuitem_property_set:
+	dbusmenu_menuitem_property_set_value:
 	@mi: The #DbusmenuMenuitem to set the property on.
 	@property: Name of the property to set.
 	@value: The value of the property.
@@ -988,6 +988,7 @@ dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * propert
 gboolean
 dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * property, const GValue * value)
 {
+	/* TODO: Switch to use variant */
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
 	g_return_val_if_fail(property != NULL, FALSE);
 	g_return_val_if_fail(G_IS_VALUE(value), FALSE);
@@ -1021,9 +1022,46 @@ dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * prope
 	return TRUE;
 }
 
+/**
+	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, const GVariant * value)
+dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, GVariant * value)
 {
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
+	g_return_val_if_fail(property != NULL, FALSE);
+
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	gchar * lprop = g_strdup(property);
+	g_variant_ref(value);
+
+	gboolean replaced = FALSE;
+	gpointer currentval = g_hash_table_lookup(priv->properties, lprop);
+	if (currentval == NULL || !g_variant_equal((GVariant*)currentval, value)) {
+		g_hash_table_replace(priv->properties, lprop, value);
+		replaced = TRUE;
+	}
+
+	/* NOTE: The actual value is invalid at this point
+	   becuse it has been unref'd when replaced in the hash
+	   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, lprop, value, TRUE);
+	}
 
 	return FALSE;
 }
@@ -1044,6 +1082,7 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 const gchar *
 dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 {
+	/* TODO: Switch to use variant */
 	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
 	if (value == NULL) return NULL;
 	if (G_VALUE_TYPE(value) != G_TYPE_STRING) return NULL;
@@ -1064,6 +1103,7 @@ dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 const GValue *
 dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * property)
 {
+	/* TODO: Switch to use variant */
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
 	g_return_val_if_fail(property != NULL, NULL);
 
@@ -1072,11 +1112,26 @@ dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * prope
 	return (const GValue *)g_hash_table_lookup(priv->properties, 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.
+*/
 GVariant *
 dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property)
 {
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
+	g_return_val_if_fail(property != NULL, NULL);
 
-	return NULL;
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	return (GVariant *)g_hash_table_lookup(priv->properties, property);
 }
 
 /**
@@ -1092,6 +1147,7 @@ dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * pro
 gboolean
 dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property)
 {
+	/* TODO: Switch to use variant */
 	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
 	if (value == NULL) return FALSE;
 	if (G_VALUE_TYPE(value) != G_TYPE_BOOLEAN) {
@@ -1120,6 +1176,7 @@ dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * proper
 gint
 dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property)
 {
+	/* TODO: Switch to use variant */
 	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
 	if (value == NULL) return 0;
 	if (G_VALUE_TYPE(value) != G_TYPE_INT) {
@@ -1239,6 +1296,7 @@ dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi)
 static void
 variant_helper (gpointer in_key, gpointer in_value, gpointer user_data)
 {
+	/* TODO: Switch to being a variant */
 	GValue vval = {0};
 	g_value_init(&vval, G_TYPE_VARIANT);
 
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 1dbad9d..438cdd1 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -189,7 +189,7 @@ DbusmenuMenuitem * dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id);
 
 gboolean dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value);
 gboolean dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * property, const GValue * value);
-gboolean dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, const GVariant * value);
+gboolean dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, GVariant * value);
 gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value);
 gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value);
 const gchar * dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property);
-- 
cgit v1.2.3


From 7352a7e71fbe842b9429bb5fcc6ab23e6578d4d1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Nov 2010 17:22:59 -0600
Subject: Replacing the value based functions with variants instead of values.

---
 libdbusmenu-glib/menuitem.c | 81 +++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 43 deletions(-)

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 28a711a..a9036f0 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -913,11 +913,8 @@ dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id)
 gboolean
 dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value)
 {
-	GValue val = {0};
-	g_value_init(&val, G_TYPE_STRING);
-	g_value_set_static_string(&val, value);
-	/* TODO: Switch to use variant */
-	return dbusmenu_menuitem_property_set_value(mi, property, &val);
+	GVariant * variant = g_variant_new("s", value);
+	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
 
 /**
@@ -938,11 +935,8 @@ dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, c
 gboolean
 dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value)
 {
-	GValue val = {0};
-	g_value_init(&val, G_TYPE_BOOLEAN);
-	g_value_set_boolean(&val, value);
-	/* TODO: Switch to use variant */
-	return dbusmenu_menuitem_property_set_value(mi, property, &val);
+	GVariant * variant = g_variant_new("b", value);
+	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
 
 /**
@@ -963,11 +957,8 @@ dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * proper
 gboolean
 dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value)
 {
-	GValue val = {0};
-	g_value_init(&val, G_TYPE_INT);
-	g_value_set_int(&val, value);
-	/* TODO: Switch to use variant */
-	return dbusmenu_menuitem_property_set_value(mi, property, &val);
+	GVariant * variant = g_variant_new("i", value);
+	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
 
 /**
@@ -1082,11 +1073,10 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 const gchar *
 dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 {
-	/* TODO: Switch to use variant */
-	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
-	if (value == NULL) return NULL;
-	if (G_VALUE_TYPE(value) != G_TYPE_STRING) return NULL;
-	return g_value_get_string(value);
+	GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
+	if (variant == NULL) return NULL;
+	if (!g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) return NULL;
+	return g_variant_get_string(variant, NULL);
 }
 
 /**
@@ -1147,20 +1137,25 @@ dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * pro
 gboolean
 dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property)
 {
-	/* TODO: Switch to use variant */
-	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
-	if (value == NULL) return FALSE;
-	if (G_VALUE_TYPE(value) != G_TYPE_BOOLEAN) {
-		if (g_value_type_transformable(G_VALUE_TYPE(value), G_TYPE_BOOLEAN)) {
-			GValue boolval = {0};
-			g_value_init(&boolval, G_TYPE_BOOLEAN);
-			g_value_transform(value, &boolval);
-			return g_value_get_boolean(&boolval);
+	GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
+	if (variant == NULL) return FALSE;
+
+	if (g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_BOOLEAN)) {
+		return g_variant_get_boolean(variant);
+	}
+
+	if (!g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) {
+		const gchar * string = g_variant_get_string(variant, NULL);
+
+		if (!g_strcmp0(string, "TRUE") || !g_strcmp0(string, "true") || !g_strcmp0(string, "True")) {
+			return TRUE;
 		} else {
 			return FALSE;
 		}
 	}
-	return g_value_get_boolean(value);
+
+	g_warning("Property '%s' has been requested as an boolean but is not one.", property);
+	return FALSE;
 }
 
 /**
@@ -1176,20 +1171,20 @@ dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * proper
 gint
 dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property)
 {
-	/* TODO: Switch to use variant */
-	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
-	if (value == NULL) return 0;
-	if (G_VALUE_TYPE(value) != G_TYPE_INT) {
-		if (g_value_type_transformable(G_VALUE_TYPE(value), G_TYPE_INT)) {
-			GValue intval = {0};
-			g_value_init(&intval, G_TYPE_INT);
-			g_value_transform(value, &intval);
-			return g_value_get_int(&intval);
-		} else {
-			return 0;
-		}
+	GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
+	if (variant == NULL) return 0;
+
+	if (g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_INT32)) {
+		return g_variant_get_int32(variant);
+	}
+
+	if (!g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) {
+		const gchar * string = g_variant_get_string(variant, NULL);
+		return atoi(string);
 	}
-	return g_value_get_int(value);
+
+	g_warning("Property '%s' has been requested as an int but is not one.", property);
+	return 0;
 }
 
 
-- 
cgit v1.2.3


From 353802f51c23447bcc905767014dcc37b5b76e20 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Nov 2010 20:08:39 -0600
Subject: Adding deprecation comment to the documentation.

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

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index a9036f0..d5d4d26 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -975,6 +975,7 @@ dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * propert
 	emitted by this function.
 
 	Return value:  A boolean representing if the property value was set.
+	Deprecated: Use dbusmenu_menuitem_property_set_variant() instead
 */
 gboolean
 dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * property, const GValue * value)
@@ -1089,6 +1090,7 @@ dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 	exist.
 
 	Return value: A GValue for the property.
+	Deprecated: Use dbusmenu_menuitem_property_get_variant() instead
 */
 const GValue *
 dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * property)
-- 
cgit v1.2.3


From 01603a653335b7f4f09120fc5e04f3273c36a8b5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Nov 2010 20:50:45 -0600
Subject: Change all the event handling to use GVariants

---
 libdbusmenu-glib/client-menuitem.c |  6 +++---
 libdbusmenu-glib/client.c          | 21 +++++++++------------
 libdbusmenu-glib/client.h          |  2 +-
 libdbusmenu-glib/menuitem-proxy.c  |  6 +++---
 libdbusmenu-glib/menuitem.c        | 10 +++++-----
 libdbusmenu-glib/menuitem.h        | 12 +++---------
 libdbusmenu-glib/server.c          | 11 ++++-------
 7 files changed, 28 insertions(+), 40 deletions(-)

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

diff --git a/libdbusmenu-glib/client-menuitem.c b/libdbusmenu-glib/client-menuitem.c
index 9c21065..0f14b85 100644
--- a/libdbusmenu-glib/client-menuitem.c
+++ b/libdbusmenu-glib/client-menuitem.c
@@ -45,7 +45,7 @@ static void dbusmenu_client_menuitem_class_init (DbusmenuClientMenuitemClass *kl
 static void dbusmenu_client_menuitem_init       (DbusmenuClientMenuitem *self);
 static void dbusmenu_client_menuitem_dispose    (GObject *object);
 static void dbusmenu_client_menuitem_finalize   (GObject *object);
-static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 static void send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 G_DEFINE_TYPE (DbusmenuClientMenuitem, dbusmenu_client_menuitem, DBUSMENU_TYPE_MENUITEM);
@@ -102,10 +102,10 @@ dbusmenu_client_menuitem_new (gint id, DbusmenuClient * client)
 
 /* Passes the event signal on through the client. */
 static void
-handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
 {
 	DbusmenuClientMenuitemPrivate * priv = DBUSMENU_CLIENT_MENUITEM_GET_PRIVATE(mi);
-	dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, value, timestamp);
+	dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, variant, timestamp);
 	return;
 }
 
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 7c90fa6..6f16eb2 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -112,7 +112,7 @@ struct _event_data_t {
 	DbusmenuClient * client;
 	DbusmenuMenuitem * menuitem;
 	gchar * event;
-	GValue data;
+	GVariant * variant;
 	guint timestamp;
 };
 
@@ -1189,9 +1189,9 @@ menuitem_call_cb (GObject * proxy, GAsyncResult * res, gpointer userdata)
 		g_warning("Unable to call event '%s' on menu item %d: %s", edata->event, dbusmenu_menuitem_get_id(edata->menuitem), error->message);
 	}
 
-	g_signal_emit(edata->client, signals[EVENT_RESULT], 0, edata->menuitem, edata->event, &edata->data, edata->timestamp, error, TRUE);
+	g_signal_emit(edata->client, signals[EVENT_RESULT], 0, edata->menuitem, edata->event, edata->variant, edata->timestamp, error, TRUE);
 
-	g_value_unset(&edata->data);
+	g_variant_unref(edata->variant);
 	g_free(edata->event);
 	g_object_unref(edata->menuitem);
 	g_free(edata);
@@ -1207,7 +1207,7 @@ menuitem_call_cb (GObject * proxy, GAsyncResult * res, gpointer userdata)
 /* Sends the event over DBus to the server on the other side
    of the bus. */
 void
-dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, const GValue * value, guint timestamp)
+dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, guint timestamp)
 {
 	g_return_if_fail(DBUSMENU_IS_CLIENT(client));
 	g_return_if_fail(id >= 0);
@@ -1220,11 +1220,8 @@ dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name
 		return;
 	}
 
-	if (value == NULL) {
-		GValue internalval = {0};
-		g_value_init(&internalval, G_TYPE_INT);
-		g_value_set_int(&internalval, 0);
-		value = &internalval;
+	if (variant == NULL) {
+		variant = g_variant_new("i", 0);
 	}
 
 	event_data_t * edata = g_new0(event_data_t, 1);
@@ -1232,13 +1229,13 @@ dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name
 	edata->menuitem = mi;
 	g_object_ref(edata->menuitem);
 	edata->event = g_strdup(name);
-	g_value_init(&edata->data, G_VALUE_TYPE(value));
-	g_value_copy(value, &edata->data);
 	edata->timestamp = timestamp;
+	edata->variant = variant;
+	g_variant_ref(variant);
 
 	g_dbus_proxy_call(priv->menuproxy,
 	                  "Event",
-	                  g_variant_new("isvu", id, name, value, timestamp),
+	                  g_variant_new("isvu", id, name, variant, timestamp),
 	                  G_DBUS_CALL_FLAGS_NONE,
 	                  1000,   /* timeout */
 	                  NULL, /* cancellable */
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 32813d9..3a3a988 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -122,7 +122,7 @@ gboolean             dbusmenu_client_add_type_handler  (DbusmenuClient * client,
 void                 dbusmenu_client_send_event        (DbusmenuClient * client,
                                                         gint id,
                                                         const gchar * name,
-                                                        const GValue * value,
+                                                        GVariant * variant,
                                                         guint timestamp);
 void                 dbusmenu_client_send_about_to_show(DbusmenuClient * client,
                                                         gint id,
diff --git a/libdbusmenu-glib/menuitem-proxy.c b/libdbusmenu-glib/menuitem-proxy.c
index 68bdcc6..1d97c4c 100644
--- a/libdbusmenu-glib/menuitem-proxy.c
+++ b/libdbusmenu-glib/menuitem-proxy.c
@@ -56,7 +56,7 @@ static void dbusmenu_menuitem_proxy_dispose    (GObject *object);
 static void dbusmenu_menuitem_proxy_finalize   (GObject *object);
 static void set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec);
 static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
-static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp);
 static void add_menuitem (DbusmenuMenuitemProxy * pmi, DbusmenuMenuitem * mi);
 static void remove_menuitem (DbusmenuMenuitemProxy * pmi);
 
@@ -162,12 +162,12 @@ get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec)
 /* Takes the event and passes it along to the item that we're
    playing proxy for. */
 static void
-handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
 {
 	g_return_if_fail(DBUSMENU_IS_MENUITEM_PROXY(mi));
 	DbusmenuMenuitemProxyPrivate * priv = DBUSMENU_MENUITEM_PROXY_GET_PRIVATE(mi);
 	g_return_if_fail(priv->mi != NULL);
-	return dbusmenu_menuitem_handle_event(priv->mi, name, value, timestamp);
+	return dbusmenu_menuitem_handle_event(priv->mi, name, variant, timestamp);
 }
 
 /* Watches a property change and makes sure to put that value
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index d5d4d26..643321a 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -94,7 +94,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, const GValue * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 static void send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 /* GObject stuff */
@@ -377,7 +377,7 @@ get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec)
 
 /* Handles the activate event if it is sent. */
 static void
-handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp)
 {
 	if (g_strcmp0(name, "clicked") == 0) {
 		g_signal_emit(G_OBJECT(mi), signals[ITEM_ACTIVATED], 0, timestamp, TRUE);
@@ -1445,7 +1445,7 @@ 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
-	@value: A value that could be set for the event
+	@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
@@ -1461,7 +1461,7 @@ dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem
 	reason not to.
 */
 void
-dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
 {
 	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
 	#ifdef MASSIVEDEBUGGING
@@ -1470,7 +1470,7 @@ dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, const
 	DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi);
 
 	if (class->handle_event != NULL) {
-		return class->handle_event(mi, name, value, timestamp);
+		return class->handle_event(mi, name, variant, timestamp);
 	}
 	return;
 }
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 77bca4b..9158f3e 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -145,7 +145,7 @@ struct _DbusmenuMenuitemClass
 	GObjectClass parent_class;
 
 	/* Signals */
-	void (*property_changed) (gchar * property, GValue * value);
+	void (*property_changed) (gchar * property, GVariant * value);
 	void (*item_activated) (guint timestamp);
 	void (*child_added) (DbusmenuMenuitem * child, guint position);
 	void (*child_removed) (DbusmenuMenuitem * child);
@@ -154,7 +154,7 @@ struct _DbusmenuMenuitemClass
 
 	/* Virtual functions */
 	dbusmenu_menuitem_buildxml_slot_t buildxml;
-	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 	void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 	void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpointer cb_data);
@@ -188,16 +188,10 @@ DbusmenuMenuitem * dbusmenu_menuitem_child_find (DbusmenuMenuitem * mi, gint id)
 DbusmenuMenuitem * dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id);
 
 gboolean dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value);
-#ifndef DBUSMENU_DISABLE_DEPRECATED
-gboolean dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * property, const GValue * value);
-#endif
 gboolean dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, GVariant * value);
 gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value);
 gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value);
 const gchar * dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property);
-#ifndef DBUSMENU_DISABLE_DEPRECATED
-const GValue * dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * property);
-#endif
 GVariant * dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property);
 gboolean dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property);
 gint dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property);
@@ -210,7 +204,7 @@ void dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root);
 gboolean dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi);
 
 void dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem * mi, gpointer data), gpointer data);
-void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 void dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp);
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index 4fdd6f8..bd5c2ac 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -935,7 +935,7 @@ typedef struct _idle_event_t idle_event_t;
 struct _idle_event_t {
 	DbusmenuMenuitem * mi;
 	gchar * eventid;
-	GValue data;
+	GVariant * variant;
 	guint timestamp;
 };
 
@@ -946,11 +946,11 @@ event_local_handler (gpointer user_data)
 {
 	idle_event_t * data = (idle_event_t *)user_data;
 
-	dbusmenu_menuitem_handle_event(data->mi, data->eventid, &data->data, data->timestamp);
+	dbusmenu_menuitem_handle_event(data->mi, data->eventid, data->variant, data->timestamp);
 
 	g_object_unref(data->mi);
 	g_free(data->eventid);
-	g_value_unset(&data->data);
+	g_variant_unref(data->variant);
 	g_free(data);
 	return FALSE;
 }
@@ -977,10 +977,7 @@ bus_event (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * i
 	g_object_ref(event_data->mi);
 	event_data->eventid = g_strdup(g_variant_get_string(g_variant_get_child_value(params, 1), NULL));
 	event_data->timestamp = g_variant_get_uint32(g_variant_get_child_value(params, 3));
-
-	/* TODO: Need to figure out converting a variant to a value */
-	g_value_init(&(event_data->data), G_TYPE_INT);
-	g_value_set_int(&(event_data->data), 0);
+	event_data->variant = g_variant_get_child_value(params, 2);
 
 	g_timeout_add(0, event_local_handler, event_data);
 
-- 
cgit v1.2.3


From a1c3b2b9d5ad5a8444a972a04faff1e70f9b2ad7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Nov 2010 20:55:15 -0600
Subject: Dropping set and get value

---
 libdbusmenu-glib/menuitem.c | 77 ---------------------------------------------
 1 file changed, 77 deletions(-)

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 643321a..47fbdf9 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -961,59 +961,6 @@ dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * propert
 	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
 
-/**
-	dbusmenu_menuitem_property_set_value:
-	@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.
-	Deprecated: Use dbusmenu_menuitem_property_set_variant() instead
-*/
-gboolean
-dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * property, const GValue * value)
-{
-	/* TODO: Switch to use variant */
-	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
-	g_return_val_if_fail(property != NULL, FALSE);
-	g_return_val_if_fail(G_IS_VALUE(value), FALSE);
-
-	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
-	/* g_debug("Setting a property.  ID: %d  Prop: %s  Value: %s", priv->id, property, value); */
-
-	#if 0
-	gpointer lookup = g_hash_table_lookup(priv->properties, property);
-	if (g_strcmp0((gchar *)lookup, value) == 0) {
-		/* The value is the same as the value currently in the
-		   table so we don't really care.  Just say everything's okay */
-		return TRUE;
-	}
-	#endif
-
-	gchar * lprop = g_strdup(property);
-	GValue * lval = g_new0(GValue, 1);
-	g_value_init(lval, G_VALUE_TYPE(value));
-	g_value_copy(value, lval);
-
-	g_hash_table_replace(priv->properties, lprop, lval);
-	#ifdef MASSIVEDEBUGGING
-	gchar * valstr = g_strdup_value_contents(lval);
-	g_debug("Menuitem %d (%s) signalling property '%s' changed to '%s'", ID(mi), LABEL(mi), property, g_utf8_strlen(valstr, 50) < 25 ? valstr : "<too long>");
-	g_free(valstr);
-	#endif
-
-	g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, lprop, lval, TRUE);
-
-	return TRUE;
-}
-
 /**
 	dbusmenu_menuitem_property_set_variant:
 	@mi: The #DbusmenuMenuitem to set the property on.
@@ -1080,30 +1027,6 @@ dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 	return g_variant_get_string(variant, NULL);
 }
 
-/**
-	dbusmenu_menuitem_property_get_value:
-	@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 GValue for the property.
-	Deprecated: Use dbusmenu_menuitem_property_get_variant() instead
-*/
-const GValue *
-dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * property)
-{
-	/* TODO: Switch to use variant */
-	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
-	g_return_val_if_fail(property != NULL, NULL);
-
-	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
-
-	return (const GValue *)g_hash_table_lookup(priv->properties, property);
-}
-
 /**
 	dbusmenu_menuitem_property_get_variant:
 	@mi: The #DbusmenuMenuitem to look for the property on.
-- 
cgit v1.2.3


From 0dea1bb0779b8cddbf631ee80f76d13aa8920ec5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Nov 2010 21:11:40 -0600
Subject: Fixing our signals and marshallers for them as well

---
 libdbusmenu-glib/client-marshal.list   | 2 +-
 libdbusmenu-glib/client.c              | 4 ++--
 libdbusmenu-glib/menuitem-marshal.list | 2 +-
 libdbusmenu-glib/menuitem.c            | 4 ++--
 libdbusmenu-glib/server-marshal.list   | 2 +-
 libdbusmenu-glib/server.c              | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/libdbusmenu-glib/client-marshal.list b/libdbusmenu-glib/client-marshal.list
index 2e14491..866dfa8 100644
--- a/libdbusmenu-glib/client-marshal.list
+++ b/libdbusmenu-glib/client-marshal.list
@@ -1,2 +1,2 @@
 VOID: OBJECT, UINT
-VOID: OBJECT, STRING, POINTER, UINT, POINTER
+VOID: OBJECT, STRING, VARIANT, UINT, POINTER
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 6f16eb2..629a1be 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -245,8 +245,8 @@ dbusmenu_client_class_init (DbusmenuClientClass *klass)
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (DbusmenuClientClass, event_result),
 	                                        NULL, NULL,
-	                                        _dbusmenu_client_marshal_VOID__OBJECT_STRING_POINTER_UINT_POINTER,
-	                                        G_TYPE_NONE, 5, G_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_POINTER);
+	                                        _dbusmenu_client_marshal_VOID__OBJECT_STRING_VARIANT_UINT_POINTER,
+	                                        G_TYPE_NONE, 5, G_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_VARIANT, G_TYPE_UINT, G_TYPE_POINTER);
 
 	g_object_class_install_property (object_class, PROP_DBUSOBJECT,
 	                                 g_param_spec_string(DBUSMENU_CLIENT_PROP_DBUS_OBJECT, "DBus Object we represent",
diff --git a/libdbusmenu-glib/menuitem-marshal.list b/libdbusmenu-glib/menuitem-marshal.list
index 654c91b..e3cb272 100644
--- a/libdbusmenu-glib/menuitem-marshal.list
+++ b/libdbusmenu-glib/menuitem-marshal.list
@@ -1,4 +1,4 @@
-VOID: STRING, POINTER
+VOID: STRING, VARIANT
 VOID: OBJECT, UINT, UINT
 VOID: OBJECT, UINT
 VOID: OBJECT
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 47fbdf9..24196fc 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -129,8 +129,8 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                           G_SIGNAL_RUN_LAST,
 	                                           G_STRUCT_OFFSET(DbusmenuMenuitemClass, property_changed),
 	                                           NULL, NULL,
-	                                           _dbusmenu_menuitem_marshal_VOID__STRING_POINTER,
-	                                           G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER);
+	                                           _dbusmenu_menuitem_marshal_VOID__STRING_VARIANT,
+	                                           G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_VARIANT);
 	/**
 		DbusmenuMenuitem::item-activated:
 		@arg0: The #DbusmenuMenuitem object.
diff --git a/libdbusmenu-glib/server-marshal.list b/libdbusmenu-glib/server-marshal.list
index 0d68c4e..08ebf93 100644
--- a/libdbusmenu-glib/server-marshal.list
+++ b/libdbusmenu-glib/server-marshal.list
@@ -1,3 +1,3 @@
-VOID: INT, STRING, POINTER
+VOID: INT, STRING, VARIANT
 VOID: UINT, INT
 VOID: INT, UINT
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index 1005e1b..8d5c558 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -216,8 +216,8 @@ dbusmenu_server_class_init (DbusmenuServerClass *class)
 	                                         G_SIGNAL_RUN_LAST,
 	                                         G_STRUCT_OFFSET(DbusmenuServerClass, id_prop_update),
 	                                         NULL, NULL,
-	                                         _dbusmenu_server_marshal_VOID__INT_STRING_POINTER,
-	                                         G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_VALUE);
+	                                         _dbusmenu_server_marshal_VOID__INT_STRING_VARIANT,
+	                                         G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_VARIANT);
 	/**
 		DbusmenuServer::id-update:
 		@arg0: The #DbusmenuServer emitting the signal.
-- 
cgit v1.2.3


From 1c2d3ea075efd02f8a655c45c89ec132d0e76828 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Nov 2010 09:01:18 -0600
Subject: Eh, bad truth checking here.

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

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 24196fc..3b5011b 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1069,7 +1069,7 @@ dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * proper
 		return g_variant_get_boolean(variant);
 	}
 
-	if (!g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) {
+	if (g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) {
 		const gchar * string = g_variant_get_string(variant, NULL);
 
 		if (!g_strcmp0(string, "TRUE") || !g_strcmp0(string, "true") || !g_strcmp0(string, "True")) {
@@ -1103,7 +1103,7 @@ dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * propert
 		return g_variant_get_int32(variant);
 	}
 
-	if (!g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) {
+	if (g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) {
 		const gchar * string = g_variant_get_string(variant, NULL);
 		return atoi(string);
 	}
-- 
cgit v1.2.3


From f5227142593335542a62a8c7d3c122b8013cfead Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Nov 2010 09:07:38 -0600
Subject: Fixing signal emition when there are new entries added to the
 property table.

---
 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 3b5011b..d9fbf25 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -998,7 +998,7 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 	   becuse it has been unref'd when replaced in the hash
 	   table.  But the fact that there was a value is
 	   the imporant part. */
-	if (currentval != NULL && replaced) {
+	if (currentval == NULL || replaced) {
 		g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, lprop, value, TRUE);
 	}
 
-- 
cgit v1.2.3


From 233eec5d073b4101b3100598c60e497cf5075586 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Nov 2010 13:21:36 -0600
Subject: Cleaning up the building of a properties variant

---
 libdbusmenu-glib/menuitem.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index d9fbf25..66dfb66 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1216,18 +1216,7 @@ dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi)
 static void
 variant_helper (gpointer in_key, gpointer in_value, gpointer user_data)
 {
-	/* TODO: Switch to being a variant */
-	GValue vval = {0};
-	g_value_init(&vval, G_TYPE_VARIANT);
-
-	if (!g_value_transform((GValue *)in_value, &vval)) {
-		g_warning("Unable to convert property '%s' of type '%s'", (gchar *)in_key, G_VALUE_TYPE_NAME(in_value));
-		return;
-	}
-
-	g_variant_builder_add((GVariantBuilder *)user_data, "{sv}", in_key, g_value_get_variant(&vval));
-	g_value_unset(&vval);
-
+	g_variant_builder_add((GVariantBuilder *)user_data, "sv", in_key, in_value);
 	return;
 }
 
@@ -1247,12 +1236,17 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi)
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
-	GVariantBuilder * builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+	GVariant * final_variant = NULL;
+
+	if (g_hash_table_size(priv->properties) > 0) {
+		GVariantBuilder builder;
+		g_variant_builder_init(&builder, g_variant_type_new("a{sv}"));
 
-	g_hash_table_foreach(priv->properties, variant_helper, builder);
+		g_hash_table_foreach(priv->properties, variant_helper, &builder);
+
+		final_variant = g_variant_builder_end(&builder);
+	}
 
-	GVariant * final_variant = g_variant_builder_end(builder);
-	g_variant_builder_unref(builder);
 	return final_variant;
 }
 
-- 
cgit v1.2.3


From c80c863e4191fe9b5f20e65887db7c2e278b13fb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 18 Nov 2010 14:45:15 -0600
Subject: Oops, messed up the format here.

---
 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 66dfb66..2f42704 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1216,7 +1216,7 @@ dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi)
 static void
 variant_helper (gpointer in_key, gpointer in_value, gpointer user_data)
 {
-	g_variant_builder_add((GVariantBuilder *)user_data, "sv", in_key, in_value);
+	g_variant_builder_add((GVariantBuilder *)user_data, "{sv}", in_key, in_value);
 	return;
 }
 
-- 
cgit v1.2.3


From a25b09998a7b9a5a1e012b8648fdf135fdc59d33 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 23 Nov 2010 16:55:43 -0600
Subject: Uhm, there's no explaination for this one.  Duh.

---
 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 2f42704..ad6472b 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1002,7 +1002,7 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 		g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, lprop, value, TRUE);
 	}
 
-	return FALSE;
+	return TRUE;
 }
 
 /**
-- 
cgit v1.2.3


From 09cb60267e5a4773ec5965e7e1a2ff92a690d7f0 Mon Sep 17 00:00:00 2001
From: Chris Coulson <chrisccoulson@ubuntu.com>
Date: Mon, 13 Dec 2010 16:51:45 +0000
Subject: Add an about-to-show signal to the menu items and hook this up to be
 emitted when someone calls dbusmenu_menuitem_send_about_to_show

---
 libdbusmenu-glib/menuitem.c | 19 ++++++++++++++++++-
 libdbusmenu-glib/menuitem.h |  3 ++-
 2 files changed, 20 insertions(+), 2 deletions(-)

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index ad6472b..747cc01 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -70,6 +70,7 @@ enum {
 	CHILD_MOVED,
 	REALIZED,
 	SHOW_TO_USER,
+	ABOUT_TO_SHOW,
 	LAST_SIGNAL
 };
 
@@ -229,6 +230,21 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                           g_cclosure_marshal_VOID__UINT,
 	                                           G_TYPE_NONE, 1, G_TYPE_UINT, G_TYPE_NONE);
 
+	/**
+		DbusmenuMenuitem::about-to-show:
+		@arg0: The #DbusmenuMenuitem object.
+
+		Emitted when the submenu for this item
+		is about to be shown
+	*/
+	signals[ABOUT_TO_SHOW] =     g_signal_new(DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW,
+	                                          G_TYPE_FROM_CLASS(klass),
+	                                          G_SIGNAL_RUN_LAST,
+	                                          G_STRUCT_OFFSET(DbusmenuMenuitemClass, about_to_show),
+	                                          NULL, NULL,
+	                                          _dbusmenu_menuitem_marshal_VOID__VOID,
+	                                          G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
+
 	g_object_class_install_property (object_class, PROP_ID,
 	                                 g_param_spec_int(PROP_ID_S, "ID for the menu item",
 	                                              "This is a unique indentifier for the menu item.",
@@ -398,7 +414,8 @@ send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gp
 	if (dbusmenu_menuitem_get_children(mi) == NULL) {
 		g_warning("About to Show called on an item wihtout submenus.  We're ignoring it.");
 	} else {
-		g_signal_emit(G_OBJECT(mi), signals[ITEM_ACTIVATED], 0, 0 /* timestamp */, TRUE);
+		gboolean dummy;
+		g_signal_emit(G_OBJECT(mi), signals[ABOUT_TO_SHOW], 0, &dummy);
 	}
 
 	if (cb != NULL) {
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 9158f3e..0058ded 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -50,6 +50,7 @@ G_BEGIN_DECLS
 #define DBUSMENU_MENUITEM_SIGNAL_REALIZED            "realized"
 #define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID         (g_signal_lookup(DBUSMENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM))
 #define DBUSMENU_MENUITEM_SIGNAL_SHOW_TO_USER        "show-to-user"
+#define DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW       "about-to-show"
 
 #define DBUSMENU_MENUITEM_PROP_TYPE                  "type"
 #define DBUSMENU_MENUITEM_PROP_VISIBLE               "visible"
@@ -158,6 +159,7 @@ struct _DbusmenuMenuitemClass
 	void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 	void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpointer cb_data);
+	gboolean (*about_to_show) (void);
 
 	/*< Private >*/
 	void (*reserved1) (void);
@@ -165,7 +167,6 @@ struct _DbusmenuMenuitemClass
 	void (*reserved3) (void);
 	void (*reserved4) (void);
 	void (*reserved5) (void);
-	void (*reserved6) (void);
 };
 
 GType dbusmenu_menuitem_get_type (void);
-- 
cgit v1.2.3


From a02639a8849df82b563331783f5d571622d65208 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 5 Jan 2011 16:58:37 -0600
Subject: Handling the case of a NULL variant by making it clear the hashtable
 of that property.

---
 libdbusmenu-glib/menuitem.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index ad6472b..50354ee 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -984,14 +984,22 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
-	gchar * lprop = g_strdup(property);
-	g_variant_ref(value);
-
 	gboolean replaced = FALSE;
-	gpointer currentval = g_hash_table_lookup(priv->properties, lprop);
-	if (currentval == NULL || !g_variant_equal((GVariant*)currentval, value)) {
-		g_hash_table_replace(priv->properties, lprop, value);
-		replaced = TRUE;
+	gpointer currentval = g_hash_table_lookup(priv->properties, property);
+
+	if (value != NULL) {
+		gchar * lprop = g_strdup(property);
+		g_variant_ref(value);
+
+		if (currentval == NULL || !g_variant_equal((GVariant*)currentval, value)) {
+			g_hash_table_replace(priv->properties, lprop, value);
+			replaced = TRUE;
+		}
+	} else {
+		if (currentval != NULL) {
+			g_hash_table_remove(priv->properties, property);
+			replaced = TRUE;
+		}
 	}
 
 	/* NOTE: The actual value is invalid at this point
@@ -999,7 +1007,7 @@ 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, lprop, value, TRUE);
+		g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, property, value, TRUE);
 	}
 
 	return TRUE;
-- 
cgit v1.2.3


From 47263d9b6c912d013a77ce2efda27df9c7571920 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 5 Jan 2011 20:51:51 -0600
Subject: Testing for the string being NULL before g_variant aborts on it.

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

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 50354ee..31c23f4 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -913,7 +913,10 @@ dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id)
 gboolean
 dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value)
 {
-	GVariant * variant = g_variant_new("s", value);
+	GVariant * variant = NULL;
+	if (value != NULL) {
+		g_variant_new_string(value);
+	}
 	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
 
-- 
cgit v1.2.3


From 1b77b621285fe681ca030bf3f548ad04b50dd242 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 5 Jan 2011 20:53:27 -0600
Subject: Oops, need to actually assign that return.

---
 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 31c23f4..1e892c3 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -915,7 +915,7 @@ dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, c
 {
 	GVariant * variant = NULL;
 	if (value != NULL) {
-		g_variant_new_string(value);
+		variant = g_variant_new_string(value);
 	}
 	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
-- 
cgit v1.2.3


From 48e68b4411e70f0526fca90d3d714f10aea566bb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 21 Jan 2011 13:27:26 -0600
Subject: Making the hashtable have a full copy and free itself appropriately.

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

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 827d6c5..b40195c 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1204,11 +1204,17 @@ dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi)
 	return g_hash_table_get_keys(priv->properties);
 }
 
+/* Copy the keys and make references to the variants that are
+   in the new table.  They'll be free'd and unref'd when the
+   Hashtable gets destroyed. */
 static void
 copy_helper (gpointer in_key, gpointer in_value, gpointer in_data)
 {
 	GHashTable * table = (GHashTable *)in_data;
-	g_hash_table_insert(table, in_key, in_value);
+	gchar * key = (gchar *)in_key;
+	GVariant * value = (GVariant *)in_value;
+	g_variant_ref(value);
+	g_hash_table_insert(table, g_strdup(key), value);
 	return;
 }
 
@@ -1229,7 +1235,7 @@ copy_helper (gpointer in_key, gpointer in_value, gpointer in_data)
 GHashTable *
 dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi)
 {
-	GHashTable * ret = g_hash_table_new(g_str_hash, g_str_equal);
+	GHashTable * ret = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, _g_variant_unref);
 
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), ret);
 
-- 
cgit v1.2.3


From 3548a02da37917e95564dfda60e97870274a53fa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 4 Feb 2011 11:00:07 -0600
Subject: take_children() shouldn't unref the items as they might get deleted
 before the caller would be abel to use them.  Making sure to put those
 annotations in the docs.

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

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

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index b40195c..159463b 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -547,7 +547,6 @@ take_children_signal (gpointer data, gpointer user_data)
 	g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(user_data), LABEL(user_data), ID(data), LABEL(data));
 	#endif
 	g_signal_emit(G_OBJECT(user_data), signals[CHILD_REMOVED], 0, DBUSMENU_MENUITEM(data), TRUE);
-	g_object_unref(G_OBJECT(data));
 	return;
 }
 
@@ -561,7 +560,8 @@ take_children_signal (gpointer data, gpointer user_data)
 	on the children it has taken.  A lot of responsibility involved
 	in taking children.
 
-	Return value: A #GList of pointers to #DbusmenuMenuitem objects.
+	Return value: (transfer full) (array) (element-type Dbusmenu.Menuitem)
+	A #GList of pointers to #DbusmenuMenuitem objects.
 */
 GList *
 dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi)
-- 
cgit v1.2.3