Updated Spanish Translation

[empathy.git] / libempathy-gtk / empathy-string-parser.c

diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c
index 27421eb59cfd586ba5f2882f1950861484e13e1a..f17fc9c03dd961759027b5177fca5b00e4788398 100644 (file)
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -18,96 +18,16 @@
  * 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"
-
-#define SCHEMES           "([a-zA-Z\\+]+)"
-#define INVALID_CHARS     "\\s\"'"
-#define INVALID_CHARS_EXT INVALID_CHARS "\\[\\]<>(){},;:?"
-#define BODY              "([^"INVALID_CHARS"]+)"
-#define BODY_END          "([^"INVALID_CHARS"]*)[^"INVALID_CHARS_EXT".]"
-#define BODY_STRICT       "([^"INVALID_CHARS_EXT"]+)"
-#define URI_REGEX         "("SCHEMES"://"BODY_END")" \
-                         "|((www|ftp)\\."BODY_END")" \
-                         "|((mailto:)?"BODY_STRICT"@"BODY"\\."BODY_END")"
-
-static GRegex *
-uri_regex_dup_singleton (void)
-{
-       static GRegex *uri_regex = NULL;
-
-       /* We intentionally leak the regex so it's not recomputed */
-       if (!uri_regex) {
-               uri_regex = g_regex_new (URI_REGEX, 0, 0, NULL);
-       }
-
-       return g_regex_ref (uri_regex);
-}
-
-void
-empathy_string_parser_substr (const gchar *text,
-                             gssize len,
-                             EmpathyStringParser *parsers,
-                             gpointer user_data)
-{
-       if (parsers != NULL && parsers[0].match_func != NULL) {
-               parsers[0].match_func (text, len,
-                                      parsers[0].replace_func, parsers + 1,
-                                      user_data);
-       }
-}
-
-void
-empathy_string_match_link (const gchar *text,
-                          gssize len,
-                          EmpathyStringReplace replace_func,
-                          EmpathyStringParser *sub_parsers,
-                          gpointer user_data)
-{
-       GRegex     *uri_regex;
-       GMatchInfo *match_info;
-       gboolean    match;
-       gint        last = 0;
-
-       uri_regex = uri_regex_dup_singleton ();
-       match = g_regex_match_full (uri_regex, text, len, 0, 0, &match_info, NULL);
-       if (match) {
-               gint s = 0, e = 0;
-
-               do {
-                       g_match_info_fetch_pos (match_info, 0, &s, &e);
-
-                       if (s > last) {
-                               /* Append the text between last link (or the
-                                * start of the message) and this link */
-                               empathy_string_parser_substr (text + last,
-                                                             s - last,
-                                                             sub_parsers,
-                                                             user_data);
-                       }
-
-                       replace_func (text + s, e - s, NULL, user_data);
-
-                       last = e;
-               } while (g_match_info_next (match_info, NULL));
-       }
 
-       empathy_string_parser_substr (text + last, len - last,
-                                     sub_parsers, user_data);
-
-       g_match_info_free (match_info);
-       g_regex_unref (uri_regex);
-}
+#include "empathy-smiley-manager.h"
 
 void
 empathy_string_match_smiley (const gchar *text,
                             gssize len,
-                            EmpathyStringReplace replace_func,
-                            EmpathyStringParser *sub_parsers,
+                            TpawStringReplace replace_func,
+                            TpawStringParser *sub_parsers,
                             gpointer user_data)
 {
        guint last = 0;
@@ -123,9 +43,9 @@ empathy_string_match_smiley (const gchar *text,
                if (hit->start > last) {
                        /* Append the text between last smiley (or the
                         * start of the message) and this smiley */
-                       empathy_string_parser_substr (text + last,
-                                                     hit->start - last,
-                                                     sub_parsers, user_data);
+                       tpaw_string_parser_substr (text + last,
+                                                  hit->start - last,
+                                                  sub_parsers, user_data);
                }
 
                replace_func (text + hit->start, hit->end - hit->start,
@@ -138,17 +58,6 @@ empathy_string_match_smiley (const gchar *text,
        g_slist_free (hits);
        g_object_unref (smiley_manager);
 
-       empathy_string_parser_substr (text + last, len - last,
-                                     sub_parsers, user_data);
-}
-
-void
-empathy_string_match_all (const gchar *text,
-                         gssize len,
-                         EmpathyStringReplace replace_func,
-                         EmpathyStringParser *sub_parsers,
-                         gpointer user_data)
-{
-       replace_func (text, len, NULL, user_data);
+       tpaw_string_parser_substr (text + last, len - last,
+                                  sub_parsers, user_data);
 }
-