]> git.0d.be Git - empathy.git/commitdiff
Correct grouping in the hostname regexp
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>
Wed, 31 Aug 2011 14:14:15 +0000 (15:14 +0100)
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>
Wed, 31 Aug 2011 14:16:31 +0000 (15:16 +0100)
Correctly group our subregexp otherwise hostnames like the following
won't be recognized due to the way things expand:
  a.com
  example.c-om

libempathy-gtk/empathy-account-widget.c

index e148adab2ec173ab7aada9929da58b250c590544..8df91745deeb3ca02414610b882771cdf80731d9 100644 (file)
@@ -154,9 +154,10 @@ static guint signals[LAST_SIGNAL] = { 0 };
 #define ALPHADIGITDASHS   "(["ALPHADIGITDASH"]*)"
 
 #define HOSTNUMBER        "("DIGITS"\\."DIGITS"\\."DIGITS"\\."DIGITS")"
-#define TOPLABEL          ALPHAS"|(["ALPHA"]" ALPHADIGITDASHS "["ALPHADIGIT"])"
-#define DOMAINLABEL       ALPHADIGITS"|(["ALPHADIGIT"]" ALPHADIGITDASHS \
-                                       "["ALPHADIGIT"])"
+#define TOPLABEL          "("ALPHAS \
+                            "| (["ALPHA"]"ALPHADIGITDASHS "["ALPHADIGIT"]))"
+#define DOMAINLABEL       "("ALPHADIGITS"|(["ALPHADIGIT"]" ALPHADIGITDASHS \
+                                       "["ALPHADIGIT"]))"
 #define HOSTNAME          "((" DOMAINLABEL "\\.)+" TOPLABEL ")"
 /* Based on http://www.ietf.org/rfc/rfc1738.txt (section 5) */
 #define HOST              "("HOSTNAME "|" HOSTNUMBER")"