From 232a1e5836bf9394b93b586788811f1b3d1a26ab Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Sep 2011 13:07:27 -0500 Subject: Adding in warnings to protect watch_submenu --- libdbusmenu-gtk/parser.c | 3 +++ 1 file changed, 3 insertions(+) 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; -- cgit v1.2.3 From 0b5f7ed8fcaee4b32db7a1deed1b65ff77688551 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Sep 2011 13:13:49 -0500 Subject: Making sure to sink the reference before parsing it. --- tests/test-gtk-parser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test-gtk-parser.c b/tests/test-gtk-parser.c index 87b0a7f..afd6194 100644 --- a/tests/test-gtk-parser.c +++ b/tests/test-gtk-parser.c @@ -28,6 +28,8 @@ test_parser_runs (void) { GtkWidget * gmi = gtk_menu_item_new_with_label("Test Item"); g_assert(gmi != NULL); + g_object_ref_sink(gmi); + DbusmenuMenuitem * mi = dbusmenu_gtk_parse_menu_structure(gmi); g_assert(mi != NULL); -- cgit v1.2.3 From 21afbd946557e93304bdb34199d62594f365799f Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Mon, 19 Sep 2011 23:39:39 -0500 Subject: Making it so that the Vala build is optional --- configure.ac | 15 +++++++++++++++ libdbusmenu-glib/Makefile.am | 2 ++ libdbusmenu-gtk/Makefile.am | 2 ++ 3 files changed, 19 insertions(+) diff --git a/configure.ac b/configure.ac index 895f9f8..e284980 100644 --- a/configure.ac +++ b/configure.ac @@ -140,7 +140,17 @@ AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspection_ten" = "xyes"]) # Vala API Generation ########################### +AC_ARG_ENABLE([vala], + AC_HELP_STRING([--disable-vala], [Disable vala]), + [enable_vala=$enableval], [enable_vala=auto]) + +AS_IF([test "x$enable_vala" != "xno"],[ + AM_COND_IF([HAVE_INTROSPECTION],,[ + AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) + ]) AC_PATH_PROG([VALA_API_GEN], [vapigen]) +]) +AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) ########################### # XSLT Processor @@ -228,3 +238,8 @@ AS_IF([test "x$enable_gtk" = "xno"], AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]) ) +AM_COND_IF([HAVE_VALA], + AC_MSG_NOTICE([ Vala bindings: yes]), + AC_MSG_NOTICE([ Vala bindings no]) +) + diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 5b04415..7d4ea5d 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -189,6 +189,7 @@ endif # VAPI Files ######################### +if HAVE_VALA if HAVE_INTROSPECTION vapidir = $(datadir)/vala/vapi @@ -200,4 +201,5 @@ Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir CLEANFILES += $(vapi_DATA) endif +endif 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 -- cgit v1.2.3 From 4177700e45a02a7f35b32dc24dd7ec6e150d6a0a Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Mon, 19 Sep 2011 23:43:26 -0500 Subject: Adding an optional build of the dumper --- configure.ac | 16 +++++++++++++++- tests/Makefile.am | 12 ++++++++++-- tools/Makefile.am | 6 +++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e284980..f347625 100644 --- a/configure.ac +++ b/configure.ac @@ -96,8 +96,17 @@ AC_SUBST(DBUSMENUGTK_LIBS) X11_REQUIRED_VERSION=1.3 +AC_ARG_ENABLE([dumper], + AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), + [enable_dumper=$enableval], [enable_dumper=auto]) +AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"]) + +AS_IF([test "x$enable_dumper" != "xno"],[ PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION - x11 >= $X11_REQUIRED_VERSION) + x11 >= $X11_REQUIRED_VERSION, + [have_dumper=yes] +) +]) AC_SUBST(DBUSMENUDUMPER_CFLAGS) AC_SUBST(DBUSMENUDUMPER_LIBS) @@ -243,3 +252,8 @@ AM_COND_IF([HAVE_VALA], AC_MSG_NOTICE([ Vala bindings no]) ) +AS_IF([test "x$have_dumper" = "xyes"], + AC_MSG_NOTICE([ Dumper: yes]), + AC_MSG_NOTICE([ Dumper: no]) +) + diff --git a/tests/Makefile.am b/tests/Makefile.am index e6882af..a4e8682 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,8 +12,12 @@ TESTS = \ test-glib-properties \ test-glib-proxy \ test-glib-simple-items \ - test-glib-submenu \ + test-glib-submenu + +if WANT_DBUSMENUDUMPER +TESTS += \ test-json +endif if WANT_LIBDBUSMENUGTK TESTS += \ @@ -50,9 +54,13 @@ check_PROGRAMS = \ test-glib-proxy-proxy \ test-glib-submenu-client \ test-glib-submenu-server \ - test-glib-simple-items \ + test-glib-simple-items + +if WANT_DBUSMENUDUMPER +check_PROGRAMS += \ test-json-client \ test-json-server +endif if WANT_LIBDBUSMENUGTK check_PROGRAMS += \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 48993f1..029b73e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,7 +1,11 @@ SUBDIRS = testapp -libexec_PROGRAMS = dbusmenu-dumper +libexec_PROGRAMS = + +if WANT_DBUSMENUDUMPER +libexec_PROGRAMS += dbusmenu-dumper +endif libexec_SCRIPTS = dbusmenu-bench -- cgit v1.2.3 From 451acabd0340c1f0196ec0fe8a6ef62ead4e77f9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Sep 2011 23:54:06 -0500 Subject: 0.4.94 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f347625..6276327 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.4.93, ted@canonical.com) +AC_INIT(libdbusmenu, 0.4.94, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.4.93, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.4.94, [-Wno-portability]) AM_MAINTAINER_MODE @@ -172,7 +172,7 @@ AC_PATH_PROG([XSLT_PROC], [xsltproc]) ########################### LIBDBUSMENU_CURRENT=4 -LIBDBUSMENU_REVISION=3 +LIBDBUSMENU_REVISION=4 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) -- cgit v1.2.3