[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header
[platform/upstream/glib.git] / gobject / gparamspecs.c
index 358041c..c48ae0c 100644 (file)
@@ -1,5 +1,6 @@
 /* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997, 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
+ * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
+ * Copyright (C) 2010 Christian Persch
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * MT safe
  */
 
-#include       "gparamspecs.h"
+#include "config.h"
+
+#include <string.h>
+
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
+#include "gparamspecs.h"
+#include "gtype-private.h"
+#include "gvaluecollector.h"
+
+#include "gvaluearray.h"
+
+
+/**
+ * SECTION:param_value_types
+ * @short_description: Standard Parameter and Value Types
+ * @see_also: #GParamSpec, #GValue, g_object_class_install_property().
+ * @title: Parameters and Values
+ *
+ * #GValue provides an abstract container structure which can be
+ * copied, transformed and compared while holding a value of any
+ * (derived) type, which is registered as a #GType with a
+ * #GTypeValueTable in its #GTypeInfo structure.  Parameter
+ * specifications for most value types can be created as #GParamSpec
+ * derived instances, to implement e.g. #GObject properties which
+ * operate on #GValue containers.
+ *
+ * Parameter names need to start with a letter (a-z or A-Z). Subsequent
+ * characters can be letters, numbers or a '-'.
+ * All other characters are replaced by a '-' during construction.
+ */
 
-#include       "gvaluecollector.h"
-#include       <string.h>
-#include       "../config.h"   /* for SIZEOF_LONG */
 
 #define        G_FLOAT_EPSILON         (1e-30)
 #define        G_DOUBLE_EPSILON        (1e-90)
@@ -33,7 +59,7 @@
 
 /* --- param spec functions --- */
 static void
-param_spec_char_init (GParamSpec *pspec)
+param_char_init (GParamSpec *pspec)
 {
   GParamSpecChar *cspec = G_PARAM_SPEC_CHAR (pspec);
   
@@ -62,7 +88,7 @@ param_char_validate (GParamSpec *pspec,
 }
 
 static void
-param_spec_uchar_init (GParamSpec *pspec)
+param_uchar_init (GParamSpec *pspec)
 {
   GParamSpecUChar *uspec = G_PARAM_SPEC_UCHAR (pspec);
   
@@ -109,7 +135,7 @@ param_boolean_validate (GParamSpec *pspec,
 }
 
 static void
-param_spec_int_init (GParamSpec *pspec)
+param_int_init (GParamSpec *pspec)
 {
   GParamSpecInt *ispec = G_PARAM_SPEC_INT (pspec);
   
@@ -149,7 +175,7 @@ param_int_values_cmp (GParamSpec   *pspec,
 }
 
 static void
-param_spec_uint_init (GParamSpec *pspec)
+param_uint_init (GParamSpec *pspec)
 {
   GParamSpecUInt *uspec = G_PARAM_SPEC_UINT (pspec);
   
@@ -189,7 +215,7 @@ param_uint_values_cmp (GParamSpec   *pspec,
 }
 
 static void
-param_spec_long_init (GParamSpec *pspec)
+param_long_init (GParamSpec *pspec)
 {
   GParamSpecLong *lspec = G_PARAM_SPEC_LONG (pspec);
   
@@ -234,7 +260,7 @@ param_long_values_cmp (GParamSpec   *pspec,
 }
 
 static void
-param_spec_ulong_init (GParamSpec *pspec)
+param_ulong_init (GParamSpec *pspec)
 {
   GParamSpecULong *uspec = G_PARAM_SPEC_ULONG (pspec);
   
@@ -278,7 +304,129 @@ param_ulong_values_cmp (GParamSpec   *pspec,
 }
 
 static void
-param_spec_enum_init (GParamSpec *pspec)
+param_int64_init (GParamSpec *pspec)
+{
+  GParamSpecInt64 *lspec = G_PARAM_SPEC_INT64 (pspec);
+  
+  lspec->minimum = G_MININT64;
+  lspec->maximum = G_MAXINT64;
+  lspec->default_value = 0;
+}
+
+static void
+param_int64_set_default (GParamSpec *pspec,
+                       GValue     *value)
+{
+  value->data[0].v_int64 = G_PARAM_SPEC_INT64 (pspec)->default_value;
+}
+
+static gboolean
+param_int64_validate (GParamSpec *pspec,
+                    GValue     *value)
+{
+  GParamSpecInt64 *lspec = G_PARAM_SPEC_INT64 (pspec);
+  gint64 oval = value->data[0].v_int64;
+  
+  value->data[0].v_int64 = CLAMP (value->data[0].v_int64, lspec->minimum, lspec->maximum);
+  
+  return value->data[0].v_int64 != oval;
+}
+
+static gint
+param_int64_values_cmp (GParamSpec   *pspec,
+                      const GValue *value1,
+                      const GValue *value2)
+{
+  if (value1->data[0].v_int64 < value2->data[0].v_int64)
+    return -1;
+  else
+    return value1->data[0].v_int64 > value2->data[0].v_int64;
+}
+
+static void
+param_uint64_init (GParamSpec *pspec)
+{
+  GParamSpecUInt64 *uspec = G_PARAM_SPEC_UINT64 (pspec);
+  
+  uspec->minimum = 0;
+  uspec->maximum = G_MAXUINT64;
+  uspec->default_value = 0;
+}
+
+static void
+param_uint64_set_default (GParamSpec *pspec,
+                        GValue     *value)
+{
+  value->data[0].v_uint64 = G_PARAM_SPEC_UINT64 (pspec)->default_value;
+}
+
+static gboolean
+param_uint64_validate (GParamSpec *pspec,
+                     GValue     *value)
+{
+  GParamSpecUInt64 *uspec = G_PARAM_SPEC_UINT64 (pspec);
+  guint64 oval = value->data[0].v_uint64;
+  
+  value->data[0].v_uint64 = CLAMP (value->data[0].v_uint64, uspec->minimum, uspec->maximum);
+  
+  return value->data[0].v_uint64 != oval;
+}
+
+static gint
+param_uint64_values_cmp (GParamSpec   *pspec,
+                       const GValue *value1,
+                       const GValue *value2)
+{
+  if (value1->data[0].v_uint64 < value2->data[0].v_uint64)
+    return -1;
+  else
+    return value1->data[0].v_uint64 > value2->data[0].v_uint64;
+}
+
+static void
+param_unichar_init (GParamSpec *pspec)
+{
+  GParamSpecUnichar *uspec = G_PARAM_SPEC_UNICHAR (pspec);
+  
+  uspec->default_value = 0;
+}
+
+static void
+param_unichar_set_default (GParamSpec *pspec,
+                        GValue     *value)
+{
+  value->data[0].v_uint = G_PARAM_SPEC_UNICHAR (pspec)->default_value;
+}
+
+static gboolean
+param_unichar_validate (GParamSpec *pspec,
+                       GValue     *value)
+{
+  gunichar oval = value->data[0].v_uint;
+  gboolean changed = FALSE;
+
+  if (!g_unichar_validate (oval))
+    {
+      value->data[0].v_uint = 0;
+      changed = TRUE;
+    }
+
+  return changed;
+}
+
+static gint
+param_unichar_values_cmp (GParamSpec   *pspec,
+                       const GValue *value1,
+                       const GValue *value2)
+{
+  if (value1->data[0].v_uint < value2->data[0].v_uint)
+    return -1;
+  else
+    return value1->data[0].v_uint > value2->data[0].v_uint;
+}
+
+static void
+param_enum_init (GParamSpec *pspec)
 {
   GParamSpecEnum *espec = G_PARAM_SPEC_ENUM (pspec);
   
@@ -287,7 +435,7 @@ param_spec_enum_init (GParamSpec *pspec)
 }
 
 static void
-param_spec_enum_finalize (GParamSpec *pspec)
+param_enum_finalize (GParamSpec *pspec)
 {
   GParamSpecEnum *espec = G_PARAM_SPEC_ENUM (pspec);
   GParamSpecClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_PARAM_ENUM));
@@ -323,7 +471,7 @@ param_enum_validate (GParamSpec *pspec,
 }
 
 static void
-param_spec_flags_init (GParamSpec *pspec)
+param_flags_init (GParamSpec *pspec)
 {
   GParamSpecFlags *fspec = G_PARAM_SPEC_FLAGS (pspec);
   
@@ -332,7 +480,7 @@ param_spec_flags_init (GParamSpec *pspec)
 }
 
 static void
-param_spec_flags_finalize (GParamSpec *pspec)
+param_flags_finalize (GParamSpec *pspec)
 {
   GParamSpecFlags *fspec = G_PARAM_SPEC_FLAGS (pspec);
   GParamSpecClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_PARAM_FLAGS));
@@ -369,11 +517,11 @@ param_flags_validate (GParamSpec *pspec,
 }
 
 static void
-param_spec_float_init (GParamSpec *pspec)
+param_float_init (GParamSpec *pspec)
 {
   GParamSpecFloat *fspec = G_PARAM_SPEC_FLOAT (pspec);
   
-  fspec->minimum = G_MINFLOAT;
+  fspec->minimum = -G_MAXFLOAT;
   fspec->maximum = G_MAXFLOAT;
   fspec->default_value = 0;
   fspec->epsilon = G_FLOAT_EPSILON;
@@ -412,11 +560,11 @@ param_float_values_cmp (GParamSpec   *pspec,
 }
 
 static void
-param_spec_double_init (GParamSpec *pspec)
+param_double_init (GParamSpec *pspec)
 {
   GParamSpecDouble *dspec = G_PARAM_SPEC_DOUBLE (pspec);
   
-  dspec->minimum = G_MINDOUBLE;
+  dspec->minimum = -G_MAXDOUBLE;
   dspec->maximum = G_MAXDOUBLE;
   dspec->default_value = 0;
   dspec->epsilon = G_DOUBLE_EPSILON;
@@ -455,7 +603,7 @@ param_double_values_cmp (GParamSpec   *pspec,
 }
 
 static void
-param_spec_string_init (GParamSpec *pspec)
+param_string_init (GParamSpec *pspec)
 {
   GParamSpecString *sspec = G_PARAM_SPEC_STRING (pspec);
   
@@ -468,7 +616,7 @@ param_spec_string_init (GParamSpec *pspec)
 }
 
 static void
-param_spec_string_finalize (GParamSpec *pspec)
+param_string_finalize (GParamSpec *pspec)
 {
   GParamSpecString *sspec = G_PARAM_SPEC_STRING (pspec);
   GParamSpecClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_PARAM_STRING));
@@ -504,6 +652,12 @@ param_string_validate (GParamSpec *pspec,
       
       if (sspec->cset_first && !strchr (sspec->cset_first, string[0]))
        {
+          if (value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS)
+            {
+              value->data[0].v_pointer = g_strdup (string);
+              string = value->data[0].v_pointer;
+              value->data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
+            }
          string[0] = sspec->substitutor;
          changed++;
        }
@@ -511,24 +665,35 @@ param_string_validate (GParamSpec *pspec,
        for (s = string + 1; *s; s++)
          if (!strchr (sspec->cset_nth, *s))
            {
+              if (value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS)
+                {
+                  value->data[0].v_pointer = g_strdup (string);
+                  s = (gchar*) value->data[0].v_pointer + (s - string);
+                  string = value->data[0].v_pointer;
+                  value->data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
+                }
              *s = sspec->substitutor;
              changed++;
            }
     }
   if (sspec->null_fold_if_empty && string && string[0] == 0)
     {
-      g_free (value->data[0].v_pointer);
+      if (!(value->data[1].v_uint & G_VALUE_NOCOPY_CONTENTS))
+        g_free (value->data[0].v_pointer);
+      else
+        value->data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
       value->data[0].v_pointer = NULL;
       changed++;
       string = value->data[0].v_pointer;
     }
   if (sspec->ensure_non_null && !string)
     {
+      value->data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
       value->data[0].v_pointer = g_strdup ("");
       changed++;
       string = value->data[0].v_pointer;
     }
-  
+
   return changed;
 }
 
@@ -546,7 +711,7 @@ param_string_values_cmp (GParamSpec   *pspec,
 }
 
 static void
-param_spec_param_init (GParamSpec *pspec)
+param_param_init (GParamSpec *pspec)
 {
   /* GParamSpecParam *spec = G_PARAM_SPEC_PARAM (pspec); */
 }
@@ -566,7 +731,7 @@ param_param_validate (GParamSpec *pspec,
   GParamSpec *param = value->data[0].v_pointer;
   guint changed = 0;
   
-  if (param && !g_type_is_a (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec)))
+  if (param && !g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec)))
     {
       g_param_spec_unref (param);
       value->data[0].v_pointer = NULL;
@@ -577,110 +742,229 @@ param_param_validate (GParamSpec *pspec,
 }
 
 static void
-param_spec_pointer_init (GParamSpec *pspec)
+param_boxed_init (GParamSpec *pspec)
 {
-  /* GParamSpecPointer *spec = G_PARAM_SPEC_POINTER (pspec); */
+  /* GParamSpecBoxed *bspec = G_PARAM_SPEC_BOXED (pspec); */
 }
 
 static void
-param_pointer_set_default (GParamSpec *pspec,
-                          GValue     *value)
+param_boxed_set_default (GParamSpec *pspec,
+                        GValue     *value)
 {
   value->data[0].v_pointer = NULL;
 }
 
 static gboolean
-param_pointer_validate (GParamSpec *pspec,
-                       GValue     *value)
+param_boxed_validate (GParamSpec *pspec,
+                     GValue     *value)
 {
-  /* GParamSpecPointer *spec = G_PARAM_SPEC_POINTER (pspec); */
+  /* GParamSpecBoxed *bspec = G_PARAM_SPEC_BOXED (pspec); */
   guint changed = 0;
+
+  /* can't do a whole lot here since we haven't even G_BOXED_TYPE() */
   
   return changed;
 }
 
 static gint
-param_pointer_values_cmp (GParamSpec   *pspec,
-                         const GValue *value1,
-                         const GValue *value2)
+param_boxed_values_cmp (GParamSpec    *pspec,
+                        const GValue *value1,
+                        const GValue *value2)
 {
-  return value1->data[0].v_pointer != value2->data[0].v_pointer;
+  guint8 *p1 = value1->data[0].v_pointer;
+  guint8 *p2 = value2->data[0].v_pointer;
+
+  /* not much to compare here, try to at least provide stable lesser/greater result */
+
+  return p1 < p2 ? -1 : p1 > p2;
 }
 
 static void
-param_spec_ccallback_init (GParamSpec *pspec)
+param_pointer_init (GParamSpec *pspec)
 {
-  /* GParamSpecCCallback *spec = G_PARAM_SPEC_CCALLBACK (pspec); */
+  /* GParamSpecPointer *spec = G_PARAM_SPEC_POINTER (pspec); */
 }
 
 static void
-param_ccallback_set_default (GParamSpec *pspec,
-                            GValue     *value)
+param_pointer_set_default (GParamSpec *pspec,
+                          GValue     *value)
 {
   value->data[0].v_pointer = NULL;
-  value->data[1].v_pointer = NULL;
 }
 
 static gboolean
-param_ccallback_validate (GParamSpec *pspec,
-                         GValue     *value)
+param_pointer_validate (GParamSpec *pspec,
+                       GValue     *value)
 {
-  /* GParamSpecCCallback *spec = G_PARAM_SPEC_CCALLBACK (pspec); */
+  /* GParamSpecPointer *spec = G_PARAM_SPEC_POINTER (pspec); */
   guint changed = 0;
   
   return changed;
 }
 
 static gint
-param_ccallback_values_cmp (GParamSpec   *pspec,
-                           const GValue *value1,
-                           const GValue *value2)
+param_pointer_values_cmp (GParamSpec   *pspec,
+                         const GValue *value1,
+                         const GValue *value2)
+{
+  guint8 *p1 = value1->data[0].v_pointer;
+  guint8 *p2 = value2->data[0].v_pointer;
+
+  /* not much to compare here, try to at least provide stable lesser/greater result */
+
+  return p1 < p2 ? -1 : p1 > p2;
+}
+
+static void
+param_value_array_init (GParamSpec *pspec)
+{
+  GParamSpecValueArray *aspec = G_PARAM_SPEC_VALUE_ARRAY (pspec);
+
+  aspec->element_spec = NULL;
+  aspec->fixed_n_elements = 0; /* disable */
+}
+
+static inline guint
+value_array_ensure_size (GValueArray *value_array,
+                        guint        fixed_n_elements)
 {
-  return (value1->data[0].v_pointer != value2->data[0].v_pointer ||
-         value1->data[1].v_pointer != value2->data[1].v_pointer);
+  guint changed = 0;
+
+  if (fixed_n_elements)
+    {
+      while (value_array->n_values < fixed_n_elements)
+       {
+         g_value_array_append (value_array, NULL);
+         changed++;
+       }
+      while (value_array->n_values > fixed_n_elements)
+       {
+         g_value_array_remove (value_array, value_array->n_values - 1);
+         changed++;
+       }
+    }
+  return changed;
 }
 
 static void
-param_spec_boxed_init (GParamSpec *pspec)
+param_value_array_finalize (GParamSpec *pspec)
 {
-  /* GParamSpecBoxed *bspec = G_PARAM_SPEC_BOXED (pspec); */
+  GParamSpecValueArray *aspec = G_PARAM_SPEC_VALUE_ARRAY (pspec);
+  GParamSpecClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_PARAM_VALUE_ARRAY));
+
+  if (aspec->element_spec)
+    {
+      g_param_spec_unref (aspec->element_spec);
+      aspec->element_spec = NULL;
+    }
+
+  parent_class->finalize (pspec);
 }
 
 static void
-param_boxed_set_default (GParamSpec *pspec,
-                        GValue     *value)
+param_value_array_set_default (GParamSpec *pspec,
+                              GValue     *value)
 {
-  value->data[0].v_pointer = NULL;
+  GParamSpecValueArray *aspec = G_PARAM_SPEC_VALUE_ARRAY (pspec);
+
+  if (!value->data[0].v_pointer && aspec->fixed_n_elements)
+    value->data[0].v_pointer = g_value_array_new (aspec->fixed_n_elements);
+
+  if (value->data[0].v_pointer)
+    {
+      /* g_value_reset (value);  already done */
+      value_array_ensure_size (value->data[0].v_pointer, aspec->fixed_n_elements);
+    }
 }
 
 static gboolean
-param_boxed_validate (GParamSpec *pspec,
-                     GValue     *value)
+param_value_array_validate (GParamSpec *pspec,
+                           GValue     *value)
 {
-  /* GParamSpecBoxed *bspec = G_PARAM_SPEC_BOXED (pspec); */
+  GParamSpecValueArray *aspec = G_PARAM_SPEC_VALUE_ARRAY (pspec);
+  GValueArray *value_array = value->data[0].v_pointer;
   guint changed = 0;
 
-  /* can't do a whole lot here since we haven't even G_BOXED_TYPE() */
-  
+  if (!value->data[0].v_pointer && aspec->fixed_n_elements)
+    value->data[0].v_pointer = g_value_array_new (aspec->fixed_n_elements);
+
+  if (value->data[0].v_pointer)
+    {
+      /* ensure array size validity */
+      changed += value_array_ensure_size (value_array, aspec->fixed_n_elements);
+      
+      /* ensure array values validity against a present element spec */
+      if (aspec->element_spec)
+       {
+         GParamSpec *element_spec = aspec->element_spec;
+         guint i;
+         
+         for (i = 0; i < value_array->n_values; i++)
+           {
+             GValue *element = value_array->values + i;
+             
+             /* need to fixup value type, or ensure that the array value is initialized at all */
+             if (!g_value_type_compatible (G_VALUE_TYPE (element), G_PARAM_SPEC_VALUE_TYPE (element_spec)))
+               {
+                 if (G_VALUE_TYPE (element) != 0)
+                   g_value_unset (element);
+                 g_value_init (element, G_PARAM_SPEC_VALUE_TYPE (element_spec));
+                 g_param_value_set_default (element_spec, element);
+                 changed++;
+               }
+             /* validate array value against element_spec */
+             changed += g_param_value_validate (element_spec, element);
+           }
+       }
+    }
+
   return changed;
 }
 
 static gint
-param_boxed_values_cmp (GParamSpec    *pspec,
-                        const GValue *value1,
-                        const GValue *value2)
+param_value_array_values_cmp (GParamSpec   *pspec,
+                             const GValue *value1,
+                             const GValue *value2)
 {
-  return value1->data[0].v_pointer != value2->data[0].v_pointer;
-}
+  GParamSpecValueArray *aspec = G_PARAM_SPEC_VALUE_ARRAY (pspec);
+  GValueArray *value_array1 = value1->data[0].v_pointer;
+  GValueArray *value_array2 = value2->data[0].v_pointer;
 
-static void
-param_spec_object_init (GParamSpec *pspec)
-{
-  /* GParamSpecObject *ospec = G_PARAM_SPEC_OBJECT (pspec); */
+  if (!value_array1 || !value_array2)
+    return value_array2 ? -1 : value_array1 != value_array2;
+
+  if (value_array1->n_values != value_array2->n_values)
+    return value_array1->n_values < value_array2->n_values ? -1 : 1;
+  else if (!aspec->element_spec)
+    {
+      /* we need an element specification for comparisons, so there's not much
+       * to compare here, try to at least provide stable lesser/greater result
+       */
+      return value_array1->n_values < value_array2->n_values ? -1 : value_array1->n_values > value_array2->n_values;
+    }
+  else /* value_array1->n_values == value_array2->n_values */
+    {
+      guint i;
+
+      for (i = 0; i < value_array1->n_values; i++)
+       {
+         GValue *element1 = value_array1->values + i;
+         GValue *element2 = value_array2->values + i;
+         gint cmp;
+
+         /* need corresponding element types, provide stable result otherwise */
+         if (G_VALUE_TYPE (element1) != G_VALUE_TYPE (element2))
+           return G_VALUE_TYPE (element1) < G_VALUE_TYPE (element2) ? -1 : 1;
+         cmp = g_param_values_cmp (aspec->element_spec, element1, element2);
+         if (cmp)
+           return cmp;
+       }
+      return 0;
+    }
 }
 
 static void
-param_spec_interface_init (GParamSpec *pspec)
+param_object_init (GParamSpec *pspec)
 {
   /* GParamSpecObject *ospec = G_PARAM_SPEC_OBJECT (pspec); */
 }
@@ -700,7 +984,7 @@ param_object_validate (GParamSpec *pspec,
   GObject *object = value->data[0].v_pointer;
   guint changed = 0;
   
-  if (object && !g_type_is_a (G_OBJECT_TYPE (object), G_PARAM_SPEC_VALUE_TYPE (ospec)))
+  if (object && !g_value_type_compatible (G_OBJECT_TYPE (object), G_PARAM_SPEC_VALUE_TYPE (ospec)))
     {
       g_object_unref (object);
       value->data[0].v_pointer = NULL;
@@ -715,169 +999,177 @@ param_object_values_cmp (GParamSpec   *pspec,
                         const GValue *value1,
                         const GValue *value2)
 {
-  return value1->data[0].v_pointer != value2->data[0].v_pointer;
-}
-
-static void
-param_interface_set_default (GParamSpec *pspec,
-                            GValue     *value)
-{
-  value->data[0].v_pointer = NULL;
-}
-
-static gboolean
-param_interface_validate (GParamSpec *pspec,
-                         GValue     *value)
-{
-  guint changed = 0;
-  
-  if (value->data[0].v_pointer == NULL)
-    changed++;
+  guint8 *p1 = value1->data[0].v_pointer;
+  guint8 *p2 = value2->data[0].v_pointer;
 
-  return changed;
-}
+  /* not much to compare here, try to at least provide stable lesser/greater result */
 
-static gint
-param_interface_values_cmp (GParamSpec   *pspec,
-                           const GValue *value1,
-                           const GValue *value2)
-{
-  return value1->data[0].v_pointer != value2->data[0].v_pointer;
+  return p1 < p2 ? -1 : p1 > p2;
 }
 
 static void
-value_exch_memcpy (GValue *value1,
-                  GValue *value2)
+param_override_init (GParamSpec *pspec)
 {
-  GValue tmp_value;
-  memcpy (&tmp_value.data, &value1->data, sizeof (value1->data));
-  memcpy (&value1->data, &value2->data, sizeof (value1->data));
-  memcpy (&value2->data, &tmp_value.data, sizeof (value2->data));
+  /* GParamSpecOverride *ospec = G_PARAM_SPEC_OVERRIDE (pspec); */
 }
 
 static void
-value_exch_long_int (GValue *value1,
-                    GValue *value2)
+param_override_finalize (GParamSpec *pspec)
 {
-  glong tmp = value1->data[0].v_long;
-  value1->data[0].v_long = value2->data[0].v_int;
-  value2->data[0].v_int = tmp;
+  GParamSpecOverride *ospec = G_PARAM_SPEC_OVERRIDE (pspec);
+  GParamSpecClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_PARAM_OVERRIDE));
+  
+  if (ospec->overridden)
+    {
+      g_param_spec_unref (ospec->overridden);
+      ospec->overridden = NULL;
+    }
+  
+  parent_class->finalize (pspec);
 }
 
 static void
-value_exch_long_uint (GValue *value1,
-                     GValue *value2)
+param_override_set_default (GParamSpec *pspec,
+                           GValue     *value)
 {
-  glong tmp = value1->data[0].v_long;
-  value1->data[0].v_long = value2->data[0].v_uint;
-  value2->data[0].v_uint = tmp;
+  GParamSpecOverride *ospec = G_PARAM_SPEC_OVERRIDE (pspec);
+
+  g_param_value_set_default (ospec->overridden, value);
 }
 
-static void
-value_exch_ulong_int (GValue *value1,
-                     GValue *value2)
+static gboolean
+param_override_validate (GParamSpec *pspec,
+                        GValue     *value)
 {
-  gulong tmp = value1->data[0].v_ulong;
-  value1->data[0].v_ulong = value2->data[0].v_int;
-  value2->data[0].v_int = tmp;
+  GParamSpecOverride *ospec = G_PARAM_SPEC_OVERRIDE (pspec);
+  
+  return g_param_value_validate (ospec->overridden, value);
 }
 
-static void
-value_exch_ulong_uint (GValue *value1,
-                      GValue *value2)
+static gint
+param_override_values_cmp (GParamSpec   *pspec,
+                          const GValue *value1,
+                          const GValue *value2)
 {
-  gulong tmp = value1->data[0].v_ulong;
-  value1->data[0].v_ulong = value2->data[0].v_uint;
-  value2->data[0].v_uint = tmp;
+  GParamSpecOverride *ospec = G_PARAM_SPEC_OVERRIDE (pspec);
+
+  return g_param_values_cmp (ospec->overridden, value1, value2);
 }
 
 static void
-value_exch_float_int (GValue *value1,
-                     GValue *value2)
+param_gtype_init (GParamSpec *pspec)
 {
-  gfloat tmp = value1->data[0].v_float;
-  value1->data[0].v_float = value2->data[0].v_int;
-  value2->data[0].v_int = 0.5 + tmp;
 }
 
 static void
-value_exch_float_uint (GValue *value1,
-                      GValue *value2)
+param_gtype_set_default (GParamSpec *pspec,
+                        GValue     *value)
 {
-  gfloat tmp = value1->data[0].v_float;
-  value1->data[0].v_float = value2->data[0].v_uint;
-  value2->data[0].v_uint = 0.5 + tmp;
+  GParamSpecGType *tspec = G_PARAM_SPEC_GTYPE (pspec);
+
+  value->data[0].v_long = tspec->is_a_type;
 }
 
-static void
-value_exch_float_long (GValue *value1,
-                      GValue *value2)
+static gboolean
+param_gtype_validate (GParamSpec *pspec,
+                     GValue     *value)
 {
-  gfloat tmp = value1->data[0].v_float;
-  value1->data[0].v_float = value2->data[0].v_long;
-  value2->data[0].v_long = 0.5 + tmp;
+  GParamSpecGType *tspec = G_PARAM_SPEC_GTYPE (pspec);
+  GType gtype = value->data[0].v_long;
+  guint changed = 0;
+  
+  if (tspec->is_a_type != G_TYPE_NONE && !g_type_is_a (gtype, tspec->is_a_type))
+    {
+      value->data[0].v_long = tspec->is_a_type;
+      changed++;
+    }
+  
+  return changed;
 }
 
-static void
-value_exch_float_ulong (GValue *value1,
-                       GValue *value2)
+static gint
+param_gtype_values_cmp (GParamSpec   *pspec,
+                       const GValue *value1,
+                       const GValue *value2)
 {
-  gfloat tmp = value1->data[0].v_float;
-  value1->data[0].v_float = value2->data[0].v_ulong;
-  value2->data[0].v_ulong = 0.5 + tmp;
+  GType p1 = value1->data[0].v_long;
+  GType p2 = value2->data[0].v_long;
+
+  /* not much to compare here, try to at least provide stable lesser/greater result */
+
+  return p1 < p2 ? -1 : p1 > p2;
 }
 
 static void
-value_exch_double_int (GValue *value1,
-                      GValue *value2)
+param_variant_init (GParamSpec *pspec)
 {
-  gdouble tmp = value1->data[0].v_double;
-  value1->data[0].v_double = value2->data[0].v_int;
-  value2->data[0].v_int = 0.5 + tmp;
+  GParamSpecVariant *vspec = G_PARAM_SPEC_VARIANT (pspec);
+
+  vspec->type = NULL;
+  vspec->default_value = NULL;
 }
 
 static void
-value_exch_double_uint (GValue *value1,
-                       GValue *value2)
+param_variant_finalize (GParamSpec *pspec)
 {
-  gdouble tmp = value1->data[0].v_double;
-  value1->data[0].v_double = value2->data[0].v_uint;
-  value2->data[0].v_uint = 0.5 + tmp;
+  GParamSpecVariant *vspec = G_PARAM_SPEC_VARIANT (pspec);
+  GParamSpecClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_PARAM_VARIANT));
+
+  if (vspec->default_value)
+    g_variant_unref (vspec->default_value);
+  g_variant_type_free (vspec->type);
+
+  parent_class->finalize (pspec);
 }
 
 static void
-value_exch_double_long (GValue *value1,
-                       GValue *value2)
+param_variant_set_default (GParamSpec *pspec,
+                           GValue     *value)
 {
-  gdouble tmp = value1->data[0].v_double;
-  value1->data[0].v_double = value2->data[0].v_long;
-  value2->data[0].v_long = 0.5 + tmp;
+  value->data[0].v_pointer = G_PARAM_SPEC_VARIANT (pspec)->default_value;
+  value->data[1].v_uint |= G_VALUE_NOCOPY_CONTENTS;
 }
 
-static void
-value_exch_double_ulong (GValue *value1,
-                        GValue *value2)
+static gboolean
+param_variant_validate (GParamSpec *pspec,
+                        GValue     *value)
 {
-  gdouble tmp = value1->data[0].v_double;
-  value1->data[0].v_double = value2->data[0].v_ulong;
-  value2->data[0].v_ulong = 0.5 + tmp;
+  GParamSpecVariant *vspec = G_PARAM_SPEC_VARIANT (pspec);
+  GVariant *variant = value->data[0].v_pointer;
+
+  if ((variant == NULL && vspec->default_value != NULL) ||
+      (variant != NULL && !g_variant_is_of_type (variant, vspec->type)))
+    {
+      g_param_value_set_default (pspec, value);
+      return TRUE;
+    }
+
+  return FALSE;
 }
 
-static void
-value_exch_double_float (GValue *value1,
-                        GValue *value2)
+static gint
+param_variant_values_cmp (GParamSpec   *pspec,
+                          const GValue *value1,
+                          const GValue *value2)
 {
-  gdouble tmp = value1->data[0].v_double;
-  value1->data[0].v_double = value2->data[0].v_float;
-  value2->data[0].v_float = tmp;
-}
+  GVariant *v1 = value1->data[0].v_pointer;
+  GVariant *v2 = value2->data[0].v_pointer;
 
+  return v1 < v2 ? -1 : v2 > v1;
+}
 
 /* --- type initialization --- */
