* Authors: Xavier Claessens <xclaesse@gmail.com>
*/
-#include <config.h>
-
-#include <string.h>
-
+#include "config.h"
#include "empathy-string-parser.h"
+
#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
/* We intentionally leak the regex so it's not recomputed */
if (!uri_regex) {
- uri_regex = g_regex_new (URI_REGEX, 0, 0, NULL);
+ GError *error = NULL;
+
+ uri_regex = g_regex_new (URI_REGEX, 0, 0, &error);
+ if (uri_regex == NULL) {
+ g_warning ("Failed to create reg exp: %s", error->message);
+ g_error_free (error);
+ return NULL;
+ }
}
return g_regex_ref (uri_regex);
gint last = 0;
uri_regex = uri_regex_dup_singleton ();
+ if (uri_regex == NULL) {
+ empathy_string_parser_substr (text, len, sub_parsers, user_data);
+ return;
+ }
+
match = g_regex_match_full (uri_regex, text, len, 0, 0, &match_info, NULL);
if (match) {
gint s = 0, e = 0;
{
GString *string = user_data;
gchar *real_url;
- gchar *escaped;
+ gchar *title;
+ gchar *markup;
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);
+ /* Need to copy manually, because g_markup_printf_escaped does not work
+ * with string precision pitfalls. */
+ title = g_strndup (text, len);
/* Append the link inside <a href=""></a> tag */
- g_string_append_printf (string, "<a href=\"%s\">%s</a>",
- real_url, escaped);
+ markup = g_markup_printf_escaped ("<a href=\"%s\">%s</a>",
+ real_url, title);
+
+ g_string_append (string, markup);
g_free (real_url);
- g_free (escaped);
+ g_free (title);
+ g_free (markup);
}
void