summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-07-22 16:10:32 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-07-22 16:10:32 +0000
commitfe1380e0c41a4e42c294e0c01caac125eb924755 (patch)
treeb7c69a97afcf6f06d884f9a9890fef8cb38d7ed9
parent1db798a4001e205f3a8bd65c6ad5ebdb9eb036a0 (diff)
downloadgdk-pixbuf-fe1380e0c41a4e42c294e0c01caac125eb924755.tar.gz
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)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkmessagedialog.c12
4 files changed, 27 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1798f44b3..3753d9c68 100644
--- 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 1798f44b3..3753d9c68 100644
--- 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 1798f44b3..3753d9c68 100644
--- 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 5ca713d1c..443baa43c 100644
--- 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