diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-03-19 09:04:22 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-03-19 09:04:22 +0000 |
| commit | 9c4047dc4c83f11d526d5bcd5e3d9eb573229790 (patch) | |
| tree | 550cee3d2cc228a88075cfcb75a8959dbd2aae85 | |
| parent | 2c102609d336634650a7e28ac25c8ea55069f3ca (diff) | |
| parent | 914299ebefceab0f643363bf7485face280af303 (diff) | |
| download | libdbusmenu-9c4047dc4c83f11d526d5bcd5e3d9eb573229790.tar.gz libdbusmenu-9c4047dc4c83f11d526d5bcd5e3d9eb573229790.tar.bz2 libdbusmenu-9c4047dc4c83f11d526d5bcd5e3d9eb573229790.zip | |
Fix FTBFS caused by failing gtk-doc coverage test
* when generating the script that runs gtester, use ${GTKDOC_CHECK_PATH} instead of ${GTKDOC_CHECK} to work with upstream changes https://bugzilla.gnome.org/show_bug.cgi?id=701638
* add gtk-doc markup to subclass structs' parent fields so that gtk-doc won't mark them as undocumented. Fixes: 1294165
| -rw-r--r-- | docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt | 6 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.h | 1 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem-proxy.h | 1 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.h | 1 | ||||
| -rw-r--r-- | libdbusmenu-gtk/client.h | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
6 files changed, 9 insertions, 5 deletions
diff --git a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt index 7804937..c62800e 100644 --- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt +++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt @@ -16,7 +16,6 @@ DBUSMENU_CLIENT_TYPES_DEFAULT DBUSMENU_CLIENT_TYPES_SEPARATOR DBUSMENU_CLIENT_TYPES_IMAGE DbusmenuClient -DbusmenuClientClass DbusmenuClientTypeHandler dbusmenu_client_new dbusmenu_client_get_icon_paths @@ -26,6 +25,7 @@ dbusmenu_client_get_text_direction dbusmenu_client_add_type_handler dbusmenu_client_add_type_handler_full <SUBSECTION Standard> +DbusmenuClientClass DBUSMENU_CLIENT DBUSMENU_IS_CLIENT DBUSMENU_TYPE_CLIENT @@ -147,7 +147,6 @@ DBUSMENU_SERVER_PROP_STATUS DBUSMENU_SERVER_PROP_TEXT_DIRECTION DBUSMENU_SERVER_PROP_VERSION DbusmenuServer -DbusmenuServerClass dbusmenu_server_new dbusmenu_server_get_status dbusmenu_server_get_text_direction @@ -155,6 +154,7 @@ dbusmenu_server_set_root dbusmenu_server_set_status dbusmenu_server_set_text_direction <SUBSECTION Standard> +DbusmenuServerClass DBUSMENU_SERVER DBUSMENU_IS_SERVER DBUSMENU_TYPE_SERVER @@ -172,10 +172,10 @@ dbusmenu_server_set_icon_paths <FILE>menuitem-proxy</FILE> <TITLE>DbusmenuMenuitemProxy</TITLE> DbusmenuMenuitemProxy -DbusmenuMenuitemProxyClass dbusmenu_menuitem_proxy_new dbusmenu_menuitem_proxy_get_wrapped <SUBSECTION Standard> +DbusmenuMenuitemProxyClass DBUSMENU_MENUITEM_PROXY DBUSMENU_IS_MENUITEM_PROXY DBUSMENU_TYPE_MENUITEM_PROXY diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h index ae22863..2d3b0f9 100644 --- a/libdbusmenu-glib/client.h +++ b/libdbusmenu-glib/client.h @@ -183,6 +183,7 @@ struct _DbusmenuClientClass { */ typedef struct _DbusmenuClient DbusmenuClient; struct _DbusmenuClient { + /*< private >*/ GObject parent; /*< Private >*/ diff --git a/libdbusmenu-glib/menuitem-proxy.h b/libdbusmenu-glib/menuitem-proxy.h index ee988d8..0d28e67 100644 --- a/libdbusmenu-glib/menuitem-proxy.h +++ b/libdbusmenu-glib/menuitem-proxy.h @@ -72,6 +72,7 @@ struct _DbusmenuMenuitemProxyClass { Public instance data for a #DbusmenuMenuitemProxy. */ struct _DbusmenuMenuitemProxy { + /*< private >*/ DbusmenuMenuitem parent; /*< Private >*/ diff --git a/libdbusmenu-glib/server.h b/libdbusmenu-glib/server.h index d482a10..51f2337 100644 --- a/libdbusmenu-glib/server.h +++ b/libdbusmenu-glib/server.h @@ -151,6 +151,7 @@ struct _DbusmenuServerClass { */ typedef struct _DbusmenuServer DbusmenuServer; struct _DbusmenuServer { + /*< private >*/ GObject parent; /*< Private >*/ diff --git a/libdbusmenu-gtk/client.h b/libdbusmenu-gtk/client.h index 75b59a0..a82c3c3 100644 --- a/libdbusmenu-gtk/client.h +++ b/libdbusmenu-gtk/client.h @@ -87,6 +87,7 @@ struct _DbusmenuGtkClientClass { */ typedef struct _DbusmenuGtkClient DbusmenuGtkClient; struct _DbusmenuGtkClient { + /*< private >*/ DbusmenuClient parent; /*< Private >*/ diff --git a/tests/Makefile.am b/tests/Makefile.am index 177b4d8..716d773 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -551,13 +551,13 @@ test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/ma test_libdbusmenu_glib_gtkdoc: @echo "#!/bin/bash" > $@ @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@ - @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@ + @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@ @chmod +x $@ test_libdbusmenu_gtk_gtkdoc: @echo "#!/bin/bash" > $@ @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@ - @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@ + @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@ @chmod +x $@ examplesdir = $(docdir)/examples/ |