Added GRegex boxed type. (#445065, Carlos Garnacho)

2007-06-15  Cody Russell  <bratsche@gnome.org>

	* docs/reference/gobject/tmpl/gboxed.sgml:
	* docs/reference/gobject/gobject-sections.txt:
	* glib/gregex.c:
	* gobject/gboxed.[ch]:
	* gobject/gobject.symbols: Added GRegex boxed type.
	(#445065, Carlos Garnacho)

svn path=/trunk/; revision=5566

diff --git a/ChangeLog b/ChangeLog
index 4926349..b140ead 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-15  Cody Russell  <bratsche@gnome.org>
+
+       * docs/reference/gobject/tmpl/gboxed.sgml:
+       * docs/reference/gobject/gobject-sections.txt:
+       * glib/gregex.c:
+       * gobject/gboxed.[ch]:
+       * gobject/gobject.symbols: Added GRegex boxed type.
+       (#445065, Carlos Garnacho)
+
 2007-06-15  Sebastian Wilhelmi  <wilhelmi@google.com>
 
        * glib/gregex.c: Replaced & by &amp; in <programlisting> to make

diff --git a/docs/reference/gobject/gobject-sections.txt b/docs/reference/gobject/gobject-sections.txt
index 2714059..2d0ab6e 100644 (file)
--- a/docs/reference/gobject/gobject-sections.txt
+++ b/docs/reference/gobject/gobject-sections.txt
@@ -339,6 +339,7 @@ G_TYPE_HASH_TABLE
 G_TYPE_DATE
 G_TYPE_GSTRING
 G_TYPE_STRV
+G_TYPE_REGEX
 GStrv
 
 <SUBSECTION Standard>
@@ -349,6 +350,7 @@ g_gstring_get_type
 g_strv_get_type
 g_date_get_type
 g_hash_table_get_type
+g_regex_get_type
 </SECTION>
 
 <SECTION>

diff --git a/docs/reference/gobject/tmpl/gboxed.sgml b/docs/reference/gobject/tmpl/gboxed.sgml
index 1a77022..7a828e7 100644 (file)
--- a/docs/reference/gobject/tmpl/gboxed.sgml
+++ b/docs/reference/gobject/tmpl/gboxed.sgml
@@ -139,6 +139,15 @@ g_strfreev (writers);
 @Since: 2.4
 
 
+<!-- ##### MACRO G_TYPE_REGEX ##### -->
+<para>
+The #GType for a boxed type holding a #GRegex reference.
+</para>
+
+@Since: 2.14
+
+
+
 <!-- ##### TYPEDEF GStrv ##### -->
 <para>
 A C representable type name for #G_TYPE_STRV.

diff --git a/glib/gregex.c b/glib/gregex.c
index b37545a..598b247 100644 (file)
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -410,8 +410,8 @@ g_match_info_get_match_count (const GMatchInfo *match_info)
  * GRegex supports the concept of partial matching by means of the
  * #G_REGEX_MATCH_PARTIAL flag. When this is set the return code for
  * g_regex_match() or g_regex_match_full() is, as usual, %TRUE
- * for a complete match, %FALSE otherwise. But, when this functions
- * returns %FALSE, you can check if the match was partial calling
+ * for a complete match, %FALSE otherwise. But, when these functions
+ * return %FALSE, you can check if the match was partial calling
  * g_match_info_is_partial_match().
  *
  * When using partial matching you cannot use g_match_info_fetch*().

diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index cab8164..8296c11 100644 (file)
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -241,6 +241,17 @@ g_hash_table_get_type (void)
   return type_id;
 }
 
+GType
+g_regex_get_type (void)
+{
+  static GType type_id = 0;
+  if (!type_id)
+    type_id = g_boxed_type_register_static (g_intern_static_string ("GRegex"),
+                                           (GBoxedCopyFunc) g_regex_ref,
+                                           (GBoxedFreeFunc) g_regex_unref);
+  return type_id;
+}
+
 static void
 boxed_proxy_value_init (GValue *value)
 {

diff --git a/gobject/gboxed.h b/gobject/gboxed.h
index 6370cae..622b1e7 100644 (file)
--- a/gobject/gboxed.h
+++ b/gobject/gboxed.h
@@ -64,6 +64,7 @@ GType g_boxed_type_register_static            (const gchar    *name,
 #define        G_TYPE_STRV             (g_strv_get_type ())
 #define        G_TYPE_GSTRING          (g_gstring_get_type ())
 #define        G_TYPE_HASH_TABLE       (g_hash_table_get_type ())
+#define        G_TYPE_REGEX            (g_regex_get_type ())
 
 
 void    g_value_take_boxed      (GValue                *value,
@@ -79,6 +80,7 @@ GType g_date_get_type         (void)  G_GNUC_CONST;
 GType  g_strv_get_type         (void)  G_GNUC_CONST;
 GType  g_gstring_get_type      (void)  G_GNUC_CONST;
 GType   g_hash_table_get_type   (void)  G_GNUC_CONST;
+GType   g_regex_get_type        (void)  G_GNUC_CONST;
 
 typedef gchar** GStrv;
      

diff --git a/gobject/gobject.symbols b/gobject/gobject.symbols
index d723459..8597af3 100644 (file)
--- a/gobject/gobject.symbols
+++ b/gobject/gobject.symbols
@@ -20,6 +20,7 @@ g_date_get_type G_GNUC_CONST
 g_gstring_get_type G_GNUC_CONST
 g_strv_get_type G_GNUC_CONST
 g_hash_table_get_type G_GNUC_CONST
+g_regex_get_type G_GNUC_CONST
 g_closure_get_type G_GNUC_CONST
 g_value_get_type G_GNUC_CONST
 g_value_array_get_type G_GNUC_CONST