releasing version 0.5.98-0ubuntu1~ppa1

9 files changed, 52 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 63fd031..f5ffa66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 # Generated by Makefile. Do not edit.
 
+2012-04-05  Charles Kerr  <charles.kerr@canonical.com>
+
+	0.5.98
+
+2012-04-05  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~ted/dbusmenu/about-to-show-null-cb-protect to fix the about-to-show callback to better handle having a NULL callback, and thus NULL data. Putting some protections in as well so we'll get better errors from it if we make this mistake again.
+
+2012-04-04  Ted Gould  <ted@gould.cx>
+
+	Make sure that if the callback is NULL we're not trying to get a callback
+
+2012-04-04  Ted Gould  <ted@gould.cx>
+
+	Protect from the cases where we might get NULL in the data segment
+
 2012-04-04  Charles Kerr  <charles.kerr@canonical.com>
 
 	0.5.97
diff --git a/configure b/configure
index fc16a7d..5e5f940 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.97.
+# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.98.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -572,8 +572,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.5.97'
-PACKAGE_STRING='libdbusmenu 0.5.97'
+PACKAGE_VERSION='0.5.98'
+PACKAGE_STRING='libdbusmenu 0.5.98'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1454,7 +1454,7 @@ if test "$ac_init_help" = "long"; then
   # 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.5.97 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.5.98 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1524,7 +1524,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.5.97:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.5.98:";;
    esac
   cat <<\_ACEOF
 
@@ -1679,7 +1679,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.5.97
+libdbusmenu configure 0.5.98
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2050,7 +2050,7 @@ cat >config.log <<_ACEOF
 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.5.97, which was
+It was created by libdbusmenu $as_me 0.5.98, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2871,7 +2871,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.5.97
+ VERSION=0.5.98
 
 
 # Some tools Automake needs.
@@ -16183,7 +16183,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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.5.97, which was
+This file was extended by libdbusmenu $as_me 0.5.98, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16249,7 +16249,7 @@ _ACEOF
 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.5.97
+libdbusmenu config.status 0.5.98
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2d51716..a1f269b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.5.97, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.5.98, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.5.97, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.98, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
diff --git a/debian/changelog b/debian/changelog
index 5c3b23a..391ae79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.5.98-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream release.
+    * Fix a regresssion introduced in 0.5.97's fix for (LP: #957022)
+
+ -- Charles Kerr <charles.kerr@canonical.com>  Thu, 05 Apr 2012 10:53:15 -0500
+
 libdbusmenu (0.5.97-0ubuntu1~ppa1) precise; urgency=low
 
   * New upstream release.
diff --git a/docs/libdbusmenu-glib/reference/html/ch01.html b/docs/libdbusmenu-glib/reference/html/ch01.html
index a8d7902..6a4d4aa 100644
--- a/docs/libdbusmenu-glib/reference/html/ch01.html
+++ b/docs/libdbusmenu-glib/reference/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp1404824"></a>API</h2></div></div></div>
+<a name="idp2621352"></a>API</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"> — The server signals changed and
diff --git a/docs/libdbusmenu-glib/reference/version.xml b/docs/libdbusmenu-glib/reference/version.xml
index c62d732..c1db89f 100644
--- a/docs/libdbusmenu-glib/reference/version.xml
+++ b/docs/libdbusmenu-glib/reference/version.xml
@@ -1 +1 @@
-0.5.97
+0.5.98
diff --git a/docs/libdbusmenu-gtk/reference/html/ch01.html b/docs/libdbusmenu-gtk/reference/html/ch01.html
index 054a059..e3f9bcc 100644
--- a/docs/libdbusmenu-gtk/reference/html/ch01.html
+++ b/docs/libdbusmenu-gtk/reference/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp2596536"></a>API</h2></div></div></div>
+<a name="idp16968456"></a>API</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"> — A GTK Menu Object that syncronizes over DBus</span>
diff --git a/docs/libdbusmenu-gtk/reference/version.xml b/docs/libdbusmenu-gtk/reference/version.xml
index c62d732..c1db89f 100644
--- a/docs/libdbusmenu-gtk/reference/version.xml
+++ b/docs/libdbusmenu-gtk/reference/version.xml
@@ -1 +1 @@
-0.5.97
+0.5.98
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 34f8b8d..ed89d86 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -1834,6 +1834,8 @@ struct _about_to_show_t {
 static void
 about_to_show_finish (about_to_show_t * data, gboolean need_update)
 {
+	g_return_if_fail(data != NULL);
+
 	/* If we need to update, do that first. */
 	if (need_update) {
 		update_layout(data->client);
@@ -1938,6 +1940,8 @@ about_to_show_idle (gpointer user_data)
 	GQueue * showers = priv->about_to_show_to_go;
 	priv->about_to_show_to_go = NULL;
 
+	g_return_val_if_fail(showers != NULL, FALSE);
+
 	/* Figure out if we've got any callbacks */
 	gboolean got_callbacks = FALSE;
 	g_queue_foreach(showers, about_to_show_idle_callbacks, &got_callbacks);
@@ -1995,7 +1999,10 @@ about_to_show_cb (GObject * proxy, GAsyncResult * res, gpointer userdata)
 		g_variant_unref(params);
 	}
 
-	about_to_show_finish(data, need_update);
+	if (data != NULL) {
+		about_to_show_finish(data, need_update);
+	}
+
 	return;
 }
 
@@ -2028,11 +2035,15 @@ dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(
 			priv->about_to_show_idle = g_idle_add(about_to_show_idle, client);
 		}
 	} else {
+		GAsyncReadyCallback dbuscb = NULL;
+
 		/* If there's no callback we don't need this data, let's
 		   clean it up in a consistent way */
 		if (cb == NULL) {
 			about_to_show_finish(data, FALSE);
 			data = NULL;
+		} else {
+			dbuscb = about_to_show_cb;
 		}
 
 		g_dbus_proxy_call(priv->menuproxy,
@@ -2041,7 +2052,7 @@ dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(
 		                  G_DBUS_CALL_FLAGS_NONE,
 		                  -1,   /* timeout */
 		                  NULL, /* cancellable */
-		                  about_to_show_cb,
+		                  dbuscb,
 		                  data);
 	}