+GType *g_param_spec_types = NULL;
+
 void
-g_param_spec_types_init (void) /* sync with gtype.c */
+_g_param_spec_types_init (void)        
 {
-  GType type;
+  const guint n_types = 23;
+  GType type, *spec_types, *spec_types_bound;
+
+  g_param_spec_types = g_new0 (GType, n_types);
+  spec_types = g_param_spec_types;
+  spec_types_bound = g_param_spec_types + n_types;
   
   /* G_TYPE_PARAM_CHAR
    */
@@ -885,14 +1177,15 @@ g_param_spec_types_init (void)   /* sync with gtype.c */
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecChar), /* instance_size */
       16,                      /* n_preallocs */
-      param_spec_char_init,    /* instance_init */
+      param_char_init,         /* instance_init */
       G_TYPE_CHAR,             /* value_type */
       NULL,                    /* finalize */
       param_char_set_default,  /* value_set_default */
       param_char_validate,     /* value_validate */
       param_int_values_cmp,    /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamChar", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamChar"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_CHAR);
   }
   
@@ -902,14 +1195,15 @@ g_param_spec_types_init (void)   /* sync with gtype.c */
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecUChar), /* instance_size */
       16,                       /* n_preallocs */
-      param_spec_uchar_init,    /* instance_init */
+      param_uchar_init,         /* instance_init */
       G_TYPE_UCHAR,            /* value_type */
       NULL,                    /* finalize */
       param_uchar_set_default, /* value_set_default */
       param_uchar_validate,    /* value_validate */
       param_uint_values_cmp,   /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamUChar", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamUChar"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_UCHAR);
   }
   
