[gtk+] GtkAboutDialog: Be slightly more flexible when listing credits
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkAboutDialog: Be slightly more flexible when listing credits
- Date: Wed, 22 Dec 2010 06:05:58 +0000 (UTC)
commit a6b05106a5f3c01cc3b1bc5b5812fbf883a14691
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 22 01:03:58 2010 -0500
GtkAboutDialog: Be slightly more flexible when listing credits
Make sure we render credits ok that are occurring in the wild,
such as "Contact us at:", "<foo bar>" or "guy1\nguy2\nguy3"
https://bugzilla.gnome.org/show_bug.cgi?id=637763
https://bugzilla.gnome.org/show_bug.cgi?id=637736
gtk/gtkaboutdialog.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 9edf0b6..6be3edc 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -2277,6 +2277,7 @@ add_credits_section (GtkAboutDialog *about,
{
gchar *link;
gchar *text;
+ gchar *name;
if (*q1 == '<')
{
@@ -2284,6 +2285,7 @@ add_credits_section (GtkAboutDialog *about,
gchar *escaped;
text = g_strstrip (g_strndup (q0, q1 - q0));
+ name = g_markup_escape_text (text, -1);
q1++;
link = g_strndup (q1, q2 - q1);
q2++;
@@ -2291,22 +2293,25 @@ add_credits_section (GtkAboutDialog *about,
g_string_append_printf (str,
"<a href=\"mailto:%s\">%s</a>",
escaped,
- text);
+ name[0] ? name : link);
g_free (escaped);
g_free (link);
g_free (text);
+ g_free (name);
}
else
{
/* uri */
text = g_strstrip (g_strndup (q0, q1 - q0));
+ name = g_markup_escape_text (text, -1);
link = g_strndup (q1, q2 - q1);
g_string_append_printf (str,
"<a href=\"%s\">%s</a>",
link,
- text);
+ name[0] ? name : link);
g_free (link);
g_free (text);
+ g_free (name);
}
q0 = q2;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]