From 8a7d33024a377c99ca17b37ff5f02854bb71463b Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 6 Sep 2011 00:12:12 -0400 Subject: [PATCH] gio docs: lots more fixes --- docs/reference/gio/Makefile.am | 2 +- docs/reference/gio/gdbus-codegen.xml | 2 +- docs/reference/gio/gio-sections.txt | 20 -------------------- docs/reference/gio/gio.types | 1 + gio/Makefile.am | 2 +- gio/gappinfo.h | 1 + gio/gapplication.c | 2 -- gio/gasynchelper.c | 2 +- 8 files changed, 6 insertions(+), 26 deletions(-) diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index cd247b908..96dcadb98 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -93,7 +93,7 @@ GTKDOC_LIBS = \ # Extra options to supply to gtkdoc-mkdb MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \ - --ignore-files=libasyncns + --ignore-files='libasyncns tests' # Images to copy into HTML directory HTML_IMAGES = \ diff --git a/docs/reference/gio/gdbus-codegen.xml b/docs/reference/gio/gdbus-codegen.xml index 3a741e65b..d13357d84 100644 --- a/docs/reference/gio/gdbus-codegen.xml +++ b/docs/reference/gio/gdbus-codegen.xml @@ -831,7 +831,7 @@ on_handle_hello_world (MyAppFrobber *interface, Please send bug reports to either the distribution bug tracker or the upstream bug tracker at - . + https://bugzilla.gnome.org/enter_bug.cgi?product=glib. diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt index 324d66cc2..87beb7706 100644 --- a/docs/reference/gio/gio-sections.txt +++ b/docs/reference/gio/gio-sections.txt @@ -2318,7 +2318,6 @@ G_CREDENTIALS_CLASS G_IS_CREDENTIALS_CLASS G_CREDENTIALS_GET_CLASS -GCredentialsPrivate g_credentials_get_type g_credentials_type_get_type @@ -2836,7 +2835,6 @@ g_action_group_action_state_changed g_action_group_get_type -GActionGroupPrivate G_TYPE_ACTION_GROUP G_IS_ACTION_GROUP G_ACTION_GROUP_GET_IFACE @@ -2885,13 +2883,9 @@ g_simple_action_set_enabled g_simple_action_set_state -GSimpleActionPrivate g_simple_action_get_type G_TYPE_SIMPLE_ACTION G_IS_SIMPLE_ACTION -G_SIMPLE_ACTION_CLASS -G_SIMPLE_ACTION_GET_CLASS -G_IS_SIMPLE_ACTION_CLASS G_SIMPLE_ACTION @@ -3231,7 +3225,6 @@ g_tls_password_flags_get_type g_tls_password_get_type G_IS_TLS_PASSWORD G_TLS_PASSWORD -G_TLS_PASSWORD_GET_INTERFACE G_TYPE_TLS_PASSWORD G_TYPE_TLS_PASSWORD_FLAGS @@ -3257,16 +3250,6 @@ G_TYPE_TLS_INTERACTION_RESULT GTlsInteractionPrivate g_tls_interaction_get_type g_tls_interaction_result_get_type -GTlsConsoleInteraction -GTlsConsoleInteractionClass -G_IS_TLS_CONSOLE_INTERACTION -G_IS_TLS_CONSOLE_INTERACTION_CLASS -g_tls_console_interaction_new -G_TLS_CONSOLE_INTERACTION -G_TYPE_TLS_CONSOLE_INTERACTION -G_TLS_CONSOLE_INTERACTION_CLASS -G_TLS_CONSOLE_INTERACTION_GET_CLASS -g_tls_console_interaction_get_type
@@ -3283,9 +3266,6 @@ G_IS_DBUS_INTERFACE G_TYPE_DBUS_INTERFACE g_dbus_interface_get_type G_DBUS_INTERFACE_GET_IFACE - -g_dbus_object_lookup_with_typecheck -g_dbus_object_peek_with_typecheck
diff --git a/docs/reference/gio/gio.types b/docs/reference/gio/gio.types index 336992b60..7ac9ee693 100644 --- a/docs/reference/gio/gio.types +++ b/docs/reference/gio/gio.types @@ -84,6 +84,7 @@ g_tls_client_connection_get_type g_tls_connection_get_type g_tls_database_get_type g_tls_file_database_get_type +g_tls_password_get_type g_tls_server_connection_get_type g_unix_connection_get_type g_unix_fd_list_get_type diff --git a/gio/Makefile.am b/gio/Makefile.am index ca73eb085..ed49e6215 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -579,7 +579,7 @@ BUILT_EXTRA_DIST = \ # This is read by gobject-introspection/misc/ and gtk-doc gio-public-headers.txt: Makefile - echo $(gioinclude_HEADERS) > $@.tmp && mv $@.tmp $@ + echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@ CLEANFILES = gio-public-headers.txt diff --git a/gio/gappinfo.h b/gio/gappinfo.h index d752d4482..bf4442075 100644 --- a/gio/gappinfo.h +++ b/gio/gappinfo.h @@ -79,6 +79,7 @@ typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate; * @do_delete: Deletes a #GAppInfo. Since 2.20 * @get_commandline: Gets the commandline for the #GAppInfo. Since 2.20 * @get_display_name: Gets the display name for the #GAppInfo. Since 2.24 + * @set_as_last_used_for_type: Sets the application as the last used. See g_app_info_set_as_last_used_for_type(). * * Application Information interface, for operating system portability. */ diff --git a/gio/gapplication.c b/gio/gapplication.c index da6392481..7055a739b 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -895,8 +895,6 @@ g_application_get_inactivity_timeout (GApplication *application) * used for next time g_application_release() drops the use count to * zero. Any timeouts currently in progress are not impacted. * - * Returns: the timeout, in milliseconds - * * Since: 2.28 **/ void diff --git a/gio/gasynchelper.c b/gio/gasynchelper.c index fb3d266e3..fa63dfee9 100644 --- a/gio/gasynchelper.c +++ b/gio/gasynchelper.c @@ -25,7 +25,7 @@ #include "gasynchelper.h" -/** +/*< private > * SECTION:gasynchelper * @short_description: Asynchronous Helper Functions * @include: gio/gio.h