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 49263498f82c1a6a5ab087f4f4e01a413c542347..b140ead34b9c85e9e9c7179eb8b3b920d8332a71 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 2714059537a325a94cc77595a956907b7a45439a..2d0ab6e3d9923ea44826af220fb01cd0b25abd77 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 1a770222289474b775edb4980d559e677f67a2f7..7a828e79aeefa49cd01fda2bfe30821f37c6fb99 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 b37545a50719c8ffff6355f2dcc86526b0ee4952..598b247121a9e2d059a657e65fbb7cbdff75ab7e 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 cab8164ec255192bcd0a9b3c15d4078f680a3860..8296c11619276df50ac6b99b5bd6372b6c576dfc 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 6370cae37261af8075a8d6b3904d536cba989b95..622b1e768e2967c7c1e6b0a6778cd6dc201cede2 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 d723459f3ad675eee9427a6ab2f286d1845d3da4..8597af3b6275b19380481efba811ed6d62eefb3c 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