Merge lp:~dbusmenu-team/libdbusmenu/ubuntu into lp:~ubuntu-desktop/libdbusmenu/ubuntu

[Ted Gould]

0.3.14

[lp:~dbusmenu-team/libdbusmenu/ubuntu]

97. By Ken VanDine on 2010-09-15

releasing version 0.3.14-0ubuntu1

=== modified file 'configure'
--- configure	2010-09-09 14:42:16 +0000
+++ configure	2010-09-15 16:46:41 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.13.
+# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.14.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -703,8 +703,8 @@
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.3.13'
-PACKAGE_STRING='libdbusmenu 0.3.13'
+PACKAGE_VERSION='0.3.14'
+PACKAGE_STRING='libdbusmenu 0.3.14'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1533,7 +1533,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libdbusmenu 0.3.13 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.3.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1603,7 +1603,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.3.13:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.3.14:";;
    esac
   cat <<\_ACEOF
 
@@ -1741,7 +1741,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.3.13
+libdbusmenu configure 0.3.14
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2112,7 +2112,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libdbusmenu $as_me 0.3.13, which was
+It was created by libdbusmenu $as_me 0.3.14, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2933,7 +2933,7 @@
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.3.13
+ VERSION=0.3.14
 
 
 # Some tools Automake needs.
@@ -13065,7 +13065,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=1
-LIBDBUSMENU_REVISION=15
+LIBDBUSMENU_REVISION=16
 LIBDBUSMENU_AGE=0
 
 
@@ -14379,7 +14379,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libdbusmenu $as_me 0.3.13, which was
+This file was extended by libdbusmenu $as_me 0.3.14, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14445,7 +14445,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libdbusmenu config.status 0.3.13
+libdbusmenu config.status 0.3.14
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2010-09-09 14:42:16 +0000
+++ configure.ac	2010-09-15 16:46:41 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.3.13, [e-mail])
+AC_INIT(libdbusmenu, 0.3.14, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.3.13, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.3.14, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -99,7 +99,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=1
-LIBDBUSMENU_REVISION=15
+LIBDBUSMENU_REVISION=16
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-09-09 16:34:05 +0000
+++ debian/changelog	2010-09-15 16:46:41 +0000
@@ -1,3 +1,12 @@
+libdbusmenu (0.3.14-0ubuntu1~ppa1) maverick; urgency=low
+
+  * New upstream release.
+    * Fixing a memory leak by unref'ing a hashtable
+    * Making a callback for the event dbus function happen off
+      of the mainloop so it returns a response. (LP: #636756)
+
+ -- Ted Gould <[e-mail]>  Wed, 15 Sep 2010 11:36:09 -0500
+
 libdbusmenu (0.3.13-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2010-09-09 16:34:05 +0000
+++ debian/control	2010-09-15 16:46:41 +0000
@@ -20,7 +20,10 @@
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
                libx11-dev (>= 1.3), 
-               valac
+               valac,
+#  Check dependencies
+               xvfb,
+               dbus-test-runner
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/dbusmenu
 Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
 
=== modified file 'debian/rules'
--- debian/rules	2010-09-09 16:34:05 +0000
+++ debian/rules	2010-09-15 16:46:41 +0000
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
+DEB_MAKE_CHECK_TARGET := check
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml	2010-09-09 14:42:16 +0000
+++ docs/libdbusmenu-glib/reference/version.xml	2010-09-15 16:46:41 +0000
@@ -1,1 +1,1 @@
-0.3.13
+0.3.14
 
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml	2010-09-09 14:42:16 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml	2010-09-15 16:46:41 +0000
@@ -1,1 +1,1 @@
-0.3.13
+0.3.14
 
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2010-08-25 18:19:05 +0000
+++ libdbusmenu-glib/server.c	2010-09-15 16:46:41 +0000
@@ -633,6 +633,10 @@
 	_gvalue_array_append_hashtable(item, dict);
 
 	g_ptr_array_add(output, item);
+
+	g_hash_table_unref(dict);
+
+	return;
 }
 
 static gboolean
@@ -659,6 +663,33 @@
 	return TRUE;
 }
 
+/* Structure for holding the event data for the idle function
+   to pick it up. */
+typedef struct _idle_event_t idle_event_t;
+struct _idle_event_t {
+	DbusmenuMenuitem * mi;
+	gchar * eventid;
+	GValue data;
+	guint timestamp;
+};
+
+/* A handler for else where in the main loop so that the dbusmenu
+   event response doesn't get blocked */
+static gboolean
+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);
+
+	g_object_unref(data->mi);
+	g_free(data->eventid);
+	g_value_unset(&data->data);
+	g_free(data);
+	return FALSE;
+}
+
+/* Handles the even coming off of DBus */
 static gboolean
 _dbusmenu_server_event (DbusmenuServer * server, gint id, gchar * eventid, GValue * data, guint timestamp, GError ** error)
 {
@@ -676,7 +707,15 @@
 		return FALSE;
 	}
 
-	dbusmenu_menuitem_handle_event(mi, eventid, data, timestamp);
+	idle_event_t * event_data = g_new0(idle_event_t, 1);
+	event_data->mi = mi;
+	g_object_ref(event_data->mi);
+	event_data->eventid = g_strdup(eventid);
+	event_data->timestamp = timestamp;
+	g_value_init(&(event_data->data), G_VALUE_TYPE(data));
+	g_value_copy(data, &(event_data->data));
+
+	g_timeout_add(0, event_local_handler, event_data);
 	return TRUE;
 }