Import upstream version 0.4.94

3 files changed, 32 insertions, 21 deletions

diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index 4ec464b..b4564d1 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -144,6 +144,7 @@ endif
 # VAPI Files
 #########################
 
+if HAVE_VALA
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
@@ -167,4 +168,5 @@ DbusmenuGtk$(VER)-0.4.tmp.gir: DbusmenuGtk$(VER)-0.4.gir
 CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir
 
 endif
+endif
 
diff --git a/libdbusmenu-gtk/Makefile.in b/libdbusmenu-gtk/Makefile.in
index 8d2235e..8278b2c 100644
--- a/libdbusmenu-gtk/Makefile.in
+++ b/libdbusmenu-gtk/Makefile.in
@@ -59,12 +59,16 @@ DIST_COMMON = $(libdbusmenu_gtk3include_HEADERS) \
 	$(srcdir)/dbusmenu-gtk3-0.4.pc.in \
 	$(top_srcdir)/Makefile.am.enum
 @HAVE_INTROSPECTION_TRUE@am__append_1 = DbusmenuGtk$(VER)-0.4.gir
-@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) \
-@HAVE_INTROSPECTION_TRUE@	$(vapi_DATA) \
-@HAVE_INTROSPECTION_TRUE@	DbusmenuGtk$(VER)-0.4.tmp.gir
+@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA)
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@am__append_3 = $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir
 subdir = libdbusmenu-gtk
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -210,6 +214,8 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HELP_DIR = @HELP_DIR@
@@ -345,7 +351,7 @@ top_srcdir = @top_srcdir@
 @USE_GTK3_FALSE@lib_LTLIBRARIES = libdbusmenu-gtk.la
 @USE_GTK3_TRUE@lib_LTLIBRARIES = libdbusmenu-gtk3.la
 BUILT_SOURCES = $(glib_enum_h) $(glib_enum_c)
-CLEANFILES = stamp-enum-types $(am__append_2)
+CLEANFILES = stamp-enum-types $(am__append_2) $(am__append_3)
 DISTCLEANFILES = $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST = dbusmenu-gtk-0.4.pc.in dbusmenu-gtk3-0.4.pc.in \
 	$(enum_tmpl_h) $(enum_tmpl_c)
@@ -450,8 +456,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_buildd
 #########################
 # VAPI Files
 #########################
-@HAVE_INTROSPECTION_TRUE@vapidir = $(datadir)/vala/vapi
-@HAVE_INTROSPECTION_TRUE@vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapidir = $(datadir)/vala/vapi
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1041,20 +1047,20 @@ $(glib_enum_c): $(glib_enum_h)
 
 @HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.gir: libdbusmenu-gtk$(VER).la
 
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
-@HAVE_INTROSPECTION_TRUE@	$(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
-@HAVE_INTROSPECTION_TRUE@		--pkg gdk-pixbuf-2.0 \
-@HAVE_INTROSPECTION_TRUE@		--pkg $(GTKVALA) \
-@HAVE_INTROSPECTION_TRUE@		--pkg atk \
-@HAVE_INTROSPECTION_TRUE@		--pkg Dbusmenu-0.4 \
-@HAVE_INTROSPECTION_TRUE@		--vapidir=$(top_builddir)/libdbusmenu-glib \
-@HAVE_INTROSPECTION_TRUE@		$<
-
-@HAVE_INTROSPECTION_TRUE@DbusmenuGtk$(VER)-0.4.tmp.gir: DbusmenuGtk$(VER)-0.4.gir
-@HAVE_INTROSPECTION_TRUE@	$(SED) \
-@HAVE_INTROSPECTION_TRUE@		-e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \
-@HAVE_INTROSPECTION_TRUE@		-e "s|Atk.ImplementorIface|Atk.Implementor|g" \
-@HAVE_INTROSPECTION_TRUE@		$< > $@
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@	$(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		--pkg gdk-pixbuf-2.0 \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		--pkg $(GTKVALA) \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		--pkg atk \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		--pkg Dbusmenu-0.4 \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		--vapidir=$(top_builddir)/libdbusmenu-glib \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		$<
+
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@DbusmenuGtk$(VER)-0.4.tmp.gir: DbusmenuGtk$(VER)-0.4.gir
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@	$(SED) \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		-e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		-e "s|Atk.ImplementorIface|Atk.Implementor|g" \
+@HAVE_INTROSPECTION_TRUE@@HAVE_VALA_TRUE@		$< > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index 3243c81..e988c62 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -283,6 +283,9 @@ toggle_widget_visibility (GtkWidget * widget)
 static void
 watch_submenu(DbusmenuMenuitem * mi, GtkWidget * menu)
 {
+	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
+	g_return_if_fail(GTK_IS_MENU_SHELL(menu));
+
 	ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(mi), PARSER_DATA);
 
 	pdata->shell = menu;