1 files changed, 3 insertions, 57 deletions
diff --git a/libempathy-gtk/empathy-string-parser.h b/libempathy-gtk/empathy-string-parser.h
index 78a822652..57b784aeb 100644
--- a/libempathy-gtk/empathy-string-parser.h
+++ b/libempathy-gtk/empathy-string-parser.h
@@ -22,71 +22,17 @@
 #define __EMPATHY_STRING_PARSER_H__
 
 #include <glib.h>
+#include <tp-account-widgets/tpaw-string-parser.h>
 
 G_BEGIN_DECLS
 
-typedef struct _EmpathyStringParser EmpathyStringParser;
-
-typedef void (*EmpathyStringReplace) (const gchar *text,
-				      gssize len,
-				      gpointer match_data,
-				      gpointer user_data);
-typedef void (*EmpathyStringMatch) (const gchar *text,
-				    gssize len,
-				    EmpathyStringReplace replace_func,
-				    EmpathyStringParser *sub_parsers,
-				    gpointer user_data);
-
-struct _EmpathyStringParser {
-	EmpathyStringMatch match_func;
-	EmpathyStringReplace replace_func;
-};
-
-void
-empathy_string_parser_substr (const gchar *text,
-			      gssize len,
-			      EmpathyStringParser *parsers,
-			      gpointer user_data);
-
-void
-empathy_string_match_link (const gchar *text,
-			   gssize len,
-			   EmpathyStringReplace replace_func,
-			   EmpathyStringParser *sub_parsers,
-			   gpointer user_data);
-
 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);
 
-void
-empathy_string_match_all (const gchar *text,
-			  gssize len,
-			  EmpathyStringReplace replace_func,
-			  EmpathyStringParser *sub_parsers,
-			  gpointer user_data);
-
-/* Replace functions assume user_data is a GString */
-void
-empathy_string_replace_link (const gchar *text,
-                             gssize len,
-                             gpointer match_data,
-                             gpointer user_data);
-
-void
-empathy_string_replace_escaped (const gchar *text,
-				gssize len,
-				gpointer match_data,
-				gpointer user_data);
-
-/* Returns a new string with <a> html tag around links, and escape the rest.
- * To be used with gtk_label_set_markup() for example */
-gchar *
-empathy_add_link_markup (const gchar *text);
-
 G_END_DECLS
 
 #endif /*  __EMPATHY_STRING_PARSER_H__ */