@@ -926,7 +1220,8 @@ g_param_spec_types_init (void)     /* sync with gtype.c */
       param_boolean_validate,     /* value_validate */
       param_int_values_cmp,       /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamBoolean", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamBoolean"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_BOOLEAN);
   }
   
@@ -936,14 +1231,15 @@ g_param_spec_types_init (void)   /* sync with gtype.c */
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecInt),   /* instance_size */
       16,                       /* n_preallocs */
-      param_spec_int_init,      /* instance_init */
+      param_int_init,           /* instance_init */
       G_TYPE_INT,              /* value_type */
       NULL,                    /* finalize */
       param_int_set_default,   /* value_set_default */
       param_int_validate,      /* value_validate */
       param_int_values_cmp,    /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamInt", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamInt"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_INT);
   }
   
@@ -953,14 +1249,15 @@ g_param_spec_types_init (void)   /* sync with gtype.c */
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecUInt),  /* instance_size */
       16,                       /* n_preallocs */
-      param_spec_uint_init,     /* instance_init */
+      param_uint_init,          /* instance_init */
       G_TYPE_UINT,             /* value_type */
       NULL,                    /* finalize */
       param_uint_set_default,  /* value_set_default */
       param_uint_validate,     /* value_validate */
       param_uint_values_cmp,   /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamUInt", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamUInt"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_UINT);
   }
   
