Point out escaping oversight. (#311260, Owen Taylor)

2005-07-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmessagedialog.c (gtk_message_dialog_format_secondary_markup):
	Point out escaping oversight.  (#311260, Owen Taylor)

diff --git a/ChangeLog b/ChangeLog
index 1798f44b325ea63e5300f37103f9402ad7bd7b38..3753d9c683fe1c7b7bdb60c689e07949e4809e55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmessagedialog.c (gtk_message_dialog_format_secondary_markup): 
+       Point out escaping oversight.  (#311260, Owen Taylor)
+
 2005-07-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): Cleanup

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1798f44b325ea63e5300f37103f9402ad7bd7b38..3753d9c683fe1c7b7bdb60c689e07949e4809e55 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-07-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmessagedialog.c (gtk_message_dialog_format_secondary_markup): 
+       Point out escaping oversight.  (#311260, Owen Taylor)
+
 2005-07-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): Cleanup

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1798f44b325ea63e5300f37103f9402ad7bd7b38..3753d9c683fe1c7b7bdb60c689e07949e4809e55 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-07-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmessagedialog.c (gtk_message_dialog_format_secondary_markup): 
+       Point out escaping oversight.  (#311260, Owen Taylor)
+
 2005-07-21  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_list_destroy): Cleanup

diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 5ca713d1c021093ab22f483d8138d749f3a7ec11..443baa43c5029c3291fc2a0db25267b1026d19b2 100644 (file)
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -599,6 +599,18 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
  * Note that setting a secondary text makes the primary text become
  * bold, unless you have provided explicit markup.
  *
+ * 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, "&percnt;s", msg);
+ * g_free (msg);
+ * </programlisting></informalexample>
+ *
  * Since: 2.6
  **/
 void