New upstream release.

∘ Handle cases where labels are added later as subwidgets
in the menuitem (LP: #758759)
∘ Fix the destruction of the attached GTK menuitem (LP: #746091)
∘ Guard against an activation that does not actually have an
associated menu-hide (LP: #750588)

8 files changed, 84 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 222ade1..0412b00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,61 @@
 # Generated by Makefile. Do not edit.
 
+2011-04-14  Ted Gould  <ted@gould.cx>
+
+	0.4.3
+
+2011-04-12  Ted Gould  <ted@gould.cx>
+
+	Handle cases of labels being added later
+
+2011-04-12  Michael Terry  <mike@mterry.name>
+
+	watch empty/separator menu items for any added GtkLabel children, as gnome-commander likes to do
+
+2011-04-12  Ted Gould  <ted@gould.cx>
+
+	Changing the cleanup of GTK Menuitems to avoid undefined references.
+
+2011-04-10  Ted Gould  <ted@gould.cx>
+
+	Ensuring all the menus are hidden before unref'ing root
+
+2011-04-10  Ted Gould  <ted@gould.cx>
+
+	Passing the menuitem instead of finding it.
+
+2011-04-10  Ted Gould  <ted@gould.cx>
+
+	Protecting the label with the null check and don't unref something that shouldn't be.
+
+2011-04-10  Ted Gould  <ted@gould.cx>
+
+	Attaching the data in a way that it'll cleanup itself
+
+2011-04-07  Ted Gould  <ted@gould.cx>
+
+	Attaching bug
+
+2011-04-07  Ted Gould  <ted@gould.cx>
+
+	We have to destroy, why?  Because we want to make sure that the menu having a ref doesn't block us from getting rid of the item.
+
+2011-04-07  Ted Gould  <ted@gould.cx>
+
+	Switching the reference to the GTK Menuitem to be a _sink as well as using set_data_full() instead of a weak ref for unref'ing it.
+
+2011-04-12  Ted Gould  <ted@gould.cx>
+
+	Ensure that we gaurantee the open/clicked/closed event ordering.
+
+2011-04-08  Michael Terry  <mike@mterry.name>
+
+	guard against an activation that does not actually have an associated menu-hide
+
+2011-04-07  Michael Terry  <mike@mterry.name>
+
+	force activated event to be sandwiched by opened/closed events
+
 2011-04-07  Ted Gould  <ted@gould.cx>
 
 	0.4.2
diff --git a/configure b/configure
index a07335a..5809cc9 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.67 for libdbusmenu 0.4.2.
+# Generated by GNU Autoconf 2.67 for libdbusmenu 0.4.3.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -703,8 +703,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.4.2'
-PACKAGE_STRING='libdbusmenu 0.4.2'
+PACKAGE_VERSION='0.4.3'
+PACKAGE_STRING='libdbusmenu 0.4.3'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1541,7 +1541,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.4.2 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.4.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1611,7 +1611,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.4.2:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.4.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1751,7 +1751,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.4.2
+libdbusmenu configure 0.4.3
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2122,7 +2122,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.4.2, which was
+It was created by libdbusmenu $as_me 0.4.3, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2943,7 +2943,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.4.2
+ VERSION=0.4.3
 
 
 # Some tools Automake needs.
@@ -13294,7 +13294,7 @@ fi
 ###########################
 
 LIBDBUSMENU_CURRENT=3
-LIBDBUSMENU_REVISION=13
+LIBDBUSMENU_REVISION=14
 LIBDBUSMENU_AGE=0
 
 
@@ -14616,7 +14616,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.4.2, which was
+This file was extended by libdbusmenu $as_me 0.4.3, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14682,7 +14682,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.4.2
+libdbusmenu config.status 0.4.3
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 0618dd1..c0b70bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.4.2, ted@canonical.com)
+AC_INIT(libdbusmenu, 0.4.3, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.4.2, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.4.3, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -134,7 +134,7 @@ AC_PATH_PROG([XSLT_PROC], [xsltproc])
 ###########################
 
 LIBDBUSMENU_CURRENT=3
-LIBDBUSMENU_REVISION=13
+LIBDBUSMENU_REVISION=14
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
diff --git a/debian/changelog b/debian/changelog
index 2d3b18b..35aedc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low
+libdbusmenu (0.4.3-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
+  [ Ken VanDine ]
   * debian/rules
     - Fixed package names in build targets (LP: #760102)
     - Dropped makeshlibs in favor of symbols files
@@ -7,16 +8,15 @@ libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low
   * +debian/libdbusmenu-gtk3-3.symbols
   * +debian/libdbusmenu-gtk3.symbols
 
- -- Ken VanDine <ken.vandine@canonical.com>  Thu, 14 Apr 2011 09:27:03 -0400
-
-libdbusmenu (0.4.2-0ubuntu4~ppa1) natty; urgency=low
-
-  * Upstream Merge
-    * Handle cases where labels are added later as subwidgets in
-      the menuitem (LP: #758759)
-    * Fix the destruction of the attached GTK menuitem (LP: #746091)
+  [ Ted Gould ]
+  * New upstream release.
+    ∘ Handle cases where labels are added later as subwidgets
+      in the menuitem (LP: #758759)
+    ∘ Fix the destruction of the attached GTK menuitem (LP: #746091)
+    ∘ Guard against an activation that does not actually have an
+      associated menu-hide (LP: #750588)
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 12 Apr 2011 22:13:59 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 14 Apr 2011 16:41:27 -0500
 
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
diff --git a/docs/libdbusmenu-glib/reference/html/ch01.html b/docs/libdbusmenu-glib/reference/html/ch01.html
index 0cbf2fa..34a33b2 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="id552681"></a>API</h2></div></div></div>
+<a name="id540461"></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 2b7c5ae..17b2ccd 100644
--- a/docs/libdbusmenu-glib/reference/version.xml
+++ b/docs/libdbusmenu-glib/reference/version.xml
@@ -1 +1 @@
-0.4.2
+0.4.3
diff --git a/docs/libdbusmenu-gtk/reference/html/ch01.html b/docs/libdbusmenu-gtk/reference/html/ch01.html
index 0cf9820..af2a8e4 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="id463422"></a>API</h2></div></div></div>
+<a name="id403245"></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 2b7c5ae..17b2ccd 100644
--- a/docs/libdbusmenu-gtk/reference/version.xml
+++ b/docs/libdbusmenu-gtk/reference/version.xml
@@ -1 +1 @@
-0.4.2
+0.4.3