@@ -970,14 +1267,15 @@ g_param_spec_types_init (void)   /* sync with gtype.c */
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecLong),  /* instance_size */
       16,                       /* n_preallocs */
-      param_spec_long_init,     /* instance_init */
+      param_long_init,          /* instance_init */
       G_TYPE_LONG,             /* value_type */
       NULL,                    /* finalize */
       param_long_set_default,  /* value_set_default */
       param_long_validate,     /* value_validate */
       param_long_values_cmp,   /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamLong", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamLong"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_LONG);
   }
   
@@ -987,31 +1285,87 @@ g_param_spec_types_init (void)   /* sync with gtype.c */
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecULong), /* instance_size */
       16,                       /* n_preallocs */
-      param_spec_ulong_init,    /* instance_init */
+      param_ulong_init,         /* instance_init */
       G_TYPE_ULONG,            /* value_type */
       NULL,                    /* finalize */
       param_ulong_set_default, /* value_set_default */
       param_ulong_validate,    /* value_validate */
       param_ulong_values_cmp,  /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamULong", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamULong"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_ULONG);
   }
-  
-  /* G_TYPE_PARAM_ENUM
+
+  /* G_TYPE_PARAM_INT64
    */
   {
     static const GParamSpecTypeInfo pspec_info = {
-      sizeof (GParamSpecEnum),  /* instance_size */
+      sizeof (GParamSpecInt64),  /* instance_size */
       16,                       /* n_preallocs */
-      param_spec_enum_init,     /* instance_init */
-      G_TYPE_ENUM,             /* value_type */
-      param_spec_enum_finalize,        /* finalize */
+      param_int64_init,         /* instance_init */
+      G_TYPE_INT64,            /* value_type */
+      NULL,                    /* finalize */
+      param_int64_set_default, /* value_set_default */
+      param_int64_validate,    /* value_validate */
+      param_int64_values_cmp,  /* values_cmp */
+    };
+    type = g_param_type_register_static (g_intern_static_string ("GParamInt64"), &pspec_info);
+    *spec_types++ = type;
+    g_assert (type == G_TYPE_PARAM_INT64);
+  }
+  
+  /* G_TYPE_PARAM_UINT64
+   */
+  {
+    static const GParamSpecTypeInfo pspec_info = {
+      sizeof (GParamSpecUInt64), /* instance_size */
+      16,                       /* n_preallocs */
+      param_uint64_init,        /* instance_init */
+      G_TYPE_UINT64,           /* value_type */
+      NULL,                    /* finalize */
+      param_uint64_set_default,        /* value_set_default */
+      param_uint64_validate,   /* value_validate */
+      param_uint64_values_cmp, /* values_cmp */
+    };
+    type = g_param_type_register_static (g_intern_static_string ("GParamUInt64"), &pspec_info);
+    *spec_types++ = type;
+    g_assert (type == G_TYPE_PARAM_UINT64);
+  }
+
+  /* G_TYPE_PARAM_UNICHAR
+   */
+  {
+    static const GParamSpecTypeInfo pspec_info = {
+      sizeof (GParamSpecUnichar), /* instance_size */
+      16,                        /* n_preallocs */
+      param_unichar_init,       /* instance_init */
+      G_TYPE_UINT,              /* value_type */
+      NULL,                     /* finalize */
+      param_unichar_set_default, /* value_set_default */
+      param_unichar_validate,   /* value_validate */
+      param_unichar_values_cmp,         /* values_cmp */
+    };
+    type = g_param_type_register_static (g_intern_static_string ("GParamUnichar"), &pspec_info);
+    *spec_types++ = type;
+    g_assert (type == G_TYPE_PARAM_UNICHAR);
+  }
+
+ /* G_TYPE_PARAM_ENUM
+   */
+  {
+    static const GParamSpecTypeInfo pspec_info = {
+      sizeof (GParamSpecEnum),  /* instance_size */
+      16,                       /* n_preallocs */
+      param_enum_init,          /* instance_init */
+      G_TYPE_ENUM,             /* value_type */
+      param_enum_finalize,     /* finalize */
       param_enum_set_default,  /* value_set_default */
       param_enum_validate,     /* value_validate */
       param_long_values_cmp,   /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamEnum", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamEnum"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_ENUM);
   }
   
