[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)

[platform/upstream/glib.git] / glib / gmarkup.h

diff --git a/glib/gmarkup.h b/glib/gmarkup.h
index a69f6e2..13b2343 100644 (file)
--- a/glib/gmarkup.h
+++ b/glib/gmarkup.h
@@ -14,17 +14,16 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with GLib; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *   Boston, MA 02111-1307, USA.
+ * see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
 #ifndef __G_MARKUP_H__
 #define __G_MARKUP_H__
 
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #include <stdarg.h>
 
 #include <glib/gerror.h>
@@ -71,6 +70,7 @@ typedef enum
  */
 #define G_MARKUP_ERROR g_markup_error_quark ()
 
+GLIB_AVAILABLE_IN_ALL
 GQuark g_markup_error_quark (void);
 
 /**
@@ -79,13 +79,17 @@ GQuark g_markup_error_quark (void);
  * @G_MARKUP_TREAT_CDATA_AS_TEXT: When this flag is set, CDATA marked
  *     sections are not passed literally to the @passthrough function of
  *     the parser. Instead, the content of the section (without the
- *     <literal>&lt;![CDATA[</literal> and <literal>]]&gt;</literal>) is
+ *     `<![CDATA[` and `]]>`) is
  *     passed to the @text function. This flag was added in GLib 2.12
  * @G_MARKUP_PREFIX_ERROR_POSITION: Normally errors caught by GMarkup
  *     itself have line/column information prefixed to them to let the
  *     caller know the location of the error. When this flag is set the
  *     location information is also prefixed to errors generated by the
  *     #GMarkupParser implementation functions
+ * @G_MARKUP_IGNORE_QUALIFIED: Ignore (don't report) qualified
+ *     attributes and tags, along with their contents.  A qualified
+ *     attribute or tag is one that contains ':' in its name (ie: is in
+ *     another namespace).  Since: 2.40.
  *
  * Flags that affect the behaviour of the parser.
  */
@@ -93,7 +97,8 @@ typedef enum
 {
   G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0,
   G_MARKUP_TREAT_CDATA_AS_TEXT              = 1 << 1,
-  G_MARKUP_PREFIX_ERROR_POSITION            = 1 << 2
+  G_MARKUP_PREFIX_ERROR_POSITION            = 1 << 2,
+  G_MARKUP_IGNORE_QUALIFIED                 = 1 << 3
 } GMarkupParseFlags;
 
 /**
@@ -111,10 +116,11 @@ typedef struct _GMarkupParser GMarkupParser;
 /**
  * GMarkupParser:
  * @start_element: Callback to invoke when the opening tag of an element
- *     is seen.
+ *     is seen. The callback's @attribute_names and @attribute_values parameters
+ *     are %NULL-terminated.
  * @end_element: Callback to invoke when the closing tag of an element
  *     is seen. Note that this is also called for empty tags like
- *     <literal>&lt;empty/&gt;</literal>.
+ *     `<empty/>`.
  * @text: Callback to invoke when some text is seen (text is always
  *     inside an element). Note that the text of an element may be spread
  *     over multiple calls of this function. If the
@@ -178,39 +184,56 @@ struct _GMarkupParser
                           gpointer             user_data);
 };
 
+GLIB_AVAILABLE_IN_ALL
 GMarkupParseContext *g_markup_parse_context_new   (const GMarkupParser *parser,
                                                    GMarkupParseFlags    flags,
                                                    gpointer             user_data,
                                                    GDestroyNotify       user_data_dnotify);
+GLIB_AVAILABLE_IN_2_36
+GMarkupParseContext *g_markup_parse_context_ref   (GMarkupParseContext *context);
+GLIB_AVAILABLE_IN_2_36
+void                 g_markup_parse_context_unref (GMarkupParseContext *context);
+GLIB_AVAILABLE_IN_ALL
 void                 g_markup_parse_context_free  (GMarkupParseContext *context);
+GLIB_AVAILABLE_IN_ALL
 gboolean             g_markup_parse_context_parse (GMarkupParseContext *context,
                                                    const gchar         *text,
                                                    gssize               text_len,
                                                    GError             **error);
+GLIB_AVAILABLE_IN_ALL
 void                 g_markup_parse_context_push  (GMarkupParseContext *context,
                                                    const GMarkupParser *parser,
                                                    gpointer             user_data);
+GLIB_AVAILABLE_IN_ALL
 gpointer             g_markup_parse_context_pop   (GMarkupParseContext *context);
 
+GLIB_AVAILABLE_IN_ALL
 gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
                                                        GError             **error);
+GLIB_AVAILABLE_IN_ALL
 const gchar *        g_markup_parse_context_get_element (GMarkupParseContext *context);
+GLIB_AVAILABLE_IN_ALL
 const GSList *       g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
 
 /* For user-constructed error messages, has no precise semantics */
+GLIB_AVAILABLE_IN_ALL
 void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
                                                           gint                *line_number,
                                                           gint                *char_number);
+GLIB_AVAILABLE_IN_ALL
 gpointer             g_markup_parse_context_get_user_data (GMarkupParseContext *context);
 
 /* useful when saving */
+GLIB_AVAILABLE_IN_ALL
 gchar* g_markup_escape_text (const gchar *text,
                              gssize       length);
 
+GLIB_AVAILABLE_IN_ALL
 gchar *g_markup_printf_escaped (const char *format,
                                ...) G_GNUC_PRINTF (1, 2);
+GLIB_AVAILABLE_IN_ALL
 gchar *g_markup_vprintf_escaped (const char *format,
-                                va_list     args);
+                                va_list     args) G_GNUC_PRINTF(1, 0);
 
 typedef enum
 {
@@ -225,6 +248,7 @@ typedef enum
 
 
 /* useful from start_element */
+GLIB_AVAILABLE_IN_ALL
 gboolean   g_markup_collect_attributes (const gchar         *element_name,
                                         const gchar        **attribute_names,
                                         const gchar        **attribute_values,