Merge branch 'ebassi/for-master' into 'master'

Ebassi/for master

See merge request GNOME/gtk!3134

4 files changed, 19 insertions, 17 deletions

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 791886cced..07551035d5 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2231,7 +2231,6 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry)
  *
  * This is equivalent to getting @entry's #GtkEntryBuffer and
  * calling gtk_entry_buffer_set_max_length() on it.
- * ]|
  **/
 void
 gtk_entry_set_max_length (GtkEntry     *entry,
diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index 30b0dd4c53..f5d14f9b6e 100644
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -63,7 +63,7 @@
  * `<link name="section">`, you can use `<submenu>` or `<section>`
  * elements.
  *
- * |[<!--language: xml -->
+ * |[<!-- language="xml" -->
  * <menu id='app-menu'>
  *   <section>
  *     <item>
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index cddb261e47..2904fa569a 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -256,7 +256,7 @@
  * If the parent widget uses a #GtkLayoutManager, #GtkWidget supports a
  * custom `<layout>` element, used to define layout properties:
  *
- * |[
+ * |[<!-- language="xml" -->
  * <object class="MyGrid" id="grid1">
  *   <child>
  *     <object class="GtkLabel" id="label1">
@@ -284,7 +284,8 @@
  *
  * GtkWidget allows style information such as style classes to
  * be associated with widgets, using the custom `<style>` element:
- * |[
+ *
+ * |[<!-- language="xml" -->
  * <object class="GtkButton" id="button1">
  *   <style>
  *     <class name="my-special-button-class"/>
@@ -295,7 +296,8 @@
  *
  * GtkWidget allows defining accessibility information, such as properties,
  * relations, and states, using the custom `<accessibility>` element:
- * |[
+ *
+ * |[<!-- language="xml" -->
  * <object class="GtkButton" id="button1">
  *   <accessibility>
  *     <property name="label">Download</property>
@@ -318,27 +320,28 @@
  * is slightly different from regular #GtkBuilder XML.
  *
  * Unlike regular interface descriptions, gtk_widget_class_set_template() will
- * expect a <template> tag as a direct child of the toplevel <interface>
- * tag. The <template> tag must specify the “class” attribute which must be
+ * expect a `<template>` tag as a direct child of the toplevel `<interface>`
+ * tag. The `<template>` tag must specify the “class” attribute which must be
  * the type name of the widget. Optionally, the “parent” attribute may be
  * specified to specify the direct parent type of the widget type, this is
  * ignored by the GtkBuilder but required for Glade to introspect what kind
  * of properties and internal children exist for a given type when the actual
  * type does not exist.
  *
- * The XML which is contained inside the <template> tag behaves as if it were
- * added to the <object> tag defining @widget itself. You may set properties
- * on @widget by inserting <property> tags into the <template> tag, and also
- * add <child> tags to add children and extend @widget in the normal way you
- * would with <object> tags.
+ * The XML which is contained inside the `<template>` tag behaves as if it were
+ * added to the `<object>` tag defining @widget itself. You may set properties
+ * on @widget by inserting `<property>` tags into the `<template>` tag, and also
+ * add `<child>` tags to add children and extend @widget in the normal way you
+ * would with `<object>` tags.
  *
- * Additionally, <object> tags can also be added before and after the initial
- * <template> tag in the normal way, allowing one to define auxiliary objects
+ * Additionally, `<object>` tags can also be added before and after the initial
+ * `<template>` tag in the normal way, allowing one to define auxiliary objects
  * which might be referenced by other widgets declared as children of the
- * <template> tag.
+ * `<template>` tag.
  *
  * An example of a GtkBuilder Template Definition:
- * |[
+ *
+ * |[<!-- language="xml" -->
  * <interface>
  *   <template class="FooWidget" parent="GtkBox">
  *     <property name="orientation">horizontal</property>
diff --git a/meson.build b/meson.build
index 3c24e16835..d13408bf95 100644
--- a/meson.build
+++ b/meson.build
@@ -350,7 +350,7 @@ gmodule_dep    = dependency('gmodule-2.0', version: glib_req,
                             fallback : ['glib', 'libgmodule_dep'])
 cairo_dep      = dependency('cairo', version: cairo_req,
                             fallback : ['cairo', 'libcairo_dep'],
-                            default_options: ['zlib=enabled'])
+                            default_options: ['zlib=enabled', 'tests=disabled'])
 cairogobj_dep  = dependency('cairo-gobject', version: cairo_req,
                             fallback : ['cairo', 'libcairogobject_dep'])
 pango_dep      = dependency('pango', version: pango_req,