@@ -1019,16 +1373,17 @@ g_param_spec_types_init (void)  /* sync with gtype.c */
    */
   {
     static const GParamSpecTypeInfo pspec_info = {
-      sizeof (GParamSpecFlags), /* instance_size */
-      16,                       /* n_preallocs */
-      param_spec_flags_init,    /* instance_init */
+      sizeof (GParamSpecFlags),        /* instance_size */
+      16,                      /* n_preallocs */
+      param_flags_init,                /* instance_init */
       G_TYPE_FLAGS,            /* value_type */
-      param_spec_flags_finalize,/* finalize */
+      param_flags_finalize,    /* finalize */
       param_flags_set_default, /* value_set_default */
       param_flags_validate,    /* value_validate */
       param_ulong_values_cmp,  /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamFlags", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamFlags"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_FLAGS);
   }
   
@@ -1038,14 +1393,15 @@ g_param_spec_types_init (void)  /* sync with gtype.c */
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecFloat), /* instance_size */
       16,                       /* n_preallocs */
-      param_spec_float_init,    /* instance_init */
+      param_float_init,         /* instance_init */
       G_TYPE_FLOAT,            /* value_type */
       NULL,                    /* finalize */
       param_float_set_default, /* value_set_default */
       param_float_validate,    /* value_validate */
       param_float_values_cmp,  /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamFloat", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamFloat"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_FLOAT);
   }
   
@@ -1053,16 +1409,17 @@ g_param_spec_types_init (void)  /* sync with gtype.c */
    */
   {
     static const GParamSpecTypeInfo pspec_info = {
-      sizeof (GParamSpecDouble), /* instance_size */
-      16,                        /* n_preallocs */
-      param_spec_double_init,    /* instance_init */
-      G_TYPE_DOUBLE,            /* value_type */
-      NULL,                     /* finalize */
-      param_double_set_default,         /* value_set_default */
-      param_double_validate,    /* value_validate */
-      param_double_values_cmp,  /* values_cmp */
+      sizeof (GParamSpecDouble),       /* instance_size */
+      16,                              /* n_preallocs */
+      param_double_init,               /* instance_init */
+      G_TYPE_DOUBLE,                   /* value_type */
+      NULL,                            /* finalize */
+      param_double_set_default,                /* value_set_default */
+      param_double_validate,           /* value_validate */
+      param_double_values_cmp,         /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamDouble", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamDouble"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_DOUBLE);
   }
   
@@ -1070,16 +1427,17 @@ g_param_spec_types_init (void)  /* sync with gtype.c */
    */
   {
     static const GParamSpecTypeInfo pspec_info = {
-      sizeof (GParamSpecString),  /* instance_size */
-      16,                        /* n_preallocs */
-      param_spec_string_init,    /* instance_init */
-      G_TYPE_STRING,             /* value_type */
-      param_spec_string_finalize, /* finalize */
-      param_string_set_default,          /* value_set_default */
-      param_string_validate,     /* value_validate */
-      param_string_values_cmp,   /* values_cmp */
+      sizeof (GParamSpecString),       /* instance_size */
+      16,                              /* n_preallocs */
+      param_string_init,               /* instance_init */
+      G_TYPE_STRING,                   /* value_type */
+      param_string_finalize,           /* finalize */
+      param_string_set_default,                /* value_set_default */
+      param_string_validate,           /* value_validate */
+      param_string_values_cmp,         /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamString", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamString"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_STRING);
   }
   
@@ -1087,68 +1445,73 @@ g_param_spec_types_init (void)  /* sync with gtype.c */
    */
   {
     static const GParamSpecTypeInfo pspec_info = {
-      sizeof (GParamSpecParam),  /* instance_size */
-      16,                        /* n_preallocs */
-      param_spec_param_init,     /* instance_init */
-      G_TYPE_PARAM,             /* value_type */
-      NULL,                     /* finalize */
-      param_param_set_default,  /* value_set_default */
-      param_param_validate,     /* value_validate */
-      param_pointer_values_cmp,         /* values_cmp */
+      sizeof (GParamSpecParam),        /* instance_size */
+      16,                      /* n_preallocs */
+      param_param_init,                /* instance_init */
+      G_TYPE_PARAM,            /* value_type */
+      NULL,                    /* finalize */
+      param_param_set_default, /* value_set_default */
+      param_param_validate,    /* value_validate */
+      param_pointer_values_cmp,        /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamParam", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamParam"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_PARAM);
   }
   
+  /* G_TYPE_PARAM_BOXED
+   */
+  {
+    static const GParamSpecTypeInfo pspec_info = {
+      sizeof (GParamSpecBoxed),        /* instance_size */
+      4,                       /* n_preallocs */
+      param_boxed_init,                /* instance_init */
+      G_TYPE_BOXED,            /* value_type */
+      NULL,                    /* finalize */
+      param_boxed_set_default, /* value_set_default */
+      param_boxed_validate,    /* value_validate */
+      param_boxed_values_cmp,  /* values_cmp */
+    };
+    type = g_param_type_register_static (g_intern_static_string ("GParamBoxed"), &pspec_info);
+    *spec_types++ = type;
+    g_assert (type == G_TYPE_PARAM_BOXED);
+  }
+
   /* G_TYPE_PARAM_POINTER
    */
   {
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecPointer),  /* instance_size */
       0,                           /* n_preallocs */
-      param_spec_pointer_init,     /* instance_init */
+      param_pointer_init,         /* instance_init */
       G_TYPE_POINTER,                     /* value_type */
       NULL,                       /* finalize */
       param_pointer_set_default,   /* value_set_default */
       param_pointer_validate,     /* value_validate */
       param_pointer_values_cmp,           /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamPointer", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamPointer"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_POINTER);
   }
   
