diff --git a/configure.ac b/configure.ac index 2861d20c1..be4361480 100644 --- a/configure.ac +++ b/configure.ac @@ -3506,7 +3506,6 @@ docs/reference/glib/version.xml docs/reference/gobject/Makefile docs/reference/gobject/version.xml docs/reference/gio/Makefile -docs/reference/gio/gdbus-object-manager-example/Makefile docs/reference/gio/version.xml tests/Makefile tests/gobject/Makefile diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index 07fe6e60c..38666b41a 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -1,7 +1,5 @@ NULL = -SUBDIRS = gdbus-object-manager-example - # The name of the module. DOC_MODULE=gio @@ -127,22 +125,6 @@ HTML_IMAGES = \ menu-example.png \ menu-model.png -example_files = \ - gdbus-example-objectmanager.xml \ - gdbus-example-objectmanager-server.c \ - gdbus-example-objectmanager-client.c \ - gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml \ - gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ - $(NULL) - -gdbus-example-objectmanager.xml: %: $(top_srcdir)/gio/tests/gdbus-object-manager-example/% -gdbus-example-objectmanager-server.c: %: $(top_srcdir)/gio/tests/% -gdbus-example-objectmanager-client.c: %: $(top_srcdir)/gio/tests/% -gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml: %: $(top_builddir)/gio/tests/gdbus-object-manager-example/% -gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml: %: $(top_builddir)/gio/tests/gdbus-object-manager-example/% -$(example_files): - cp $< $@ - content_files = \ version.xml \ overview.xml \ @@ -158,7 +140,6 @@ content_files = \ gresource.xml \ gdbus.xml \ gdbus-codegen.xml \ - $(example_files) \ $(NULL) expand_content_files = \ @@ -210,7 +191,7 @@ XSLTPROC_FLAGS = \ endif CLEANFILES ?= -CLEANFILES += $(man_MANS) $(example_files) +CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) diff --git a/docs/reference/gio/gdbus-object-manager-example/.gitignore b/docs/reference/gio/gdbus-object-manager-example/.gitignore deleted file mode 100644 index cc8a11df2..000000000 --- a/docs/reference/gio/gdbus-object-manager-example/.gitignore +++ /dev/null @@ -1 +0,0 @@ -gdbus-object-manager-example-overrides.txt diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am deleted file mode 100644 index 50b0f1957..000000000 --- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -NULL = - -# The name of the module. -DOC_MODULE=gdbus-object-manager-example - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=gdbus-object-manager-example-docs.xml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=$(top_builddir)/gio/tests/gdbus-object-manager-example - -HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h -CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c - -# Headers to ignore -IGNORE_HFILES = \ - $(NULL) - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -AM_CPPFLAGS = \ - $(gio_INCLUDES) \ - $(GLIB_DEBUG_FLAGS) - -GTKDOC_LIBS = \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ - $(top_builddir)/gmodule/libgmodule-2.0.la \ - $(top_builddir)/gio/libgio-2.0.la \ - $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la \ - $(NULL) - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \ - $(NULL) - -# Images to copy into HTML directory -HTML_IMAGES = \ - $(NULL) - -content_files = \ - $(NULL) - -expand_content_files = \ - $(NULL) - -extra_files = \ - $(NULL) - -include $(top_srcdir)/gtk-doc.make - -EXTRA_DIST += \ - $(NULL) - -MAINTAINERCLEANFILES = $(BUILT_SOURCES) - -dist-hook-local: all-local - -gdbus-object-manager-example-docs-clean: clean - cd $(srcdir) && rm -rf xml html - -# Nuke installed docs (don't know how to avoid installing them) -install-data-hook : - rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example diff --git a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-docs.xml b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-docs.xml deleted file mode 100644 index 7b0d1cacb..000000000 --- a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-docs.xml +++ /dev/null @@ -1,17 +0,0 @@ - - -]> - - - foo - - bar - - - - - - - diff --git a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-sections.txt b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-sections.txt deleted file mode 100644 index 1e3b8b814..000000000 --- a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-sections.txt +++ /dev/null @@ -1,161 +0,0 @@ -
-ExampleAnimal -ExampleAnimal -ExampleAnimal -ExampleAnimalIface -example_animal_interface_info -example_animal_override_properties -example_animal_call_poke -example_animal_call_poke_finish -example_animal_call_poke_sync -example_animal_complete_poke -example_animal_emit_jumped -example_animal_get_mood -example_animal_get_foo -example_animal_get_bar -example_animal_dup_mood -example_animal_dup_foo -example_animal_dup_bar -example_animal_set_mood -example_animal_set_foo -example_animal_set_bar -ExampleAnimalProxy -ExampleAnimalProxyClass -example_animal_proxy_new -example_animal_proxy_new_finish -example_animal_proxy_new_sync -example_animal_proxy_new_for_bus -example_animal_proxy_new_for_bus_finish -example_animal_proxy_new_for_bus_sync -ExampleAnimalSkeleton -ExampleAnimalSkeletonClass -example_animal_skeleton_new - -example_animal_get_type -example_animal_proxy_get_type -example_animal_skeleton_get_type -ExampleAnimalSkeletonPrivate -ExampleAnimalProxyPrivate -EXAMPLE_TYPE_ANIMAL -EXAMPLE_TYPE_ANIMAL_PROXY -EXAMPLE_TYPE_ANIMAL_SKELETON -EXAMPLE_ANIMAL -EXAMPLE_ANIMAL_GET_IFACE -EXAMPLE_ANIMAL_PROXY -EXAMPLE_ANIMAL_PROXY_CLASS -EXAMPLE_ANIMAL_PROXY_GET_CLASS -EXAMPLE_ANIMAL_SKELETON -EXAMPLE_ANIMAL_SKELETON_CLASS -EXAMPLE_ANIMAL_SKELETON_GET_CLASS -EXAMPLE_IS_ANIMAL -EXAMPLE_IS_ANIMAL_PROXY -EXAMPLE_IS_ANIMAL_PROXY_CLASS -EXAMPLE_IS_ANIMAL_SKELETON -EXAMPLE_IS_ANIMAL_SKELETON_CLASS -
- -
-ExampleCat -ExampleCat -ExampleCat -ExampleCatIface -example_cat_interface_info -example_cat_override_properties -ExampleCatProxy -ExampleCatProxyClass -example_cat_proxy_new -example_cat_proxy_new_finish -example_cat_proxy_new_sync -example_cat_proxy_new_for_bus -example_cat_proxy_new_for_bus_finish -example_cat_proxy_new_for_bus_sync -ExampleCatSkeleton -ExampleCatSkeletonClass -example_cat_skeleton_new - -example_cat_get_type -example_cat_proxy_get_type -example_cat_skeleton_get_type -ExampleCatProxyPrivate -ExampleCatSkeletonPrivate -EXAMPLE_TYPE_CAT -EXAMPLE_TYPE_CAT_PROXY -EXAMPLE_TYPE_CAT_SKELETON -EXAMPLE_CAT -EXAMPLE_CAT_GET_IFACE -EXAMPLE_CAT_PROXY -EXAMPLE_CAT_PROXY_CLASS -EXAMPLE_CAT_PROXY_GET_CLASS -EXAMPLE_CAT_SKELETON -EXAMPLE_CAT_SKELETON_CLASS -EXAMPLE_CAT_SKELETON_GET_CLASS -EXAMPLE_IS_CAT -EXAMPLE_IS_CAT_PROXY -EXAMPLE_IS_CAT_PROXY_CLASS -EXAMPLE_IS_CAT_SKELETON -EXAMPLE_IS_CAT_SKELETON_CLASS -
- -
-ExampleObject -ExampleObject -ExampleObject -ExampleObjectIface -example_object_get_animal -example_object_get_cat -example_object_peek_animal -example_object_peek_cat -ExampleObjectProxy -ExampleObjectProxyClass -example_object_proxy_new -ExampleObjectSkeleton -ExampleObjectSkeletonClass -example_object_skeleton_new -example_object_skeleton_set_animal -example_object_skeleton_set_cat - -example_object_get_type -example_object_proxy_get_type -example_object_skeleton_get_type -ExampleObjectProxyPrivate -ExampleObjectSkeletonPrivate -EXAMPLE_IS_OBJECT -EXAMPLE_IS_OBJECT_PROXY -EXAMPLE_IS_OBJECT_PROXY_CLASS -EXAMPLE_IS_OBJECT_SKELETON -EXAMPLE_IS_OBJECT_SKELETON_CLASS -EXAMPLE_OBJECT -EXAMPLE_OBJECT_GET_IFACE -EXAMPLE_OBJECT_PROXY -EXAMPLE_OBJECT_PROXY_CLASS -EXAMPLE_OBJECT_PROXY_GET_CLASS -EXAMPLE_OBJECT_SKELETON -EXAMPLE_OBJECT_SKELETON_CLASS -EXAMPLE_OBJECT_SKELETON_GET_CLASS -EXAMPLE_TYPE_OBJECT -EXAMPLE_TYPE_OBJECT_PROXY -EXAMPLE_TYPE_OBJECT_SKELETON -
- -
-ExampleObjectManagerClient -ExampleObjectManagerClient -ExampleObjectManagerClient -ExampleObjectManagerClientClass -example_object_manager_client_get_proxy_type -example_object_manager_client_new -example_object_manager_client_new_finish -example_object_manager_client_new_sync -example_object_manager_client_new_for_bus -example_object_manager_client_new_for_bus_finish -example_object_manager_client_new_for_bus_sync - -example_object_manager_client_get_type -EXAMPLE_IS_OBJECT_MANAGER_CLIENT -EXAMPLE_IS_OBJECT_MANAGER_CLIENT_CLASS -EXAMPLE_OBJECT_MANAGER_CLIENT -EXAMPLE_OBJECT_MANAGER_CLIENT_CLASS -EXAMPLE_OBJECT_MANAGER_CLIENT_GET_CLASS -EXAMPLE_TYPE_OBJECT_MANAGER_CLIENT -ExampleObjectManagerClientPrivate -
diff --git a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example.types b/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example.types deleted file mode 100644 index af1dfee3d..000000000 --- a/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example.types +++ /dev/null @@ -1,10 +0,0 @@ -example_object_get_type -example_object_proxy_get_type -example_object_skeleton_get_type -example_animal_get_type -example_animal_proxy_get_type -example_animal_skeleton_get_type -example_cat_get_type -example_cat_proxy_get_type -example_cat_skeleton_get_type -example_object_manager_client_get_type diff --git a/docs/reference/gio/migrating-gdbus.xml b/docs/reference/gio/migrating-gdbus.xml index d46f98ccc..bda3f76aa 100644 --- a/docs/reference/gio/migrating-gdbus.xml +++ b/docs/reference/gio/migrating-gdbus.xml @@ -241,9 +241,6 @@ on_name_acquired (GDBusConnection *connection, -
- Generating code and docs -
Using gdbus-codegen @@ -270,12 +267,7 @@ gdbus-codegen --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ generated. Additionally, two XML files generated-docs-org.gtk.GDBus.Example.ObjectManager.Animal and generated-docs-org.gtk.GDBus.Example.ObjectManager.Cat - with Docbook XML are generated. For an example of what the docs look - like see the Animal D-Bus interface documentation. - and - the Cat D-Bus interface documentation. + with Docbook XML are generated. While the contents of generated-code.h and @@ -284,26 +276,9 @@ gdbus-codegen --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ linkend="gdbus-codegen">gdbus-codegen manual page, brief examples of how this generated code can be used can be found in - and . Additionally, since - the generated code has 100% gtk-doc coverage, see - #ExampleAnimal, #ExampleCat, #ExampleObject and - #ExampleObjectManagerClient pages for documentation. + and . - Server-side application using generated codeFIXME: MISSING XINCLUDE CONTENT - - Client-side application using generated codeFIXME: MISSING XINCLUDE CONTENT - -
- - - - - - - -