#include <config.h>
#include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <libempathy/empathy-utils.h>
/* Number of seconds between timestamps when using normal mode, 5 minutes. */
#define TIMESTAMP_INTERVAL 300
-#define SHEMES "(https?|ftps?|nntp|news|javascript|about|ghelp|apt|telnet|"\
- "file|webcal|mailto)"
-#define SEPARATOR "([^,;\?><()\\ ])"
-#define BODY "([^\\ ]*(\\\\ )?)+"
-#define URI_REGEX "("SHEMES"://"BODY SEPARATOR")" \
- "|((mailto:)?"BODY"@"BODY"\\."BODY SEPARATOR")"\
- "|((www|ftp)."BODY SEPARATOR")"
+#define SCHEMES "(https?|ftps?|nntp|news|javascript|about|ghelp|apt|telnet|"\
+ "file|webcal|mailto)"
+#define BODY "([^\\ ]+)"
+#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)
EMPATHY_TYPE_THEME, EmpathyThemePriv);
theme->priv = priv;
- priv->smiley_manager = empathy_smiley_manager_new ();
+ priv->smiley_manager = empathy_smiley_manager_dup_singleton ();
}
static void