-  /* G_TYPE_PARAM_CCALLBACK
+  /* G_TYPE_PARAM_VALUE_ARRAY
    */
   {
-    static const GParamSpecTypeInfo pspec_info = {
-      sizeof (GParamSpecCCallback), /* instance_size */
-      0,                            /* n_preallocs */
-      param_spec_ccallback_init,    /* instance_init */
-      G_TYPE_CCALLBACK,                    /* value_type */
-      NULL,                        /* finalize */
-      param_ccallback_set_default,  /* value_set_default */
-      param_ccallback_validate,            /* value_validate */
-      param_ccallback_values_cmp,   /* values_cmp */
+    static /* const */ GParamSpecTypeInfo pspec_info = {
+      sizeof (GParamSpecValueArray),   /* instance_size */
+      0,                               /* n_preallocs */
+      param_value_array_init,          /* instance_init */
+      0xdeadbeef,                      /* value_type, assigned further down */
+      param_value_array_finalize,      /* finalize */
+      param_value_array_set_default,   /* value_set_default */
+      param_value_array_validate,      /* value_validate */
+      param_value_array_values_cmp,    /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamCCallback", &pspec_info);
-    g_assert (type == G_TYPE_PARAM_CCALLBACK);
-  }
-  
-  /* G_TYPE_PARAM_BOXED
-   */
-  {
-    static const GParamSpecTypeInfo pspec_info = {
-      sizeof (GParamSpecBoxed),  /* instance_size */
-      4,                         /* n_preallocs */
-      param_spec_boxed_init,     /* instance_init */
-      G_TYPE_BOXED,             /* value_type */
-      NULL,                     /* finalize */
-      param_boxed_set_default,  /* value_set_default */
-      param_boxed_validate,     /* value_validate */
-      param_boxed_values_cmp,   /* values_cmp */
-    };
-    type = g_param_type_register_static ("GParamBoxed", &pspec_info);
-    g_assert (type == G_TYPE_PARAM_BOXED);
+    pspec_info.value_type = G_TYPE_VALUE_ARRAY;
+    type = g_param_type_register_static (g_intern_static_string ("GParamValueArray"), &pspec_info);
+    *spec_types++ = type;
+    g_assert (type == G_TYPE_PARAM_VALUE_ARRAY);
   }
 
   /* G_TYPE_PARAM_OBJECT
@@ -1157,93 +1520,92 @@ g_param_spec_types_init (void)  /* sync with gtype.c */
     static const GParamSpecTypeInfo pspec_info = {
       sizeof (GParamSpecObject), /* instance_size */
       16,                        /* n_preallocs */
-      param_spec_object_init,    /* instance_init */
+      param_object_init,        /* instance_init */
       G_TYPE_OBJECT,            /* value_type */
       NULL,                     /* finalize */
       param_object_set_default,         /* value_set_default */
       param_object_validate,    /* value_validate */
       param_object_values_cmp,  /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamObject", &pspec_info);
+    type = g_param_type_register_static (g_intern_static_string ("GParamObject"), &pspec_info);
+    *spec_types++ = type;
     g_assert (type == G_TYPE_PARAM_OBJECT);
   }
 
-  /* G_TYPE_PARAM_INTERFACE
+  /* G_TYPE_PARAM_OVERRIDE
    */
   {
     static const GParamSpecTypeInfo pspec_info = {
-      sizeof (GParamSpecInterface),    /* instance_size */
-      4,                               /* n_preallocs */
-      param_spec_interface_init,       /* instance_init */
-      G_TYPE_INTERFACE,                        /* value_type */
-      NULL,                            /* finalize */
-      param_interface_set_default,     /* value_set_default */
-      param_interface_validate,                /* value_validate */
-      param_interface_values_cmp,      /* values_cmp */
+      sizeof (GParamSpecOverride), /* instance_size */
+      16,                        /* n_preallocs */
+      param_override_init,      /* instance_init */
+      G_TYPE_NONE,              /* value_type */
+      param_override_finalize,  /* finalize */
+      param_override_set_default, /* value_set_default */
+      param_override_validate,   /* value_validate */
+      param_override_values_cmp,  /* values_cmp */
     };
-    type = g_param_type_register_static ("GParamInterface", &pspec_info);
-    g_assert (type == G_TYPE_PARAM_INTERFACE);
+    type = g_param_type_register_static (g_intern_static_string ("GParamOverride"), &pspec_info);
+    *spec_types++ = type;
+    g_assert (type == G_TYPE_PARAM_OVERRIDE);
+  }
+
+  /* G_TYPE_PARAM_GTYPE
+   */
+  {
+    GParamSpecTypeInfo pspec_info = {
+      sizeof (GParamSpecGType),        /* instance_size */
+      0,                       /* n_preallocs */
+      param_gtype_init,                /* instance_init */
+      0xdeadbeef,              /* value_type, assigned further down */
+      NULL,                    /* finalize */
+      param_gtype_set_default, /* value_set_default */
+      param_gtype_validate,    /* value_validate */
+      param_gtype_values_cmp,  /* values_cmp */
+    };
+    pspec_info.value_type = G_TYPE_GTYPE;
+    type = g_param_type_register_static (g_intern_static_string ("GParamGType"), &pspec_info);
+    *spec_types++ = type;
+    g_assert (type == G_TYPE_PARAM_GTYPE);
+  }
+
+  /* G_TYPE_PARAM_VARIANT
+   */
+  {
+    const GParamSpecTypeInfo pspec_info = {
+      sizeof (GParamSpecVariant), /* instance_size */
+      0,                          /* n_preallocs */
+      param_variant_init,         /* instance_init */
+      G_TYPE_VARIANT,             /* value_type */
+      param_variant_finalize,     /* finalize */
+      param_variant_set_default,  /* value_set_default */
+      param_variant_validate,     /* value_validate */
+      param_variant_values_cmp,   /* values_cmp */
+    };
+    type = g_param_type_register_static (g_intern_static_string ("GParamVariant"), &pspec_info);
+    *spec_types++ = type;
+    g_assert (type == G_TYPE_PARAM_VARIANT);
   }
-  
-  g_value_register_exchange_func (G_TYPE_CHAR,    G_TYPE_UCHAR,   value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_CHAR,    G_TYPE_BOOLEAN, value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_CHAR,    G_TYPE_INT,     value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_CHAR,    G_TYPE_UINT,    value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_CHAR,    G_TYPE_ENUM,    value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_CHAR,    G_TYPE_FLAGS,   value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_UCHAR,   G_TYPE_BOOLEAN, value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_UCHAR,   G_TYPE_INT,     value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_UCHAR,   G_TYPE_UINT,    value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_UCHAR,   G_TYPE_ENUM,    value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_UCHAR,   G_TYPE_FLAGS,   value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_BOOLEAN, G_TYPE_INT,     value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_BOOLEAN, G_TYPE_UINT,    value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_BOOLEAN, G_TYPE_ENUM,    value_exch_memcpy);
-  g_value_register_exchange_func (G_TYPE_BOOLEAN, G_TYPE_FLAGS,   value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_INT,     G_TYPE_UINT,    value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_INT,     G_TYPE_ENUM,    value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_INT,     G_TYPE_FLAGS,   value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_UINT,    G_TYPE_ENUM,    value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_UINT,    G_TYPE_FLAGS,   value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_LONG,    G_TYPE_CHAR,    value_exch_long_int); 
-  g_value_register_exchange_func (G_TYPE_LONG,    G_TYPE_UCHAR,   value_exch_long_uint); 
-  g_value_register_exchange_func (G_TYPE_LONG,    G_TYPE_BOOLEAN, value_exch_long_int); 
-  g_value_register_exchange_func (G_TYPE_LONG,    G_TYPE_INT,     value_exch_long_int); 
-  g_value_register_exchange_func (G_TYPE_LONG,    G_TYPE_UINT,    value_exch_long_uint); 
-  g_value_register_exchange_func (G_TYPE_LONG,    G_TYPE_ULONG,   value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_LONG,    G_TYPE_ENUM,    value_exch_long_int); 
-  g_value_register_exchange_func (G_TYPE_LONG,    G_TYPE_FLAGS,   value_exch_long_uint); 
-  g_value_register_exchange_func (G_TYPE_ULONG,   G_TYPE_CHAR,    value_exch_ulong_int); 
-  g_value_register_exchange_func (G_TYPE_ULONG,   G_TYPE_UCHAR,   value_exch_ulong_uint); 
-  g_value_register_exchange_func (G_TYPE_ULONG,   G_TYPE_BOOLEAN, value_exch_ulong_int); 
-  g_value_register_exchange_func (G_TYPE_ULONG,   G_TYPE_INT,     value_exch_ulong_int); 
-  g_value_register_exchange_func (G_TYPE_ULONG,   G_TYPE_UINT,    value_exch_ulong_uint); 
-  g_value_register_exchange_func (G_TYPE_ULONG,   G_TYPE_ENUM,    value_exch_ulong_int); 
-  g_value_register_exchange_func (G_TYPE_ULONG,   G_TYPE_FLAGS,   value_exch_ulong_uint); 
-  g_value_register_exchange_func (G_TYPE_ENUM,    G_TYPE_FLAGS,   value_exch_memcpy); 
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_CHAR,    value_exch_float_int); 
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_UCHAR,   value_exch_float_uint); 
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_BOOLEAN, value_exch_float_int); 
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_INT,     value_exch_float_int); 
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_UINT,    value_exch_float_uint); 
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_LONG,    value_exch_float_long); 
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_ULONG,   value_exch_float_ulong);
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_ENUM,    value_exch_float_int); 
-  g_value_register_exchange_func (G_TYPE_FLOAT,   G_TYPE_FLAGS,   value_exch_float_uint); 
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_CHAR,    value_exch_double_int); 
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_UCHAR,   value_exch_double_uint); 
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_BOOLEAN, value_exch_double_int); 
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_INT,     value_exch_double_int); 
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_UINT,    value_exch_double_uint); 
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_LONG,    value_exch_double_long);
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_ULONG,   value_exch_double_ulong);
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_ENUM,    value_exch_double_int); 
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_FLAGS,   value_exch_double_uint);
-  g_value_register_exchange_func (G_TYPE_DOUBLE,  G_TYPE_FLOAT,   value_exch_double_float); 
-}
 
+  g_assert (spec_types == spec_types_bound);
+}
 
 /* --- GParamSpec initialization --- */
