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

[Ted Gould]

0.3.93

[Ken VanDine (ken-vandine)]

Approved!

review: Approve

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

112. By Ken VanDine on 2011-01-21

releasing version 0.3.93-0ubuntu1

=== modified file 'ChangeLog'
--- ChangeLog	2011-01-14 16:36:48 +0000
+++ ChangeLog	2011-01-20 14:46:55 +0000
@@ -1,5 +1,77 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.93
+
[phone]  Ted Gould  <[e-mail]>
+
+	Increase the level of warning given by the scanner
+
[phone]  Ken VanDine  <[e-mail]>
+
+	added --warn-all to scanner flags so the build log will warn us about missing annotations
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fix some crashes when building variants improperly
+
[phone]  Ted Gould  <[e-mail]>
+
+	Attach bug
+
[phone]  Ted Gould  <[e-mail]>
+
+	Warn when can't parse.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use the message string.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding warnings on g_variant_parse errors
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protecting the final tuple from errors.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing builder to only init/finish if there are entries we get.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setup images to use the fallbacks.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Set the use-fallback property to TRUE on all our Images
+
[phone]  Ted Gould  <[e-mail]>
+
+	Signal an update layout when the object comes on the bus.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Moving cleanup to the top of the function.
+
[phone]  Chris Coulson  <[e-mail]>
+
+	Ensure that we can recover from GetLayout failing
+
[phone]  Ted Gould  <[e-mail]>
+
+	Send a LayoutUpdated when we register the object.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing build with g-ir-scanner on buildds
+
[phone]  Ken VanDine  <[e-mail]>
+
+	Use EXPORT_PACKAGES instead of PACKAGES to prevent circular build depends
+
 2011-01-14  Ted Gould  <[e-mail]>
 
 	0.3.92
 
=== modified file 'configure'
--- configure	2011-01-14 16:37:50 +0000
+++ configure	2011-01-20 14:46:55 +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.92.
+# Generated by GNU Autoconf 2.67 for libdbusmenu 0.3.93.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -703,8 +703,8 @@
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.3.92'
-PACKAGE_STRING='libdbusmenu 0.3.92'
+PACKAGE_VERSION='0.3.93'
+PACKAGE_STRING='libdbusmenu 0.3.93'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1540,7 +1540,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.92 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.3.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1610,7 +1610,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.3.92:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.3.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1750,7 +1750,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.3.92
+libdbusmenu configure 0.3.93
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2121,7 +2121,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.92, which was
+It was created by libdbusmenu $as_me 0.3.93, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2942,7 +2942,7 @@
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.3.92
+ VERSION=0.3.93
 
 
 # Some tools Automake needs.
@@ -13284,7 +13284,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=3
-LIBDBUSMENU_REVISION=0
+LIBDBUSMENU_REVISION=1
 LIBDBUSMENU_AGE=0
 
 
