[Goodies-commits] r6817 - in gigolo/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2009-03-01 15:34:48 +0000 (Sun, 01 Mar 2009)
New Revision: 6817

Modified:
   gigolo/trunk/ChangeLog
   gigolo/trunk/src/bookmark.c
Log:
Fix creation of smb:// URIs from bookmarks when a domain is set but no username.

Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog	2009-03-01 14:35:58 UTC (rev 6816)
+++ gigolo/trunk/ChangeLog	2009-03-01 15:34:48 UTC (rev 6817)
@@ -10,6 +10,9 @@
  * src/backendgvfs.c, src/backendgvfs.h, src/bookmarkeditdialog.c:
    Implement browsing for smb shares in the Connect/Bookmark Edit
    dialogs to easily select them.
+ * src/bookmark.c:
+   Fix creation of smb:// URIs from bookmarks when a domain is set but
+   no username.
 
 
 2009-02-28  Enrico Tröger  <enrico(at)xfce(dot)org>

Modified: gigolo/trunk/src/bookmark.c
===================================================================
--- gigolo/trunk/src/bookmark.c	2009-03-01 14:35:58 UTC (rev 6816)
+++ gigolo/trunk/src/bookmark.c	2009-03-01 15:34:48 UTC (rev 6817)
@@ -286,7 +286,7 @@
 		(NZV(domain)) ? domain : "",
 		(NZV(domain)) ? ";" : "",
 		(NZV(user)) ? user : "",
-		(NZV(user)) ? "@" : "",
+		(NZV(user) || NZV(domain)) ? "@" : "",
 		priv->host,
 		(port) ? port : "",
 		(NZV(priv->share)) ? priv->share : "",