From 3e4bea3436209cca9ce685fdbacec7fcc11f1388 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 3 Mar 2010 15:39:40 +0100 Subject: Make empathy_string_replace_link and empathy_string_replace_escaped public The code is moved from empathy-theme-adium.c --- libempathy-gtk/empathy-theme-adium.c | 46 ++++-------------------------------- 1 file changed, 4 insertions(+), 42 deletions(-) (limited to 'libempathy-gtk/empathy-theme-adium.c') diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index ef7d3a73e..7736be270 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -221,30 +221,6 @@ theme_adium_match_newline (const gchar *text, sub_parsers, user_data); } -static void -theme_adium_replace_link (const gchar *text, - gssize len, - gpointer match_data, - gpointer user_data) -{ - GString *string = user_data; - gchar *real_url; - gchar *escaped; - - real_url = empathy_make_absolute_url_len (text, len); - - /* The thing we are making a link of may contain - * characters which need escaping */ - escaped = g_markup_escape_text (text, len); - - /* Append the link inside tag */ - g_string_append_printf (string, "%s", - real_url, escaped); - - g_free (real_url); - g_free (escaped); -} - static void theme_adium_replace_smiley (const gchar *text, gssize len, @@ -260,32 +236,18 @@ theme_adium_replace_smiley (const gchar *text, hit->path, (int)len, text, (int)len, text); } -static void -theme_adium_replace_escaped (const gchar *text, - gssize len, - gpointer match_data, - gpointer user_data) -{ - GString *string = user_data; - gchar *escaped; - - escaped = g_markup_escape_text (text, len); - g_string_append (string, escaped); - g_free (escaped); -} - static EmpathyStringParser string_parsers[] = { - {empathy_string_match_link, theme_adium_replace_link}, + {empathy_string_match_link, empathy_string_replace_link}, {theme_adium_match_newline, NULL}, - {empathy_string_match_all, theme_adium_replace_escaped}, + {empathy_string_match_all, empathy_string_replace_escaped}, {NULL, NULL} }; static EmpathyStringParser string_parsers_with_smiley[] = { - {empathy_string_match_link, theme_adium_replace_link}, + {empathy_string_match_link, empathy_string_replace_link}, {empathy_string_match_smiley, theme_adium_replace_smiley}, {theme_adium_match_newline, NULL}, - {empathy_string_match_all, theme_adium_replace_escaped}, + {empathy_string_match_all, empathy_string_replace_escaped}, {NULL, NULL} }; -- cgit v1.2.3