From adde752ec5a600a71f8c9acf1be032ab5f5de46c Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 12 Jul 2010 17:46:17 -0400 Subject: [PATCH] More docs fixes Remove the g*alias.h from the ignore lists Remove other old files from ignore lists Clean up gobject docs --- docs/reference/gio/Makefile.am | 2 -- docs/reference/glib/Makefile.am | 6 ------ docs/reference/gobject/Makefile.am | 2 +- gobject/gparamspecs.h | 2 ++ gobject/gvaluecollector.h | 7 ++++++- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index 5f6fc1b..ca9c84f 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -47,8 +47,6 @@ IGNORE_HFILES= \ ginotifyfilemonitor.h \ gio-marshal.h \ gio.h \ - gioalias.h \ - gioalias.h \ gkeyfilesettingsbackend.h \ gioenumtypes.h \ giomodule-priv.h \ diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am index 0ae9bc0..27fdf0b 100644 --- a/docs/reference/glib/Makefile.am +++ b/docs/reference/glib/Makefile.am @@ -24,10 +24,6 @@ CFILE_GLOB=$(top_srcdir)/glib/*.c $(top_srcdir)/gmodule/*.c # Headers to ignore IGNORE_HFILES= \ - build \ - gobject \ - gio \ - config.h \ gdatasetprivate.h \ glibintl.h \ gbsearcharray.h \ @@ -38,10 +34,8 @@ IGNORE_HFILES= \ gunichartables.h \ glib_trace.h \ libcharset.h \ - glibconfig-sysdefs.h \ gdebug.h \ gprintfint.h \ - galias.h \ gmirroringtable.h \ gscripttable.h \ glib-mirroring-tab \ diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am index f618d4e..da513c9 100644 --- a/docs/reference/gobject/Makefile.am +++ b/docs/reference/gobject/Makefile.am @@ -25,7 +25,7 @@ CFILE_GLOB=$(top_srcdir)/gobject/*.c # Headers to ignore IGNORE_HFILES = \ - gobjectalias.h \ + gobject_trace.h \ gatomicarray.h # CFLAGS and LDFLAGS for compiling scan program. Only needed diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h index a61d608..e6f817d 100644 --- a/gobject/gparamspecs.h +++ b/gobject/gparamspecs.h @@ -965,6 +965,8 @@ struct _GParamSpecVariant GParamSpec parent_instance; GVariantType *type; GVariant *default_value; + + /*< private >*/ gpointer padding[4]; }; diff --git a/gobject/gvaluecollector.h b/gobject/gvaluecollector.h index 163e7c7..b39b40d 100644 --- a/gobject/gvaluecollector.h +++ b/gobject/gvaluecollector.h @@ -51,10 +51,15 @@ enum /*< skip >*/ }; -/* vararg union holding actuall values collected +/* vararg union holding actual values collected */ /** * GTypeCValue: + * @v_int: the field for holding integer values + * @v_long: the field for holding long integer values + * @v_int64: the field for holding 64 bit integer values + * @v_double: the field for holding floating point values + * @v_pointer: the field for holding pointers * * A union holding one collected value. */ -- 2.7.4