From 8545febdaac50ee3c741f20141c20c27911a5b96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 14 Jan 2011 09:56:07 -0600 Subject: Unboxing variants if they're in events. --- libdbusmenu-glib/server.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 373cc05..100eb14 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -1047,6 +1047,12 @@ bus_event (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * i event_data->timestamp = g_variant_get_uint32(g_variant_get_child_value(params, 3)); event_data->variant = g_variant_get_child_value(params, 2); + if (g_variant_is_of_type(event_data->variant, G_VARIANT_TYPE_VARIANT)) { + event_data->variant = g_variant_get_variant(event_data->variant); + } + + g_variant_ref(event_data->variant); + g_timeout_add(0, event_local_handler, event_data); g_dbus_method_invocation_return_value(invocation, NULL); -- cgit v1.2.3 From ece305e4b1b4eee4e3fb54faf8f9c291ef915e8c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 14 Jan 2011 09:56:49 -0600 Subject: 0.3.92 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f1920b9..5c85da8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.3.91, ted@canonical.com) +AC_INIT(libdbusmenu, 0.3.92, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.3.91, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.3.92, [-Wno-portability]) AM_MAINTAINER_MODE -- cgit v1.2.3 From 153e20991e41ffe222193efc4ac3b3d2224b390e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 14 Jan 2011 10:43:48 -0600 Subject: releasing version 0.3.92-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c67f83..0ff5351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libdbusmenu (0.3.92-0ubuntu1~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.3.92-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Fixing handle event to send unboxed values * Build fixes - -- Ted Gould Fri, 14 Jan 2011 10:37:22 -0600 + -- Ted Gould Fri, 14 Jan 2011 10:43:44 -0600 libdbusmenu (0.3.91-0ubuntu1) natty; urgency=low -- cgit v1.2.3