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

filechooser: Remove a leftover signal emission

Closes #2942

See merge request GNOME/gtk!2276

docs/reference/gtk/gtk-markdown-to-docbook

@@ -177,6 +177,7 @@ def ConvertToDocbook(infile, outfile):
     subprocess.check_call(["pandoc", infile, "-o", outfile,
                            "--from=" + input_format,
                            "--to=" + output_format,
+                           "--standalone",
                            "--top-level-division=" + division])
 
 def ExpandGtkDocAbbreviations(infile, outfile):

gtk/gtkfilechooserwidget.c

@@ -5701,7 +5701,6 @@ static void
 request_response_and_add_to_recent_list (GtkFileChooserWidget *impl)
 {
   gtk_widget_activate_action (GTK_WIDGET (impl), "response.activate", NULL);
-  g_signal_emit_by_name (impl, "response-requested");
   add_selection_to_recent_list (impl);
 }
 

gtk/gtkshortcutcontroller.c

@@ -50,7 +50,7 @@
  *         <property name='scope'>managed</property>
  *         <child>
  *           <object class='GtkShortcut'>
- *             <property name='trigger'>&lt;Control&gt;k</property>
+ *             <property name='trigger'>&amp;lt;Control&amp;gt;k</property>
  *             <property name='action'>activate</property>
  *           </object>
  *         </child>
@@ -58,6 +58,11 @@
  *     </child>
  *   </object>
  * ]|
+ *
+ * This example creates a #GtkActivateAction for triggering the `activate`
+ * signal of the GtkButton. See gtk_shortcut_action_parse_string() for the syntax
+ * for other kinds of #GtkShortcutAction. See gtk_shortcut_trigger_parse_string()
+ * to learn more about the syntax for triggers.
  **/
 
 #include "config.h"

gtk/gtkshortcuttrigger.c

@@ -122,6 +122,10 @@ gtk_shortcut_trigger_trigger (GtkShortcutTrigger *self,
  *   - two valid trigger strings, separated by a `|` character, for a
  *     #GtkAlternativeTrigger: `<Control>q|<Control>w`
  *
+ * Note that you will have to escape the `<` and `>` characters when specifying
+ * triggers in XML files, such as GtkBuilder ui files. Use `&lt;` instead of
+ * `<` and `&gt;` instead of `>`.
+ *
  * Returns: (nullable) (transfer full): a new #GtkShortcutTrigger
  *   or %NULL on error
  */