From f5589f2e80b0a13e8b0648d3a342e09a2ac908c3 Mon Sep 17 00:00:00 2001 From: Mathias Hasselmann Date: Sat, 12 Jan 2008 11:10:14 +0000 Subject: [PATCH] =?UTF-8?q?Print=20angle=20brackets=20arround=20e-mail=20a?= =?UTF-8?q?ddresses=20in=20the=20about=20dialog=20(#409520,=20Mariano=20Su?= =?UTF-8?q?=C3=A1rez-Alvarez).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gtk/gtkaboutdialog.c: Keep e-mail brackets in add_credits_page(). svn path=/trunk/; revision=19354 --- ChangeLog | 7 +++++++ gtk/gtkaboutdialog.c | 26 ++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bd23feb9f..b96a7bff54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-12 Mathias Hasselmann + + Print angle brackets arround e-mail addresses in the about dialog + (#409520, Mariano Suárez-Alvarez). + + * gtk/gtkaboutdialog.c: Keep e-mail brackets in add_credits_page(). + 2008-01-11 13:28:02 Tim Janik * gtk/gtktestutils.c (gtk_test_create_widget): removed old testutils diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 540546aab7..f57a474e57 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -1966,21 +1966,23 @@ add_credits_page (GtkAboutDialog *about, gchar *link; const gchar *link_type; GtkTextTag *tag; - - gtk_text_buffer_insert_at_cursor (buffer, q0, q1 - q0); - gtk_text_buffer_get_end_iter (buffer, &end); + + if (*q1 == '<') + { + gtk_text_buffer_insert_at_cursor (buffer, q0, (q1 - q0) + 1); + gtk_text_buffer_get_end_iter (buffer, &end); + q1++; + link_type = I_("email"); + } + else + { + gtk_text_buffer_insert_at_cursor (buffer, q0, q1 - q0); + gtk_text_buffer_get_end_iter (buffer, &end); + link_type = I_("url"); + } q0 = q2; - if (*q1 == '<') - { - q1++; - q0++; - link_type = I_("email"); - } - else - link_type = I_("url"); - link = g_strndup (q1, q2 - q1); if (g_slist_find_custom (priv->visited_links, link, (GCompareFunc)strcmp))