+
+/**
+ * g_param_spec_char:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecChar instance specifying a %G_TYPE_CHAR property.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_char (const gchar *name,
                   const gchar *nick,
@@ -1253,11 +1615,17 @@ g_param_spec_char (const gchar *name,
                   gint8        default_value,
                   GParamFlags  flags)
 {
-  GParamSpecChar *cspec = g_param_spec_internal (G_TYPE_PARAM_CHAR,
-                                                name,
-                                                nick,
-                                                blurb,
-                                                flags);
+  GParamSpecChar *cspec;
+
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  cspec = g_param_spec_internal (G_TYPE_PARAM_CHAR,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (cspec == NULL)
+    return NULL;
   
   cspec->minimum = minimum;
   cspec->maximum = maximum;
@@ -1266,6 +1634,20 @@ g_param_spec_char (const gchar *name,
   return G_PARAM_SPEC (cspec);
 }
 
+/**
+ * g_param_spec_uchar:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecUChar instance specifying a %G_TYPE_UCHAR property.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_uchar (const gchar *name,
                    const gchar *nick,
@@ -1275,11 +1657,17 @@ g_param_spec_uchar (const gchar *name,
                    guint8       default_value,
                    GParamFlags  flags)
 {
-  GParamSpecUChar *uspec = g_param_spec_internal (G_TYPE_PARAM_UCHAR,
-                                                 name,
-                                                 nick,
-                                                 blurb,
-                                                 flags);
+  GParamSpecUChar *uspec;
+
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  uspec = g_param_spec_internal (G_TYPE_PARAM_UCHAR,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (uspec == NULL)
+    return NULL;
   
   uspec->minimum = minimum;
   uspec->maximum = maximum;
@@ -1288,6 +1676,21 @@ g_param_spec_uchar (const gchar *name,
   return G_PARAM_SPEC (uspec);
 }
 
+/**
+ * g_param_spec_boolean:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecBoolean instance specifying a %G_TYPE_BOOLEAN
+ * property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_boolean (const gchar *name,
                      const gchar *nick,
@@ -1295,17 +1698,39 @@ g_param_spec_boolean (const gchar *name,
                      gboolean     default_value,
                      GParamFlags  flags)
 {
-  GParamSpecBoolean *bspec = g_param_spec_internal (G_TYPE_PARAM_BOOLEAN,
-                                                   name,
-                                                   nick,
-                                                   blurb,
-                                                   flags);
+  GParamSpecBoolean *bspec;
+
+  g_return_val_if_fail (default_value == TRUE || default_value == FALSE, NULL);
+
+  bspec = g_param_spec_internal (G_TYPE_PARAM_BOOLEAN,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (bspec == NULL)
+    return NULL;
   
   bspec->default_value = default_value;
   
   return G_PARAM_SPEC (bspec);
 }
 
+/**
+ * g_param_spec_int:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecInt instance specifying a %G_TYPE_INT property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_int (const gchar *name,
                  const gchar *nick,
@@ -1315,11 +1740,17 @@ g_param_spec_int (const gchar *name,
                  gint         default_value,
                  GParamFlags  flags)
 {
-  GParamSpecInt *ispec = g_param_spec_internal (G_TYPE_PARAM_INT,
-                                               name,
-                                               nick,
-                                               blurb,
-                                               flags);
+  GParamSpecInt *ispec;
+
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  ispec = g_param_spec_internal (G_TYPE_PARAM_INT,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (ispec == NULL)
+    return NULL;
   
   ispec->minimum = minimum;
   ispec->maximum = maximum;
@@ -1328,6 +1759,22 @@ g_param_spec_int (const gchar *name,
   return G_PARAM_SPEC (ispec);
 }
 
+/**
+ * g_param_spec_uint:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecUInt instance specifying a %G_TYPE_UINT property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_uint (const gchar *name,
                   const gchar *nick,
@@ -1337,11 +1784,17 @@ g_param_spec_uint (const gchar *name,
                   guint        default_value,
                   GParamFlags  flags)
 {
-  GParamSpecUInt *uspec = g_param_spec_internal (G_TYPE_PARAM_UINT,
-                                                name,
-                                                nick,
-                                                blurb,
-                                                flags);
+  GParamSpecUInt *uspec;
+
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  uspec = g_param_spec_internal (G_TYPE_PARAM_UINT,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (uspec == NULL)
+    return NULL;
   
   uspec->minimum = minimum;
   uspec->maximum = maximum;
@@ -1350,6 +1803,22 @@ g_param_spec_uint (const gchar *name,
   return G_PARAM_SPEC (uspec);
 }
 
+/**
+ * g_param_spec_long:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecLong instance specifying a %G_TYPE_LONG property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_long (const gchar *name,
                   const gchar *nick,
@@ -1359,11 +1828,17 @@ g_param_spec_long (const gchar *name,
                   glong        default_value,
                   GParamFlags  flags)
 {
-  GParamSpecLong *lspec = g_param_spec_internal (G_TYPE_PARAM_LONG,
-                                                name,
-                                                nick,
-                                                blurb,
-                                                flags);
+  GParamSpecLong *lspec;
+
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  lspec = g_param_spec_internal (G_TYPE_PARAM_LONG,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (lspec == NULL)
+    return NULL;
   
   lspec->minimum = minimum;
   lspec->maximum = maximum;
@@ -1372,6 +1847,23 @@ g_param_spec_long (const gchar *name,
   return G_PARAM_SPEC (lspec);
 }
 
+/**
+ * g_param_spec_ulong:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecULong instance specifying a %G_TYPE_ULONG
+ * property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_ulong (const gchar *name,
                    const gchar *nick,
@@ -1381,11 +1873,17 @@ g_param_spec_ulong (const gchar *name,
                    gulong       default_value,
                    GParamFlags  flags)
 {
-  GParamSpecULong *uspec = g_param_spec_internal (G_TYPE_PARAM_ULONG,
-                                                 name,
-                                                 nick,
-                                                 blurb,
-                                                 flags);
+  GParamSpecULong *uspec;
+
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  uspec = g_param_spec_internal (G_TYPE_PARAM_ULONG,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (uspec == NULL)
+    return NULL;
   
   uspec->minimum = minimum;
   uspec->maximum = maximum;
@@ -1394,6 +1892,149 @@ g_param_spec_ulong (const gchar *name,
   return G_PARAM_SPEC (uspec);
 }
 
+/**
+ * g_param_spec_int64:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecInt64 instance specifying a %G_TYPE_INT64 property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
+GParamSpec*
+g_param_spec_int64 (const gchar *name,
+                   const gchar *nick,
+                   const gchar *blurb,
+                   gint64       minimum,
+                   gint64       maximum,
+                   gint64       default_value,
+                   GParamFlags  flags)
+{
+  GParamSpecInt64 *lspec;
+  
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  lspec = g_param_spec_internal (G_TYPE_PARAM_INT64,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (lspec == NULL)
+    return NULL;
+  
+  lspec->minimum = minimum;
+  lspec->maximum = maximum;
+  lspec->default_value = default_value;
+  
+  return G_PARAM_SPEC (lspec);
+}
+
+/**
+ * g_param_spec_uint64:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecUInt64 instance specifying a %G_TYPE_UINT64
+ * property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
+GParamSpec*
+g_param_spec_uint64 (const gchar *name,
+                    const gchar *nick,
+                    const gchar *blurb,
+                    guint64      minimum,
+                    guint64      maximum,
+                    guint64      default_value,
+                    GParamFlags  flags)
+{
+  GParamSpecUInt64 *uspec;
+  
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+  
+  uspec = g_param_spec_internal (G_TYPE_PARAM_UINT64,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (uspec == NULL)
+    return NULL;
+  
+  uspec->minimum = minimum;
+  uspec->maximum = maximum;
+  uspec->default_value = default_value;
+  
+  return G_PARAM_SPEC (uspec);
+}
+
+/**
+ * g_param_spec_unichar:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecUnichar instance specifying a %G_TYPE_UINT
+ * property. #GValue structures for this property can be accessed with
+ * g_value_set_uint() and g_value_get_uint().
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
+GParamSpec*
+g_param_spec_unichar (const gchar *name,
+                     const gchar *nick,
+                     const gchar *blurb,
+                     gunichar     default_value,
+                     GParamFlags  flags)
+{
+  GParamSpecUnichar *uspec;
+
+  uspec = g_param_spec_internal (G_TYPE_PARAM_UNICHAR,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (uspec == NULL)
+    return NULL;
+  
+  uspec->default_value = default_value;
+  
+  return G_PARAM_SPEC (uspec);
+}
+
+/**
+ * g_param_spec_enum:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @enum_type: a #GType derived from %G_TYPE_ENUM
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecEnum instance specifying a %G_TYPE_ENUM
+ * property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_enum (const gchar *name,
                   const gchar *nick,
@@ -1403,22 +2044,45 @@ g_param_spec_enum (const gchar *name,
                   GParamFlags  flags)
 {
   GParamSpecEnum *espec;
+  GEnumClass *enum_class;
   
   g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL);
+
+  enum_class = g_type_class_ref (enum_type);
+
+  g_return_val_if_fail (g_enum_get_value (enum_class, default_value) != NULL, NULL);
   
   espec = g_param_spec_internal (G_TYPE_PARAM_ENUM,
                                 name,
                                 nick,
                                 blurb,
                                 flags);
+  if (espec == NULL)
+    return NULL;
   
-  espec->enum_class = g_type_class_ref (enum_type);
+  espec->enum_class = enum_class;
   espec->default_value = default_value;
   G_PARAM_SPEC (espec)->value_type = enum_type;
   
   return G_PARAM_SPEC (espec);
 }
 
+/**
+ * g_param_spec_flags:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @flags_type: a #GType derived from %G_TYPE_FLAGS
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecFlags instance specifying a %G_TYPE_FLAGS
+ * property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_flags (const gchar *name,
                    const gchar *nick,
@@ -1428,22 +2092,45 @@ g_param_spec_flags (const gchar *name,
                    GParamFlags  flags)
 {
   GParamSpecFlags *fspec;
+  GFlagsClass *flags_class;
   
   g_return_val_if_fail (G_TYPE_IS_FLAGS (flags_type), NULL);
+
+  flags_class = g_type_class_ref (flags_type);
+
+  g_return_val_if_fail ((default_value & flags_class->mask) == default_value, NULL);
   
   fspec = g_param_spec_internal (G_TYPE_PARAM_FLAGS,
                                 name,
                                 nick,
                                 blurb,
                                 flags);
+  if (fspec == NULL)
+    return NULL;
   
-  fspec->flags_class = g_type_class_ref (flags_type);
+  fspec->flags_class = flags_class;
   fspec->default_value = default_value;
   G_PARAM_SPEC (fspec)->value_type = flags_type;
   
   return G_PARAM_SPEC (fspec);
 }
 
+/**
+ * g_param_spec_float:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecFloat instance specifying a %G_TYPE_FLOAT property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_float (const gchar *name,
                    const gchar *nick,
@@ -1453,11 +2140,17 @@ g_param_spec_float (const gchar *name,
                    gfloat       default_value,
                    GParamFlags  flags)
 {
-  GParamSpecFloat *fspec = g_param_spec_internal (G_TYPE_PARAM_FLOAT,
-                                                 name,
-                                                 nick,
-                                                 blurb,
-                                                 flags);
+  GParamSpecFloat *fspec;
+
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  fspec = g_param_spec_internal (G_TYPE_PARAM_FLOAT,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (fspec == NULL)
+    return NULL;
   
   fspec->minimum = minimum;
   fspec->maximum = maximum;
@@ -1466,6 +2159,23 @@ g_param_spec_float (const gchar *name,
   return G_PARAM_SPEC (fspec);
 }
 
+/**
+ * g_param_spec_double:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @minimum: minimum value for the property specified
+ * @maximum: maximum value for the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecDouble instance specifying a %G_TYPE_DOUBLE
+ * property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_double (const gchar *name,
                     const gchar *nick,
@@ -1475,11 +2185,17 @@ g_param_spec_double (const gchar *name,
                     gdouble      default_value,
                     GParamFlags  flags)
 {
-  GParamSpecDouble *dspec = g_param_spec_internal (G_TYPE_PARAM_DOUBLE,
-                                                  name,
-                                                  nick,
-                                                  blurb,
-                                                  flags);
+  GParamSpecDouble *dspec;
+
+  g_return_val_if_fail (default_value >= minimum && default_value <= maximum, NULL);
+
+  dspec = g_param_spec_internal (G_TYPE_PARAM_DOUBLE,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (dspec == NULL)
+    return NULL;
   
   dspec->minimum = minimum;
   dspec->maximum = maximum;
@@ -1488,6 +2204,20 @@ g_param_spec_double (const gchar *name,
   return G_PARAM_SPEC (dspec);
 }
 
+/**
+ * g_param_spec_string:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @default_value: default value for the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecString instance.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_string (const gchar *name,
                     const gchar *nick,
@@ -1500,37 +2230,30 @@ g_param_spec_string (const gchar *name,
                                                   nick,
                                                   blurb,
                                                   flags);
-  g_free (sspec->default_value);
-  sspec->default_value = g_strdup (default_value);
-  
-  return G_PARAM_SPEC (sspec);
-}
+  if (sspec == NULL)
+    return NULL;
 
-GParamSpec*
-g_param_spec_string_c (const gchar *name,
-                      const gchar *nick,
-                      const gchar *blurb,
-                      const gchar *default_value,
-                      GParamFlags  flags)
-{
-  GParamSpecString *sspec = g_param_spec_internal (G_TYPE_PARAM_STRING,
-                                                  name,
-                                                  nick,
-                                                  blurb,
-                                                  flags);
   g_free (sspec->default_value);
   sspec->default_value = g_strdup (default_value);
-  g_free (sspec->cset_first);
-  sspec->cset_first = g_strdup (G_CSET_a_2_z "_" G_CSET_A_2_Z);
-  g_free (sspec->cset_nth);
-  sspec->cset_nth = g_strdup (G_CSET_a_2_z
-                             "_0123456789"
-                             /* G_CSET_LATINS G_CSET_LATINC */
-                             G_CSET_A_2_Z);
   
   return G_PARAM_SPEC (sspec);
 }
 
