luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add g_markup_context_get_user_data

Browse Source 
svn path=/trunk/; revision=7265
This commit is contained in:
Matthias Clasen 2008-07-28 16:52:15 +00:00
parent 01832faf20
commit 99a6b0d4e4
6 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-07-28 Matthias Clasen <mclasen@redhat.com>
Bug 544465 – gmarkup makes it hard to use pre-rolled parsers
* glib/glib.symbols:
* glib/gmarkup.[hc]: Add g_markup_context_get_user_data.
Patch by Ryan Lortie
2008-07-28 Tor Lillqvist <tml@novell.com>
* glib-zip.in: Message catalogs should always get installed into

4
docs/reference/ChangeLog
View File

@ -1,3 +1,7 @@
2008-07-28 Matthias Clasen <mclasen2redhat.com>
* glib/glib-sections.txt: Add g_markup_context_get_user_data
2008-07-28 Matthias Clasen <mclasen2redhat.com>
* gio/gio-sections.txt:

1
docs/reference/glib/glib-sections.txt
View File

@ -1000,6 +1000,7 @@ g_markup_parse_context_free
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

1
glib/glib.symbols
View File

@ -683,6 +683,7 @@ g_markup_parse_context_free
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

20
glib/gmarkup.c
View File

@ -2019,6 +2019,26 @@ g_markup_parse_context_get_position (GMarkupParseContext *context,
*char_number = context->char_number;
}
/**
* 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

1
glib/gmarkup.h
View File

@ -126,6 +126,7 @@ G_CONST_RETURN GSList *g_markup_parse_context_get_element_stack (GMarkupParseCon
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,