@@ -14606,7 +14606,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.92, which was
+This file was extended by libdbusmenu $as_me 0.3.93, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14672,7 +14672,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.92
+libdbusmenu config.status 0.3.93
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-01-18 15:11:53 +0000
+++ configure.ac	2011-01-20 14:46:55 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.3.92, [e-mail])
+AC_INIT(libdbusmenu, 0.3.93, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.3.92, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.3.93, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -136,7 +136,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=3
-LIBDBUSMENU_REVISION=0
+LIBDBUSMENU_REVISION=1
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-01-18 17:26:07 +0000
+++ debian/changelog	2011-01-20 14:46:55 +0000
@@ -1,3 +1,13 @@
+libdbusmenu (0.3.93-0ubuntu1~ppa1) natty; urgency=low
+
+  * New upstream release.
+    * Fixing scanner export
+    * Increasing scanner warnings
+    * Signalling to DBus when object is registered
+    * Handling errors in GVariant better than crashing
+
+ -- Ted Gould <[e-mail]>  Thu, 20 Jan 2011 08:43:12 -0600
+
 libdbusmenu (0.3.92-0ubuntu3) natty; urgency=low
 
   * libdbusmenu-glib/server.c
@@ -296,7 +306,7 @@
     * Add function to get submenu of GTK-ified items
     * Fix signal prototype of ID update
     * Fixing up VAPI files to build them correctly
-  	* Fixing the version string in the GIR file
+      * Fixing the version string in the GIR file
     * Fix documentation title page
     * Reject text nodes early (warnings with Qt integration)
   * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file
@@ -312,7 +322,7 @@
     * Add function to get submenu of GTK-ified items
     * Fix signal prototype of ID update
     * Fixing up VAPI files to build them correctly
-  	* Fixing the version string in the GIR file
+      * Fixing the version string in the GIR file
     * Fix documentation title page
     * Reject text nodes early (warnings with Qt integration)
   * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file
 
=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
--- docs/libdbusmenu-glib/reference/html/ch01.html	2011-01-14 16:36:48 +0000
+++ docs/libdbusmenu-glib/reference/html/ch01.html	2011-01-20 14:46:55 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="API">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id367877"></a>API</h2></div></div></div>
+<a name="id552470"></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"></span>
 
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml	2011-01-14 16:37:50 +0000
+++ docs/libdbusmenu-glib/reference/version.xml	2011-01-20 14:46:55 +0000
@@ -1,1 +1,1 @@
-0.3.92
+0.3.93
 
=== modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html'
--- docs/libdbusmenu-gtk/reference/html/ch01.html	2011-01-14 16:36:48 +0000
+++ docs/libdbusmenu-gtk/reference/html/ch01.html	2011-01-20 14:46:55 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="API">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id569264"></a>API</h2></div></div></div>
+<a name="id449251"></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"></span>
 
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml	2011-01-14 16:37:50 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml	2011-01-20 14:46:55 +0000
@@ -1,1 +1,1 @@
-0.3.92
+0.3.93
 
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2011-01-18 15:11:53 +0000
+++ libdbusmenu-glib/Makefile.am	2011-01-20 14:46:55 +0000
@@ -119,12 +119,14 @@
 
 if INTROSPECTION_TEN
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+	--warn-all \
         --add-include-path=$(srcdir) \
         $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
         --symbol-prefix=dbusmenu \
         --identifier-prefix=Dbusmenu
 else
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+	--warn-all \
         --add-include-path=$(srcdir) \
         $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
 endif
 
=== modified file 'libdbusmenu-glib/Makefile.in'
--- libdbusmenu-glib/Makefile.in	2011-01-14 16:37:50 +0000
+++ libdbusmenu-glib/Makefile.in	2011-01-20 14:46:55 +0000
@@ -367,10 +367,12 @@
 
 INTROSPECTION_GIRS = $(am__append_1)
 @INTROSPECTION_TEN_FALSE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_FALSE@	--warn-all \
 @INTROSPECTION_TEN_FALSE@        --add-include-path=$(srcdir) \
 @INTROSPECTION_TEN_FALSE@        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
 
 @INTROSPECTION_TEN_TRUE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_TRUE@	--warn-all \
 @INTROSPECTION_TEN_TRUE@        --add-include-path=$(srcdir) \
 @INTROSPECTION_TEN_TRUE@        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
 @INTROSPECTION_TEN_TRUE@        --symbol-prefix=dbusmenu \
@@ -386,7 +388,7 @@
 @HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
 @HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
 @HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4
-@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_PACKAGES = dbusmenu-glib-0.4
+@HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
 @HAVE_INTROSPECTION_TRUE@Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
 
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2011-01-13 16:14:19 +0000
+++ libdbusmenu-glib/client.c	2011-01-20 14:46:55 +0000
@@ -1538,6 +1538,14 @@
 static void
 update_layout_cb (GObject * proxy, GAsyncResult * res, gpointer data)
 {
+	DbusmenuClient * client = DBUSMENU_CLIENT(data);
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+
+	if (priv->layoutcall != NULL) {
+		g_object_unref(priv->layoutcall);
+		priv->layoutcall = NULL;
+	}
+
 	GError * error = NULL;
 	GVariant * params = NULL;
 
@@ -1554,9 +1562,6 @@
 	g_variant_get(params, "(us)", &rev, &xml);
 	g_variant_unref(params);
 
-	DbusmenuClient * client = DBUSMENU_CLIENT(data);
-	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
-
 	guint parseable = parse_layout(client, xml);
 	g_free(xml);
 
@@ -1567,10 +1572,6 @@
 
 	priv->my_revision = rev;
 	/* g_debug("Root is now: 0x%X", (unsigned int)priv->root); */
-	if (priv->layoutcall != NULL) {
-		g_object_unref(priv->layoutcall);
-		priv->layoutcall = NULL;
-	}
 	#ifdef MASSIVEDEBUGGING
 	g_debug("Client signaling layout has changed.");
 	#endif 
 
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2011-01-18 17:26:07 +0000
+++ libdbusmenu-glib/server.c	2011-01-20 14:46:55 +0000
@@ -506,6 +506,19 @@
 	if (error != NULL) {
 		g_warning("Unable to register object on bus: %s", error->message);
 		g_error_free(error);
+		return;
+	}
+
+	/* If we've got it registered let's tell everyone about it */
+	g_signal_emit(G_OBJECT(server), signals[LAYOUT_UPDATED], 0, priv->layout_revision, 0, TRUE);
+	if (priv->dbusobject != NULL && priv->bus != NULL) {
+		g_dbus_connection_emit_signal(priv->bus,
+		                              NULL,
+		                              priv->dbusobject,
+		                              DBUSMENU_INTERFACE,
+		                              "LayoutUpdated",
+		                              g_variant_new("(ui)", priv->layout_revision, 0),
+		                              NULL);
 	}
 
 	return;
 
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am	2011-01-18 15:11:53 +0000
+++ libdbusmenu-gtk/Makefile.am	2011-01-20 14:46:55 +0000
@@ -69,12 +69,14 @@
 
 if INTROSPECTION_TEN
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+	--warn-all \
 	--add-include-path=$(top_builddir)/libdbusmenu-glib \
 	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
 	--symbol-prefix=dbusmenu \
 	--identifier-prefix=DbusmenuGtk
 else
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+	--warn-all \
 	--add-include-path=$(top_builddir)/libdbusmenu-glib \
 	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
 endif
 
=== modified file 'libdbusmenu-gtk/Makefile.in'
--- libdbusmenu-gtk/Makefile.in	2011-01-13 16:14:19 +0000
+++ libdbusmenu-gtk/Makefile.in	2011-01-20 14:46:55 +0000
@@ -372,10 +372,12 @@
 pkgconfigdir = $(libdir)/pkgconfig
 INTROSPECTION_GIRS = $(am__append_1)
 @INTROSPECTION_TEN_FALSE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_FALSE@	--warn-all \
 @INTROSPECTION_TEN_FALSE@	--add-include-path=$(top_builddir)/libdbusmenu-glib \
 @INTROSPECTION_TEN_FALSE@	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
 
 @INTROSPECTION_TEN_TRUE@INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+@INTROSPECTION_TEN_TRUE@	--warn-all \
 @INTROSPECTION_TEN_TRUE@	--add-include-path=$(top_builddir)/libdbusmenu-glib \
 @INTROSPECTION_TEN_TRUE@	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
 @INTROSPECTION_TEN_TRUE@	--symbol-prefix=dbusmenu \
@@ -393,7 +395,7 @@
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_NAMESPACE = DbusmenuGtk$(VER)
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_PACKAGES = dbusmenu-gtk$(VER)-0.4
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk_0_4_gir_EXPORT_PACKAGES = dbusmenu-gtk$(VER)-0.4
 
 # We duplicate these for the same reason as libdbusmenu_gtk3includedir above
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_INCLUDES = $(DbusmenuGtk_0_4_gir_INCLUDES)
@@ -402,7 +404,7 @@
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_FILES = $(DbusmenuGtk_0_4_gir_FILES)
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_NAMESPACE = $(DbusmenuGtk_0_4_gir_NAMESPACE)
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_SCANNERFLAGS = $(DbusmenuGtk_0_4_gir_SCANNERFLAGS)
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_PACKAGES = $(DbusmenuGtk_0_4_gir_PACKAGES)
+@HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_EXPORT_PACKAGES = $(DbusmenuGtk_0_4_gir_EXPORT_PACKAGES)
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
 @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
 
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2011-01-13 15:54:36 +0000
+++ libdbusmenu-gtk/client.c	2011-01-20 14:46:55 +0000
@@ -789,6 +789,7 @@
 			gtkimage = NULL;
 		} else if (g_strcmp0(iconname, DBUSMENU_MENUITEM_ICON_NAME_BLANK) == 0) {
 			gtkimage = gtk_image_new();
+			g_object_set(G_OBJECT(gtkimage), "use-fallback", TRUE, NULL);
 		} else {
 			/* Look to see if we want to have an icon with the 'ltr' or
 			   'rtl' depending on what we're doing. */
@@ -807,6 +808,7 @@
 			   can just convert it to this name. */
 			if (gtkimage == NULL) {
 				gtkimage = gtk_image_new_from_icon_name(finaliconname, GTK_ICON_SIZE_MENU);
+				g_object_set(G_OBJECT(gtkimage), "use-fallback", TRUE, NULL);
 			} else {
 				gtk_image_set_from_icon_name(GTK_IMAGE(gtkimage), finaliconname, GTK_ICON_SIZE_MENU);
 			}