Merge branch 'irc-dialog-579800'

[empathy.git] / libempathy-gtk / empathy-theme.c

diff --git a/libempathy-gtk/empathy-theme.c b/libempathy-gtk/empathy-theme.c
index 429e3cfbe826623f232c1f0eb561c34ede92f867..ca4f66663eac50c587e625d5daae671a0849044c 100644 (file)
--- a/libempathy-gtk/empathy-theme.c
+++ b/libempathy-gtk/empathy-theme.c
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 #include <libempathy/empathy-utils.h>
@@ -36,11 +36,11 @@
 
 #define SCHEMES "(https?|ftps?|nntp|news|javascript|about|ghelp|apt|telnet|"\
                "file|webcal|mailto)"
-#define SEPARATOR "([^,;\?><()\\ \"\\.])"
 #define BODY "([^\\ ]+)"
-#define URI_REGEX "("SCHEMES"://"BODY SEPARATOR")" \
-                 "|((mailto:)?"BODY"@"BODY"\\."BODY SEPARATOR")"\
-                 "|((www|ftp)\\."BODY SEPARATOR")"
+#define END_BODY "([^\\ ]*[^,;\?><()\\ \"\\.])"
+#define URI_REGEX "("SCHEMES"://"END_BODY")" \
+                 "|((mailto:)?"BODY"@"BODY"\\."END_BODY")"\
+                 "|((www|ftp)\\."END_BODY")"
 static GRegex *uri_regex = NULL;
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTheme)
@@ -102,7 +102,7 @@ empathy_theme_init (EmpathyTheme *theme)
                EMPATHY_TYPE_THEME, EmpathyThemePriv);
 
        theme->priv = priv;
-       priv->smiley_manager = empathy_smiley_manager_new ();
+       priv->smiley_manager = empathy_smiley_manager_dup_singleton ();
 }
 
 static void