up version number to 1.3.8, interface age 0, binary age 0.

Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>

        * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
        interface age 0, binary age 0.

        * NEWS: updates.

Tue Sep 18 23:09:02 2001  Tim Janik  <timj@gtk.org>

        * gparam.[hc]: rename *nick and *blurb fields to catch
        direct accesses in third party code.
        provide g_param_get_nick(), g_param_get_blurb() and
        g_param_get_name() accessors.

diff --git a/ChangeLog b/ChangeLog
index 031942d..6fe51d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
+       interface age 0, binary age 0.
+
+       * NEWS: updates.
+
 Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        Fixes for compilation on Solaris (#59026, Frank Belew)

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 031942d..6fe51d7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
+       interface age 0, binary age 0.
+
+       * NEWS: updates.
+
 Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        Fixes for compilation on Solaris (#59026, Frank Belew)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 031942d..6fe51d7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
+       interface age 0, binary age 0.
+
+       * NEWS: updates.
+
 Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        Fixes for compilation on Solaris (#59026, Frank Belew)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 031942d..6fe51d7 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
+       interface age 0, binary age 0.
+
+       * NEWS: updates.
+
 Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        Fixes for compilation on Solaris (#59026, Frank Belew)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 031942d..6fe51d7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
+       interface age 0, binary age 0.
+
+       * NEWS: updates.
+
 Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        Fixes for compilation on Solaris (#59026, Frank Belew)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 031942d..6fe51d7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
+       interface age 0, binary age 0.
+
+       * NEWS: updates.
+
 Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        Fixes for compilation on Solaris (#59026, Frank Belew)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 031942d..6fe51d7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
+       interface age 0, binary age 0.
+
+       * NEWS: updates.
+
 Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        Fixes for compilation on Solaris (#59026, Frank Belew)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 031942d..6fe51d7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Sep 18 22:57:33 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GLIB_MICRO_VERSION): up version number to 1.3.8,
+       interface age 0, binary age 0.
+
+       * NEWS: updates.
+
 Tue Sep 18 18:23:02 2001  Owen Taylor  <otaylor@redhat.com>
 
        Fixes for compilation on Solaris (#59026, Frank Belew)

diff --git a/NEWS b/NEWS
index 8ab12cd..905db40 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,16 @@
+Overview of Changes in GLib 1.3.8:
+==================================
+
+* Documentation updates [Owen]
+* Made GType interfaces overridable in derived types
+* Many win32 fixes [Tor Lillqvist]
+* Miscellaneous cleanups and fixes
+
+Other contributors:
+  Darin Adler, Matthias Clasen, Ron Steinke, Hans Breuer, Alex Larsson
+
 Overview of Changes in GLib 1.3.7:
+==================================
 
 * Integrate GClosure support into the main loop [Owen Taylor]
 * More GSignal convenience functions (macros) [Sven Neumann, Tim Janik]
@@ -16,7 +28,14 @@ Overview of Changes in GLib 1.3.7:
 * Many improvements to the win32 code [Tor Lillqvist, Hans Breuer]
 * Miscellaneous bug and API fixes
 
+Other contributors:
+  Michael Natterer, Christopher James Lahey, Padraig O'Briain,
+  Matthias Clasen, Josh Pritikin, Steve Baker, Cesar Rincon, Garry R. Osgood,
+  Michael Meeks, Laszlo Peter,  Martin Baulig, Kjartan Maraas, Andrew Lanoix,
+  Peter Williams
+
 Overview of Changes in GLib 1.3.6:
+==================================
 
 * Threads have a "return value" from g_thread_join
 * Removed ability to adjust thread stack size
@@ -31,6 +50,7 @@ Overview of Changes in GLib 1.3.6:
 * Misc bug fixes
 
 Overview of Changes in GLib 1.3.5:
+==================================
 
 * Added an installed glib-mkenums Perl program for parsing enumeration
   declarations from header files.
@@ -38,6 +58,7 @@ Overview of Changes in GLib 1.3.5:
 * Bug and Portability fixes
 
 Overview of Changes in GLib 1.3.4:
+==================================
 
 * Efficiency improvements for GThreadPool
 * A few bug fixes
@@ -45,6 +66,7 @@ Overview of Changes in GLib 1.3.4:
 * Documentation improvements
 
 Overview of Changes in GLib 1.3.3:
+==================================
 
 * More user_data support in various functions.
 * Main loop API revamps to support per-thread main loops.
@@ -67,6 +89,7 @@ Overview of Changes in GLib 1.3.3:
 * Optimizations, cleanups, bug fixes.
 
 Overview of Changes in GLib 1.3.2:
+==================================
 
 GLib:
 
@@ -105,6 +128,7 @@ GObject:
 * Bug fixes.
 
 What's new in GLib 1.3.1:
+=========================
 
 * New GObject library added including object system based on
   the GTK+ object system. 

diff --git a/configure.in b/configure.in
index 0ff6449..892e882 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ GLIB_AC_DIVERT_BEFORE_HELP([
 #
 GLIB_MAJOR_VERSION=1
 GLIB_MINOR_VERSION=3
-GLIB_MICRO_VERSION=7
+GLIB_MICRO_VERSION=8
 GLIB_INTERFACE_AGE=0
 GLIB_BINARY_AGE=0
 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION

diff --git a/docs/reference/gobject/tmpl/param_specs.sgml b/docs/reference/gobject/tmpl/param_specs.sgml
index fa1123f..253b12c 100644 (file)
--- a/docs/reference/gobject/tmpl/param_specs.sgml
+++ b/docs/reference/gobject/tmpl/param_specs.sgml
@@ -21,8 +21,6 @@ Parameter Specifications
 
 @g_type_instance: 
 @name: 
-@nick: 
-@blurb: 
 @flags: 
 @value_type: 
 @owner_type: 

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 68bd9a4..fb96808 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 18 23:09:02 2001  Tim Janik  <timj@gtk.org>
+
+       * gparam.[hc]: rename *nick and *blurb fields to catch
+       direct accesses in third party code.
+       provide g_param_get_nick(), g_param_get_blurb() and
+       g_param_get_name() accessors.
+
 Mon Sep 10 20:31:37 2001  Tim Janik  <timj@gtk.org>
 
        * gobject.[hc]: removed extraneous GObject* returns from a

diff --git a/gobject/gparam.c b/gobject/gparam.c
index 0493b95..18721eb 100644 (file)
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -137,8 +137,8 @@ g_param_spec_init (GParamSpec      *pspec,
                   GParamSpecClass *class)
 {
   pspec->name = NULL;
-  pspec->nick = NULL;
-  pspec->blurb = NULL;
+  pspec->_nick = NULL;
+  pspec->_blurb = NULL;
   pspec->flags = 0;
   pspec->value_type = class->value_type;
   pspec->owner_type = 0;
@@ -154,8 +154,8 @@ g_param_spec_finalize (GParamSpec *pspec)
   g_datalist_clear (&pspec->qdata);
   
   g_free (pspec->name);
-  g_free (pspec->nick);
-  g_free (pspec->blurb);
+  g_free (pspec->_nick);
+  g_free (pspec->_blurb);
 
   g_type_free_instance ((GTypeInstance*) pspec);
 }
@@ -234,6 +234,30 @@ g_param_spec_sink (GParamSpec *pspec)
     }
 }
 
+G_CONST_RETURN gchar*
+g_param_get_name (GParamSpec *pspec)
+{
+  g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
+
+  return pspec->name;
+}
+
+G_CONST_RETURN gchar*
+g_param_get_nick (GParamSpec *pspec)
+{
+  g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
+
+  return pspec->_nick ? pspec->_nick : pspec->name;
+}
+
+G_CONST_RETURN gchar*
+g_param_get_blurb (GParamSpec *pspec)
+{
+  g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
+
+  return pspec->_blurb;
+}
+
 gpointer
 g_param_spec_internal (GType        param_type,
                       const gchar *name,
@@ -250,8 +274,8 @@ g_param_spec_internal (GType        param_type,
   pspec = (gpointer) g_type_create_instance (param_type);
   pspec->name = g_strdup (name);
   g_strcanon (pspec->name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
-  pspec->nick = g_strdup (nick ? nick : pspec->name);
-  pspec->blurb = g_strdup (blurb);
+  pspec->_nick = g_strdup (nick);
+  pspec->_blurb = g_strdup (blurb);
   pspec->flags = (flags & G_PARAM_USER_MASK) | (flags & G_PARAM_MASK);
 
   return pspec;

diff --git a/gobject/gparam.h b/gobject/gparam.h
index 33f8ae2..8d6ebe1 100644 (file)
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -63,13 +63,13 @@ struct _GParamSpec
   GTypeInstance  g_type_instance;
 
   gchar         *name;
-  gchar         *nick;
-  gchar         *blurb;
   GParamFlags    flags;
   GType                 value_type;
   GType                 owner_type;    /* class using this property */
 
   /*< private >*/
+  gchar         *_nick;
+  gchar         *_blurb;
   GData                *qdata;
   guint          ref_count;
   guint                 param_id;      /* sort-criteria */
@@ -126,6 +126,9 @@ gboolean    g_param_value_convert           (GParamSpec    *dest_value_spec,
 gint           g_param_values_cmp              (GParamSpec    *pspec,
                                                 const GValue  *value1,
                                                 const GValue  *value2);
+G_CONST_RETURN gchar*  g_param_get_name        (GParamSpec    *pspec);
+G_CONST_RETURN gchar*  g_param_get_nick        (GParamSpec    *pspec);
+G_CONST_RETURN gchar*  g_param_get_blurb       (GParamSpec    *pspec);
 void            g_value_set_param               (GValue               *value,
                                                 GParamSpec    *param);
 GParamSpec*     g_value_get_param               (const GValue  *value);