diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 7d1ff7895..11dc5442d 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,10 @@ +Mon Nov 19 14:35:56 2001 Owen Taylor + + * *.h: Improve the detection of invalid includes by moving + the test outside the duplicate include guards. + + * gsourceclosure.c (g_source_set_closure): Doc fix. + Thu Nov 22 03:30:57 2001 Tim Janik * gvalue.h (G_TYPE_IS_VALUE): use g_type_check_is_value_type() diff --git a/gobject/gboxed.h b/gobject/gboxed.h index af26562b7..1645502f6 100644 --- a/gobject/gboxed.h +++ b/gobject/gboxed.h @@ -16,13 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ -#ifndef __G_BOXED_H__ -#define __G_BOXED_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_BOXED_H__ +#define __G_BOXED_H__ + #include G_BEGIN_DECLS diff --git a/gobject/gclosure.h b/gobject/gclosure.h index aa605404d..6dd67c6c4 100644 --- a/gobject/gclosure.h +++ b/gobject/gclosure.h @@ -16,13 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ -#ifndef __G_CLOSURE_H__ -#define __G_CLOSURE_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_CLOSURE_H__ +#define __G_CLOSURE_H__ + #include G_BEGIN_DECLS diff --git a/gobject/genums.h b/gobject/genums.h index ea2c4be87..edb21ab5c 100644 --- a/gobject/genums.h +++ b/gobject/genums.h @@ -16,13 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ -#ifndef __G_ENUMS_H__ -#define __G_ENUMS_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_ENUMS_H__ +#define __G_ENUMS_H__ + #include G_BEGIN_DECLS diff --git a/gobject/gobject.h b/gobject/gobject.h index cc5f3d7e7..ae70fbb45 100644 --- a/gobject/gobject.h +++ b/gobject/gobject.h @@ -16,13 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ -#ifndef __G_OBJECT_H__ -#define __G_OBJECT_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_OBJECT_H__ +#define __G_OBJECT_H__ + #include #include #include diff --git a/gobject/gparam.h b/gobject/gparam.h index 97ec62076..795785481 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -18,13 +18,13 @@ * * gparam.h: GParamSpec base class implementation */ -#ifndef __G_PARAM_H__ -#define __G_PARAM_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_PARAM_H__ +#define __G_PARAM_H__ + #include G_BEGIN_DECLS @@ -166,6 +166,11 @@ struct _GParamSpecTypeInfo GType g_param_type_register_static (const gchar *name, const GParamSpecTypeInfo *pspec_info); +/* For registering builting types */ +GType _g_param_type_register_static_constant (const gchar *name, + const GParamSpecTypeInfo *pspec_info, + GType opt_type); + /* --- protected --- */ gpointer g_param_spec_internal (GType param_type, diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h index 0a3bdf19f..6d354b738 100644 --- a/gobject/gparamspecs.h +++ b/gobject/gparamspecs.h @@ -18,13 +18,13 @@ * * gparamspecs.h: GLib default param specs */ -#ifndef __G_PARAMSPECS_H__ -#define __G_PARAMSPECS_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_PARAMSPECS_H__ +#define __G_PARAMSPECS_H__ + #include #include #include diff --git a/gobject/gsignal.h b/gobject/gsignal.h index 39cf580b7..a08a01d64 100644 --- a/gobject/gsignal.h +++ b/gobject/gsignal.h @@ -16,13 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ -#ifndef __G_SIGNAL_H__ -#define __G_SIGNAL_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_SIGNAL_H__ +#define __G_SIGNAL_H__ + #include #include #include diff --git a/gobject/gsourceclosure.c b/gobject/gsourceclosure.c index ff8e12df8..ac6724fe7 100644 --- a/gobject/gsourceclosure.c +++ b/gobject/gsourceclosure.c @@ -157,7 +157,7 @@ static GSourceCallbackFuncs closure_callback_funcs = { /** * g_source_set_closure: * @source: the source - * @func: a #GClosure + * @closure: a #GClosure * * Set the callback for a source as a #GClosure. * diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h index d017b72f9..6735d13eb 100644 --- a/gobject/gsourceclosure.h +++ b/gobject/gsourceclosure.h @@ -16,13 +16,12 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ - -#ifndef __G_SOURCECLOSURE_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_SOURCECLOSURE_H__ + #include G_BEGIN_DECLS diff --git a/gobject/gtype.h b/gobject/gtype.h index d8aac37a4..3f6599c53 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -16,13 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ -#ifndef __G_TYPE_H__ -#define __G_TYPE_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_TYPE_H__ +#define __G_TYPE_H__ + #include G_BEGIN_DECLS diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h index 4871f81b4..548283d41 100644 --- a/gobject/gtypemodule.h +++ b/gobject/gtypemodule.h @@ -16,14 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - -#ifndef __G_TYPE_MODULE_H__ -#define __G_TYPE_MODULE_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_TYPE_MODULE_H__ +#define __G_TYPE_MODULE_H__ + #include G_BEGIN_DECLS diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h index 26f495219..463f3a16e 100644 --- a/gobject/gtypeplugin.h +++ b/gobject/gtypeplugin.h @@ -16,13 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ -#ifndef __G_TYPE_PLUGIN_H__ -#define __G_TYPE_PLUGIN_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_TYPE_PLUGIN_H__ +#define __G_TYPE_PLUGIN_H__ + #include G_BEGIN_DECLS diff --git a/gobject/gvalue.h b/gobject/gvalue.h index 685bf3f61..3c4f23295 100644 --- a/gobject/gvalue.h +++ b/gobject/gvalue.h @@ -18,13 +18,13 @@ * * gvalue.h: generic GValue functions */ -#ifndef __G_VALUE_H__ -#define __G_VALUE_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_VALUE_H__ +#define __G_VALUE_H__ + #include G_BEGIN_DECLS diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h index 456962e3a..863d2c30b 100644 --- a/gobject/gvaluearray.h +++ b/gobject/gvaluearray.h @@ -18,13 +18,13 @@ * * gvaluearray.h: GLib array type holding GValues */ -#ifndef __G_VALUE_ARRAY_H__ -#define __G_VALUE_ARRAY_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_VALUE_ARRAY_H__ +#define __G_VALUE_ARRAY_H__ + #include diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h index 0423d5e05..4649bc856 100644 --- a/gobject/gvaluetypes.h +++ b/gobject/gvaluetypes.h @@ -18,13 +18,13 @@ * * gvaluetypes.h: GLib default values */ -#ifndef __G_VALUETYPES_H__ -#define __G_VALUETYPES_H__ - #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) #error "Only can be included directly." #endif +#ifndef __G_VALUETYPES_H__ +#define __G_VALUETYPES_H__ + #include G_BEGIN_DECLS