glib r7265 - in trunk: . docs/reference docs/reference/glib glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jul 28 16:52:15 2008
New Revision: 7265
URL: http://svn.gnome.org/viewvc/glib?rev=7265&view=rev

Log:
Add g_markup_context_get_user_data


Modified:
   trunk/ChangeLog
   trunk/docs/reference/ChangeLog
   trunk/docs/reference/glib/glib-sections.txt
   trunk/glib/glib.symbols
   trunk/glib/gmarkup.c
   trunk/glib/gmarkup.h

Modified: trunk/docs/reference/glib/glib-sections.txt
==============================================================================
--- trunk/docs/reference/glib/glib-sections.txt	(original)
+++ trunk/docs/reference/glib/glib-sections.txt	Mon Jul 28 16:52:15 2008
@@ -1000,6 +1000,7 @@
 g_markup_parse_context_get_position
 g_markup_parse_context_get_element
 g_markup_parse_context_get_element_stack
+g_markup_parse_context_get_user_data
 g_markup_parse_context_new
 g_markup_parse_context_parse
 g_markup_parse_context_push

Modified: trunk/glib/glib.symbols
==============================================================================
--- trunk/glib/glib.symbols	(original)
+++ trunk/glib/glib.symbols	Mon Jul 28 16:52:15 2008
@@ -683,6 +683,7 @@
 g_markup_parse_context_get_element
 g_markup_parse_context_get_element_stack
 g_markup_parse_context_get_position
+g_markup_parse_context_get_user_data
 g_markup_parse_context_new
 g_markup_parse_context_parse
 g_markup_parse_context_push

Modified: trunk/glib/gmarkup.c
==============================================================================
--- trunk/glib/gmarkup.c	(original)
+++ trunk/glib/gmarkup.c	Mon Jul 28 16:52:15 2008
@@ -2020,6 +2020,26 @@
 }
 
 /**
+ * g_markup_parse_context_get_user_data:
+ * @context: a #GMarkupParseContext
+ *
+ * Returns the user_data associated with @context.  This will either
+ * be the user_data that was provided to g_markup_parse_context_new()
+ * or to the most recent call of g_markup_parse_context_push().
+ *
+ * Returns: the provided user_data. The returned data belongs to
+ *     the markup context and will be freed when g_markup_context_free()
+ *     is called.
+ *
+ * Since: 2.18
+ **/
+gpointer
+g_markup_parse_context_get_user_data (GMarkupParseContext *context)
+{
+  return context->user_data;
+}
+
+/**
  * g_markup_parse_context_push:
  * @context: a #GMarkupParseContext
  * @parser: a #GMarkupParser

Modified: trunk/glib/gmarkup.h
==============================================================================
--- trunk/glib/gmarkup.h	(original)
+++ trunk/glib/gmarkup.h	Mon Jul 28 16:52:15 2008
@@ -126,6 +126,7 @@
 void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
                                                           gint                *line_number,
                                                           gint                *char_number);
+gpointer             g_markup_parse_context_get_user_data (GMarkupParseContext *context);
 
 /* useful when saving */
 gchar* g_markup_escape_text (const gchar *text,