From 5eca4acf78ee4b606930253cdd433735d621224a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 12 Oct 2010 16:05:42 -0500
Subject: Taking back the reserved

---
 libdbusmenu-glib/client.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'libdbusmenu-glib/client.h')

diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 5d4b5c3..a1cf58b 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -65,6 +65,10 @@ G_BEGIN_DECLS
 	@event_result: Slot for #DbusmenuClient::event-error.
 	@reserved1: Reserved for future use.
 	@reserved2: Reserved for future use.
+	@reserved3: Reserved for future use.
+	@reserved4: Reserved for future use.
+	@reserved5: Reserved for future use.
+	@reserved6: Reserved for future use.
 
 	A simple class that takes all of the information from a
 	#DbusmenuServer over DBus and makes the same set of 
@@ -80,11 +84,13 @@ struct _DbusmenuClientClass {
 	void (*item_activate) (DbusmenuMenuitem * item, guint timestamp);
 	void (*event_result) (DbusmenuMenuitem * item, gchar * event, GValue * data, guint timestamp, GError * error);
 
-	/* Reserved for future use */
+	/*< Private >*/
 	void (*reserved1) (void);
 	void (*reserved2) (void);
-	/* void (*reserved3) (void); */
-	/* void (*reserved4) (void); */
+	void (*reserved3) (void);
+	void (*reserved4) (void);
+	void (*reserved5) (void);
+	void (*reserved6) (void);
 };
 
 /**
-- 
cgit v1.2.3


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/client.c         | 1 -
 libdbusmenu-glib/client.h         | 5 +++++
 libdbusmenu-glib/menuitem-proxy.c | 1 -
 libdbusmenu-glib/menuitem-proxy.h | 8 ++++++--
 libdbusmenu-glib/menuitem.c       | 1 -
 libdbusmenu-glib/menuitem.h       | 5 +++++
 libdbusmenu-glib/server.c         | 2 --
 libdbusmenu-glib/server.h         | 5 +++++
 8 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'libdbusmenu-glib/client.h')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index ca16c9a..30a415b 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -62,7 +62,6 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-typedef struct _DbusmenuClientPrivate DbusmenuClientPrivate;
 struct _DbusmenuClientPrivate
 {
 	DbusmenuMenuitem * root;
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index a1cf58b..32813d9 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -56,6 +56,8 @@ G_BEGIN_DECLS
 #define DBUSMENU_CLIENT_TYPES_SEPARATOR    "separator"
 #define DBUSMENU_CLIENT_TYPES_IMAGE        "standard"
 
+typedef struct _DbusmenuClientPrivate DbusmenuClientPrivate;
+
 /**
 	DbusmenuClientClass:
 	@parent_class: #GObjectClass
@@ -103,6 +105,9 @@ struct _DbusmenuClientClass {
 typedef struct _DbusmenuClient      DbusmenuClient;
 struct _DbusmenuClient {
 	GObject parent;
+
+	/*< Private >*/
+	DbusmenuClientPrivate * priv;
 };
 
 typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
diff --git a/libdbusmenu-glib/menuitem-proxy.c b/libdbusmenu-glib/menuitem-proxy.c
index 2dd5ada..f4eaae3 100644
--- a/libdbusmenu-glib/menuitem-proxy.c
+++ b/libdbusmenu-glib/menuitem-proxy.c
@@ -32,7 +32,6 @@ License version 3 and version 2.1 along with this program.  If not, see
 
 #include "menuitem-proxy.h"
 