+/**
+ * g_param_spec_param:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @param_type: a #GType derived from %G_TYPE_PARAM
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecParam instance specifying a %G_TYPE_PARAM
+ * property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_param (const gchar *name,
                    const gchar *nick,
@@ -1547,11 +2270,67 @@ g_param_spec_param (const gchar *name,
                                 nick,
                                 blurb,
                                 flags);
+  if (pspec == NULL)
+    return NULL;
+
   G_PARAM_SPEC (pspec)->value_type = param_type;
   
   return G_PARAM_SPEC (pspec);
 }
 
+/**
+ * g_param_spec_boxed:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @boxed_type: %G_TYPE_BOXED derived type of this property
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecBoxed instance specifying a %G_TYPE_BOXED
+ * derived property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
+GParamSpec*
+g_param_spec_boxed (const gchar *name,
+                   const gchar *nick,
+                   const gchar *blurb,
+                   GType        boxed_type,
+                   GParamFlags  flags)
+{
+  GParamSpecBoxed *bspec;
+  
+  g_return_val_if_fail (G_TYPE_IS_BOXED (boxed_type), NULL);
+  g_return_val_if_fail (G_TYPE_IS_VALUE_TYPE (boxed_type), NULL);
+  
+  bspec = g_param_spec_internal (G_TYPE_PARAM_BOXED,
+                                name,
+                                nick,
+                                blurb,
+                                flags);
+  if (bspec == NULL)
+    return NULL;
+
+  G_PARAM_SPEC (bspec)->value_type = boxed_type;
+  
+  return G_PARAM_SPEC (bspec);
+}
+
+/**
+ * g_param_spec_pointer:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecPointer instance specifying a pointer property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_pointer (const gchar *name,
                      const gchar *nick,
@@ -1565,47 +2344,114 @@ g_param_spec_pointer (const gchar *name,
                                 nick,
                                 blurb,
                                 flags);
+  if (pspec == NULL)
+    return NULL;
+
   return G_PARAM_SPEC (pspec);
 }
 
+/**
+ * g_param_spec_gtype:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @is_a_type: a #GType whose subtypes are allowed as values
+ *  of the property (use %G_TYPE_NONE for any type)
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecGType instance specifying a
+ * %G_TYPE_GTYPE property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Since: 2.10
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
-g_param_spec_ccallback (const gchar *name,
-                       const gchar *nick,
-                       const gchar *blurb,
-                       GParamFlags  flags)
+g_param_spec_gtype (const gchar *name,
+                   const gchar *nick,
+                   const gchar *blurb,
+                   GType        is_a_type,
+                   GParamFlags  flags)
 {
-  GParamSpecCCallback *cspec;
+  GParamSpecGType *tspec;
   
-  cspec = g_param_spec_internal (G_TYPE_PARAM_CCALLBACK,
+  tspec = g_param_spec_internal (G_TYPE_PARAM_GTYPE,
                                 name,
                                 nick,
                                 blurb,
                                 flags);
-  return G_PARAM_SPEC (cspec);
+  if (tspec == NULL)
+    return NULL;
+
+  tspec->is_a_type = is_a_type;
+
+  return G_PARAM_SPEC (tspec);
 }
 
+/**
+ * g_param_spec_value_array: (skip)
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @element_spec: a #GParamSpec describing the elements contained in
+ *  arrays of this property, may be %NULL
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecValueArray instance specifying a
+ * %G_TYPE_VALUE_ARRAY property. %G_TYPE_VALUE_ARRAY is a
+ * %G_TYPE_BOXED type, as such, #GValue structures for this property
+ * can be accessed with g_value_set_boxed() and g_value_get_boxed().
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: a newly created parameter specification
+ */
 GParamSpec*
-g_param_spec_boxed (const gchar *name,
-                   const gchar *nick,
-                   const gchar *blurb,
-                   GType        boxed_type,
-                   GParamFlags  flags)
+g_param_spec_value_array (const gchar *name,
+                         const gchar *nick,
+                         const gchar *blurb,
+                         GParamSpec  *element_spec,
+                         GParamFlags  flags)
 {
-  GParamSpecBoxed *bspec;
+  GParamSpecValueArray *aspec;
   
-  g_return_val_if_fail (G_TYPE_IS_BOXED (boxed_type), NULL);
-  g_return_val_if_fail (G_TYPE_IS_DERIVED (boxed_type), NULL);
+  if (element_spec)
+    g_return_val_if_fail (G_IS_PARAM_SPEC (element_spec), NULL);
   
-  bspec = g_param_spec_internal (G_TYPE_PARAM_BOXED,
+  aspec = g_param_spec_internal (G_TYPE_PARAM_VALUE_ARRAY,
                                 name,
                                 nick,
                                 blurb,
                                 flags);
-  G_PARAM_SPEC (bspec)->value_type = boxed_type;
-  
-  return G_PARAM_SPEC (bspec);
+  if (aspec == NULL)
+    return NULL;
+
+  if (element_spec)
+    {
+      aspec->element_spec = g_param_spec_ref (element_spec);
+      g_param_spec_sink (element_spec);
+    }
+
+  return G_PARAM_SPEC (aspec);
 }
 
+/**
+ * g_param_spec_object:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @object_type: %G_TYPE_OBJECT derived type of this property
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecBoxed instance specifying a %G_TYPE_OBJECT
+ * derived property.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): a newly created parameter specification
+ */
 GParamSpec*
 g_param_spec_object (const gchar *name,
                     const gchar *nick,
@@ -1615,36 +2461,112 @@ g_param_spec_object (const gchar *name,
 {
   GParamSpecObject *ospec;
   
-  g_return_val_if_fail (G_TYPE_IS_OBJECT (object_type), NULL);
+  g_return_val_if_fail (g_type_is_a (object_type, G_TYPE_OBJECT), NULL);
   
   ospec = g_param_spec_internal (G_TYPE_PARAM_OBJECT,
                                 name,
                                 nick,
                                 blurb,
                                 flags);
+  if (ospec == NULL)
+    return NULL;
+
   G_PARAM_SPEC (ospec)->value_type = object_type;
   
   return G_PARAM_SPEC (ospec);
 }
 
+/**
+ * g_param_spec_override: (skip)
+ * @name: the name of the property.
+ * @overridden: The property that is being overridden
+ *
+ * Creates a new property of type #GParamSpecOverride. This is used
+ * to direct operations to another paramspec, and will not be directly
+ * useful unless you are implementing a new base type similar to GObject.
+ *
+ * Since: 2.4
+ *
+ * Returns: the newly created #GParamSpec
+ */
 GParamSpec*
-g_param_spec_interface (const gchar *name,
-                       const gchar *nick,
-                       const gchar *blurb,
-                       GType        interface_type,
-                       GParamFlags  flags)
+g_param_spec_override (const gchar *name,
+                      GParamSpec  *overridden)
 {
-  GParamSpecInterface *ispec;
+  GParamSpec *pspec;
   
-  g_return_val_if_fail (G_TYPE_IS_INTERFACE (interface_type), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (G_IS_PARAM_SPEC (overridden), NULL);
   
-  ispec = g_param_spec_internal (G_TYPE_PARAM_INTERFACE,
-                                name,
-                                nick,
-                                blurb,
-                                flags);
-  G_PARAM_SPEC (ispec)->value_type = interface_type;
+  /* Dereference further redirections for property that was passed in
+   */
+  while (TRUE)
+    {
+      GParamSpec *indirect = g_param_spec_get_redirect_target (overridden);
+      if (indirect)
+       overridden = indirect;
+      else
+       break;
+    }
+
+  pspec = g_param_spec_internal (G_TYPE_PARAM_OVERRIDE,
+                                name, NULL, NULL,
+                                overridden->flags);
+  if (pspec == NULL)
+    return NULL;
   
-  return G_PARAM_SPEC (ispec);
+  pspec->value_type = G_PARAM_SPEC_VALUE_TYPE (overridden);
+  G_PARAM_SPEC_OVERRIDE (pspec)->overridden = g_param_spec_ref (overridden);
+
+  return pspec;
 }
 
+/**
+ * g_param_spec_variant:
+ * @name: canonical name of the property specified
+ * @nick: nick name for the property specified
+ * @blurb: description of the property specified
+ * @type: a #GVariantType
+ * @default_value: (allow-none) (transfer full): a #GVariant of type @type to
+ *                 use as the default value, or %NULL
+ * @flags: flags for the property specified
+ *
+ * Creates a new #GParamSpecVariant instance specifying a #GVariant
+ * property.
+ *
+ * If @default_value is floating, it is consumed.
+ *
+ * See g_param_spec_internal() for details on property names.
+ *
+ * Returns: (transfer full): the newly created #GParamSpec
+ *
+ * Since: 2.26
+ */
+GParamSpec*
+g_param_spec_variant (const gchar        *name,
+                      const gchar        *nick,
+                      const gchar        *blurb,
+                      const GVariantType *type,
+                      GVariant           *default_value,
+                      GParamFlags         flags)
+{
+  GParamSpecVariant *vspec;
+
+  g_return_val_if_fail (type != NULL, NULL);
+  g_return_val_if_fail (default_value == NULL ||
+                        g_variant_is_of_type (default_value, type), NULL);
+
+  vspec = g_param_spec_internal (G_TYPE_PARAM_VARIANT,
+                                 name,
+                                 nick,
+                                 blurb,
+                                 flags);
+  if (vspec == NULL)
+    return NULL;
+
+  vspec->type = g_variant_type_copy (type);
+  if (default_value)
+    vspec->default_value = g_variant_ref_sink (default_value);
+
+  return G_PARAM_SPEC (vspec);
+}