+
+ priv = message_dialog->priv;
+
+ priv->has_primary_markup = TRUE;
+ gtk_label_set_markup (GTK_LABEL (priv->label), str);
+}
+
+/**
+ * gtk_message_dialog_format_secondary_text:
+ * @message_dialog: a #GtkMessageDialog
+ * @message_format: (allow-none): printf()-style format string, or %NULL
+ * @...: arguments for @message_format
+ *
+ * Sets the secondary text of the message dialog to be @message_format
+ * (with printf()-style).
+ *
+ * Since: 2.6
+ */
+void
+gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
+ const gchar *message_format,
+ ...)
+{
+ va_list args;
+ gchar *msg = NULL;
+ GtkMessageDialogPrivate *priv;
+
+ g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
+
+ priv = message_dialog->priv;
+
+ if (message_format)
+ {
+ priv->has_secondary_text = TRUE;
+
+ va_start (args, message_format);
+ msg = g_strdup_vprintf (message_format, args);
+ va_end (args);
+
+ gtk_widget_show (priv->secondary_label);
+ gtk_label_set_text (GTK_LABEL (priv->secondary_label), msg);
+
+ g_free (msg);
+ }
+ else
+ {
+ priv->has_secondary_text = FALSE;
+ gtk_widget_hide (priv->secondary_label);
+ }
+
+ setup_primary_label_font (message_dialog);
+}
+
+/**
+ * gtk_message_dialog_format_secondary_markup:
+ * @message_dialog: a #GtkMessageDialog
+ * @message_format: printf()-style markup string (see
+ <link linkend="PangoMarkupFormat">Pango markup format</link>), or %NULL
+ * @...: arguments for @message_format
+ *
+ * Sets the secondary text of the message dialog to be @message_format (with
+ * printf()-style), which is marked up with the
+ * <link linkend="PangoMarkupFormat">Pango text markup language</link>.
+ *
+ * Due to an oversight, this function does not escape special XML characters
+ * like gtk_message_dialog_new_with_markup() does. Thus, if the arguments
+ * may contain special XML characters, you should use g_markup_printf_escaped()
+ * to escape it.
+
+ * <informalexample><programlisting>
+ * gchar *msg;
+ *
+ * msg = g_markup_printf_escaped (message_format, ...);
+ * gtk_message_dialog_format_secondary_markup (message_dialog, "%s", msg);
+ * g_free (msg);
+ * </programlisting></informalexample>
+ *
+ * Since: 2.6
+ */
+void
+gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
+ const gchar *message_format,
+ ...)
+{
+ va_list args;
+ gchar *msg = NULL;
+ GtkMessageDialogPrivate *priv;
+
+ g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
+
+ priv = message_dialog->priv;
+
+ if (message_format)
+ {
+ priv->has_secondary_text = TRUE;
+
+ va_start (args, message_format);
+ msg = g_strdup_vprintf (message_format, args);
+ va_end (args);
+
+ gtk_widget_show (priv->secondary_label);
+ gtk_label_set_markup (GTK_LABEL (priv->secondary_label), msg);
+
+ g_free (msg);
+ }
+ else
+ {
+ priv->has_secondary_text = FALSE;
+ gtk_widget_hide (priv->secondary_label);
+ }
+
+ setup_primary_label_font (message_dialog);
+}
+
+/**
+ * gtk_message_dialog_get_message_area:
+ * @message_dialog: a #GtkMessageDialog
+ *
+ * Returns the message area of the dialog. This is the box where the
+ * dialog's primary and secondary labels are packed. You can add your
+ * own extra content to that box and it will appear below those labels,
+ * on the right side of the dialog's image (or on the left for right-to-left
+ * languages). See gtk_dialog_get_content_area() for the corresponding
+ * function in the parent #GtkDialog.
+ *
+ * Return value: (transfer none): A #GtkVBox corresponding to the
+ * "message area" in the @message_dialog.
+ *
+ * Since: 2.22
+ **/
+GtkWidget *
+gtk_message_dialog_get_message_area (GtkMessageDialog *message_dialog)
+{
+ g_return_val_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog), NULL);
+
+ return message_dialog->priv->message_area;