-typedef struct _DbusmenuMenuitemProxyPrivate DbusmenuMenuitemProxyPrivate;
 struct _DbusmenuMenuitemProxyPrivate {
 	DbusmenuMenuitem * mi;
 	gulong sig_property_changed;
diff --git a/libdbusmenu-glib/menuitem-proxy.h b/libdbusmenu-glib/menuitem-proxy.h
index 69f5c7d..cde92a9 100644
--- a/libdbusmenu-glib/menuitem-proxy.h
+++ b/libdbusmenu-glib/menuitem-proxy.h
@@ -42,8 +42,9 @@ G_BEGIN_DECLS
 #define DBUSMENU_IS_MENUITEM_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_MENUITEM_PROXY))
 #define DBUSMENU_MENUITEM_PROXY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_MENUITEM_PROXY, DbusmenuMenuitemProxyClass))
 
-typedef struct _DbusmenuMenuitemProxy      DbusmenuMenuitemProxy;
-typedef struct _DbusmenuMenuitemProxyClass DbusmenuMenuitemProxyClass;
+typedef struct _DbusmenuMenuitemProxy        DbusmenuMenuitemProxy;
+typedef struct _DbusmenuMenuitemProxyClass   DbusmenuMenuitemProxyClass;
+typedef struct _DbusmenuMenuitemProxyPrivate DbusmenuMenuitemProxyPrivate;
 
 /**
 	DbusmenuMenuitemProxyClass:
@@ -73,6 +74,9 @@ struct _DbusmenuMenuitemProxyClass {
 */
 struct _DbusmenuMenuitemProxy {
 	DbusmenuMenuitem parent;
+
+	/*< Private >*/
+	DbusmenuMenuitemPrivate * priv;
 };
 
 GType dbusmenu_menuitem_proxy_get_type (void);
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;
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 399ed9c..ff8d713 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -78,6 +78,8 @@ G_BEGIN_DECLS
 
 #define DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU      "submenu"
 
+typedef struct _DbusmenuMenuitemPrivate DbusmenuMenuitemPrivate;
+
 /**
  * DbusmenuMenuitem:
  * 
@@ -92,6 +94,9 @@ typedef struct _DbusmenuMenuitem      DbusmenuMenuitem;
 struct _DbusmenuMenuitem
 {
 	GObject parent;
+
+	/*< Private >*/
+	DbusmenuMenuitemPrivate * priv;
 };
 
 /**
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index 68afb92..5c9826e 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -53,8 +53,6 @@ static void layout_update_signal (DbusmenuServer * server);
 #define DBUSMENU_VERSION_NUMBER  2
 
 /* Privates, I'll show you mine... */
-typedef struct _DbusmenuServerPrivate DbusmenuServerPrivate;
-
 struct _DbusmenuServerPrivate
 {
 	DbusmenuMenuitem * root;
diff --git a/libdbusmenu-glib/server.h b/libdbusmenu-glib/server.h
index 7d56457..5668258 100644
--- a/libdbusmenu-glib/server.h
+++ b/libdbusmenu-glib/server.h
@@ -53,6 +53,8 @@ G_BEGIN_DECLS
 #define DBUSMENU_SERVER_PROP_ROOT_NODE         "root-node"
 #define DBUSMENU_SERVER_PROP_VERSION           "version"
 
+typedef struct _DbusmenuServerPrivate DbusmenuServerPrivate;
+
 /**
 	DbusmenuServerClass:
 	@parent_class: #GObjectClass
@@ -99,6 +101,9 @@ struct _DbusmenuServerClass {
 typedef struct _DbusmenuServer      DbusmenuServer;
 struct _DbusmenuServer {
 	GObject parent;
+
+	/*< Private >*/
+	DbusmenuServerPrivate * priv;
 };
 
 GType               dbusmenu_server_get_type   (void);
-- 
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/client.h')

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 050ca49a1179f4c04d6c175e8005e8516fd80654 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 17 Nov 2010 21:07:51 -0600
Subject: Variants in sending over the server connection

---
 libdbusmenu-glib/client.h |  2 +-
 libdbusmenu-glib/server.c | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'libdbusmenu-glib/client.h')

diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 3a3a988..1ae89fa 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -84,7 +84,7 @@ struct _DbusmenuClientClass {
 	void (*root_changed) (DbusmenuMenuitem * newroot);
 	void (*new_menuitem) (DbusmenuMenuitem * newitem);
 	void (*item_activate) (DbusmenuMenuitem * item, guint timestamp);
-	void (*event_result) (DbusmenuMenuitem * item, gchar * event, GValue * data, guint timestamp, GError * error);
+	void (*event_result) (DbusmenuMenuitem * item, gchar * event, GVariant * data, guint timestamp, GError * error);
 
 	/*< Private >*/
 	void (*reserved1) (void);
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index bd5c2ac..1005e1b 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -141,7 +141,7 @@ static GVariant * bus_get_prop                (GDBusConnection * connection,
                                                gpointer user_data);
 static void       menuitem_property_changed   (DbusmenuMenuitem * mi,
                                                gchar * property,
-                                               GValue * value,
+                                               GVariant * variant,
                                                DbusmenuServer * server);
 static void       menuitem_child_added        (DbusmenuMenuitem * parent,
                                                DbusmenuMenuitem * child,
@@ -619,21 +619,13 @@ layout_update_signal (DbusmenuServer * server)
 }
 
 static void 
-menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, GValue * value, DbusmenuServer * server)
+menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, GVariant * variant, DbusmenuServer * server)
 {
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
 
-	g_signal_emit(G_OBJECT(server), signals[ID_PROP_UPDATE], 0, dbusmenu_menuitem_get_id(mi), property, value, TRUE);
+	g_signal_emit(G_OBJECT(server), signals[ID_PROP_UPDATE], 0, dbusmenu_menuitem_get_id(mi), property, variant, TRUE);
 
 	if (priv->dbusobject != NULL && priv->bus != NULL) {
-		GValue variantval = {0};
-		g_value_init(&variantval, G_TYPE_VARIANT);
-
-		if (!g_value_transform(value, &variantval)) {
-			g_warning("Unable to convert property '%s' of type %s to a variant", property, G_VALUE_TYPE_NAME(value));
-		}
-		GVariant * variant = g_value_get_variant(&variantval);
-
 		g_dbus_connection_emit_signal(priv->bus,
 		                              NULL,
 		                              priv->dbusobject,
@@ -641,8 +633,6 @@ menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, GValue * val
 		                              "ItemPropertyUpdated",
 		                              g_variant_new("(isv)", dbusmenu_menuitem_get_id(mi), property, variant),
 		                              NULL);
-
-		g_value_unset(&variantval);
 	}
 	return;
 }
-- 
cgit v1.2.3


From 17632d1272a0741e5f5a11abcc4e8f758bc9e98c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 18 Jan 2011 16:56:14 -0600
Subject: Adding in a 'full' function to deal with user data and destruction.

---
 libdbusmenu-glib/client.c | 9 ++++++++-
 libdbusmenu-glib/client.h | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib/client.h')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 58d6360..a57b7ba 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -1163,7 +1163,7 @@ menuitem_get_properties_new_cb (GVariant * properties, GError * error, gpointer
 	}
 
 	if (newfunc != NULL) {
-		handled = newfunc(propdata->item, propdata->parent, propdata->client);
+		handled = newfunc(propdata->item, propdata->parent, propdata->client, NULL);
 	}
 
 	#ifdef MASSIVEDEBUGGING
@@ -1698,6 +1698,12 @@ dbusmenu_client_get_root (DbusmenuClient * client)
 */
 gboolean
 dbusmenu_client_add_type_handler (DbusmenuClient * client, const gchar * type, DbusmenuClientTypeHandler newfunc)
