From eff505ed3c36dd15706094cc4bef36b41924d01d Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Thu, 12 Mar 2015 16:43:02 -0400 Subject: [PATCH] docs: more cleanups for GIO --- docs/reference/gio/Makefile.am | 9 ++++++++- docs/reference/gio/gio-sections.txt | 3 +-- docs/reference/gio/gio.types | 1 + gio/gdbusprivate.c | 2 +- gio/gsubprocess.c | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index d1e7735..64e227a 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -34,6 +34,7 @@ IGNORE_HFILES = \ gapplicationimpl.h \ gasynchelper.h \ gcontenttypeprivate.h \ + gcontextspecificgroup.h \ gcredentialsprivate.h \ gdbus-daemon-generated.h \ gdbusactiongroup-private.h \ @@ -95,6 +96,12 @@ IGNORE_HFILES = \ gwin32volumemonitor.h \ thumbnail-verify.h +MKDB_IGNORE_FILES = \ + gdbus-daemon-generated.c \ + kqueue \ + libasyncns \ + tests \ + $(NULL) # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. @@ -111,7 +118,7 @@ GTKDOC_LIBS = \ # Extra options to supply to gtkdoc-mkdb MKDB_OPTIONS = --output-format=xml --name-space=g \ - --ignore-files='libasyncns tests' + --ignore-files='$(MKDB_IGNORE_FILES)' # Images to copy into HTML directory HTML_IMAGES = \ diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt index d598338..39444f7 100644 --- a/docs/reference/gio/gio-sections.txt +++ b/docs/reference/gio/gio-sections.txt @@ -1451,7 +1451,6 @@ GAppLaunchContextPrivate
gappinfomonitor GAppInfoMonitor -GAppInfoMonitor g_app_info_monitor_get GAppInfoMonitor @@ -3387,7 +3386,6 @@ g_action_map_add_action g_action_map_remove_action -GActionMapInterface G_TYPE_ACTION_MAP G_ACTION_MAP G_IS_ACTION_MAP @@ -4262,6 +4260,7 @@ CMSG_LEN CMSG_SPACE GLIB_ALIGN_TO_SIZEOF T_SRV +ws2funcs
diff --git a/docs/reference/gio/gio.types b/docs/reference/gio/gio.types index c8299ea..c9be9ed 100644 --- a/docs/reference/gio/gio.types +++ b/docs/reference/gio/gio.types @@ -106,6 +106,7 @@ g_settings_schema_source_get_type g_simple_action_get_type g_simple_action_group_get_type g_simple_async_result_get_type +g_simple_io_stream_get_type g_simple_permission_get_type g_simple_proxy_resolver_get_type g_socket_address_enumerator_get_type diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c index 64bf935..60af6c6 100644 --- a/gio/gdbusprivate.c +++ b/gio/gdbusprivate.c @@ -1564,7 +1564,7 @@ continue_writing_in_idle_cb (gpointer user_data) return FALSE; } -/** +/* * @write_data: (transfer full) (allow-none): * @flush_data: (transfer full) (allow-none): * @close_data: (transfer full) (allow-none): diff --git a/gio/gsubprocess.c b/gio/gsubprocess.c index 999d777..ddb8bb1 100644 --- a/gio/gsubprocess.c +++ b/gio/gsubprocess.c @@ -234,7 +234,7 @@ dupfd_cloexec (int parent_fd) return fd; } -/** +/* * Based on code derived from * gnome-terminal:src/terminal-screen.c:terminal_screen_child_setup(), * used under the LGPLv2+ with permission from author. -- 2.7.4