[Goodies-commits] r6410 - in sion/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2009-01-06 20:21:19 +0000 (Tue, 06 Jan 2009)
New Revision: 6410

Modified:
   sion/trunk/ChangeLog
   sion/trunk/src/bookmark.c
Log:
Allow '@' in usernames when parsing URIs.

Modified: sion/trunk/ChangeLog
===================================================================
--- sion/trunk/ChangeLog	2009-01-06 20:21:11 UTC (rev 6409)
+++ sion/trunk/ChangeLog	2009-01-06 20:21:19 UTC (rev 6410)
@@ -5,6 +5,8 @@
    Don't allow entering duplicate bookmark names.
    When any input was missing or wrong in the Bookmark Edit dialog, put
    the input focus back to the text entry which failed.
+ * src/bookmark.c:
+   Allow '@' in usernames when parsing URIs.
 
 
 2009-01-02  Enrico Tröger  <enrico(at)xfce(dot)org>

Modified: sion/trunk/src/bookmark.c
===================================================================
--- sion/trunk/src/bookmark.c	2009-01-06 20:21:11 UTC (rev 6409)
+++ sion/trunk/src/bookmark.c	2009-01-06 20:21:19 UTC (rev 6410)
@@ -147,6 +147,10 @@
 
 	/* find username */
 	t = strchr(s, '@');
+	// if we found a '@', search for a second one and use the second one as end of the username
+	// as the username itself might contain a '@'
+	if (t != NULL && (x = strchr(t + 1, '@')) != NULL)
+		t = x;
 	if (t != NULL)
 	{
 		l = 0;
@@ -228,7 +232,6 @@
 }
 
 
-
 static void sion_bookmark_init(SionBookmark *self)
 {
 	bookmark_clear(self);