+{
+	return dbusmenu_client_add_type_handler_full(client, type, newfunc, NULL, NULL);
+}
+
+gboolean
+dbusmenu_client_add_type_handler_full (DbusmenuClient * client, const gchar * type, DbusmenuClientTypeHandler newfunc, gpointer user_data, DbusmenuClientTypeDestroyHandler destory_func)
 {
 	g_return_val_if_fail(DBUSMENU_IS_CLIENT(client), FALSE);
 	g_return_val_if_fail(type != NULL, FALSE);
@@ -1722,3 +1728,4 @@ dbusmenu_client_add_type_handler (DbusmenuClient * client, const gchar * type, D
 	g_hash_table_insert(priv->type_handlers, g_strdup(type), newfunc);
 	return TRUE;
 }
+
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 1ae89fa..323e142 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -110,7 +110,8 @@ struct _DbusmenuClient {
 	DbusmenuClientPrivate * priv;
 };
 
-typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
+typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
+typedef gboolean (*DbusmenuClientTypeDestroyHandler) (DbusmenuClient * client, const gchar * type, gpointer user_data);
 
 GType                dbusmenu_client_get_type          (void);
 DbusmenuClient *     dbusmenu_client_new               (const gchar * name,
@@ -119,6 +120,11 @@ DbusmenuMenuitem *   dbusmenu_client_get_root          (DbusmenuClient * client)
 gboolean             dbusmenu_client_add_type_handler  (DbusmenuClient * client,
                                                         const gchar * type,
                                                         DbusmenuClientTypeHandler newfunc);
+gboolean             dbusmenu_client_add_type_handler_full (DbusmenuClient * client,
+                                                        const gchar * type,
+                                                        DbusmenuClientTypeHandler newfunc,
+                                                        gpointer user_data,
+                                                        DbusmenuClientTypeDestroyHandler destory_func);
 void                 dbusmenu_client_send_event        (DbusmenuClient * client,
                                                         gint id,
                                                         const gchar * name,
-- 
cgit v1.2.3


From 61fd5050b6319de6b948cdb0cd36e1b985d7b2a8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 18 Jan 2011 17:02:00 -0600
Subject: Setup to the use the full type handler

---
 libdbusmenu-glib/client.h              |  2 +-
 libdbusmenu-gtk/serializablemenuitem.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'libdbusmenu-glib/client.h')

diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 323e142..f371792 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -111,7 +111,7 @@ struct _DbusmenuClient {
 };
 
 typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
-typedef gboolean (*DbusmenuClientTypeDestroyHandler) (DbusmenuClient * client, const gchar * type, gpointer user_data);
+typedef void (*DbusmenuClientTypeDestroyHandler) (DbusmenuClient * client, const gchar * type, gpointer user_data);
 
 GType                dbusmenu_client_get_type          (void);
 DbusmenuClient *     dbusmenu_client_new               (const gchar * name,
diff --git a/libdbusmenu-gtk/serializablemenuitem.c b/libdbusmenu-gtk/serializablemenuitem.c
index 4d23635..42d79b2 100644
--- a/libdbusmenu-gtk/serializablemenuitem.c
+++ b/libdbusmenu-gtk/serializablemenuitem.c
@@ -75,12 +75,20 @@ dbusmenu_gtk_serializable_menu_item_get_dbusmenu_menuitem (DbusmenuGtkSerializab
 
 /* Handle the type with this item. */
 static gboolean
-type_handler (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+type_handler (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
 {
 
 	return TRUE;
 }
 
+/* Destruction is inevitable */
+static void
+type_destroy_handler (DbusmenuClient * client, const gchar * type, gpointer user_data)
+{
+
+	return;
+}
+
 void
 dbusmenu_gtk_serializable_menu_item_register_to_client (DbusmenuClient * client, GType item_type)
 {
@@ -98,7 +106,7 @@ dbusmenu_gtk_serializable_menu_item_register_to_client (DbusmenuClient * client,
 	}
 
 	/* Register type */
-	dbusmenu_client_add_type_handler(client, class->get_type_string(), type_handler); /* need type */
+	dbusmenu_client_add_type_handler_full(client, class->get_type_string(), type_handler, NULL, type_destroy_handler); /* need type */
 
 	/* Register defaults */
 	/* TODO: Need API on another branch */
-- 
cgit v1.2.3


From f0722fc3e8842ec8047d104119117f036da1b99f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 27 Jan 2011 09:35:14 -0600
Subject: Adding documentation for the handler functions.

---
 libdbusmenu-glib/client.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'libdbusmenu-glib/client.h')

diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index f371792..6d78edf 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -110,7 +110,28 @@ struct _DbusmenuClient {
 	DbusmenuClientPrivate * priv;
 };
 
+/**
+	DbusmenuClientTypeHandler:
+	@newitem: The #DbusmenuMenuitem that was created
+	@parent: The parent of @newitem or #NULL if none
+	@client: A pointer to the #DbusmenuClient
+	@user_data: The data you gave us
+
+	The type handler is called when a dbusmenu item is created
+	with a matching type as setup in #dbusmenu_client_add_type_handler
+*/
 typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
+
+/**
+	DbusmenuClientTypeDestroyHandler:
+	@client: A pointer to the #DbusmenuClient
+	@type: The type that this handler was registered with
+	@user_data: The data you gave us
+
+	This handler is called when the type becomes unregistered by the
+	client.  This is usally caused by the #DbusmenuClient being destroyed
+	and should free memory or unref objects in @user_data.
+*/
 typedef void (*DbusmenuClientTypeDestroyHandler) (DbusmenuClient * client, const gchar * type, gpointer user_data);
 
 GType                dbusmenu_client_get_type          (void);
-- 
cgit v1.2.3