gvfs r1982 - in branches/gnome-2-24: . client

[tbzatek svn gnome org]

Author: tbzatek
Date: Mon Sep 15 15:04:27 2008
New Revision: 1982
URL: http://svn.gnome.org/viewvc/gvfs?rev=1982&view=rev

Log:
SMB: encode username and domain into the URI


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/client/smburi.c

Modified: branches/gnome-2-24/client/smburi.c
==============================================================================
--- branches/gnome-2-24/client/smburi.c	(original)
+++ branches/gnome-2-24/client/smburi.c	Mon Sep 15 15:04:27 2008
@@ -206,6 +206,8 @@
   const char *type;
   const char *server;
   const char *share;
+  const char *user;
+  const char *domain;
   char *s;
   GDecodedUri *uri;
 
@@ -240,6 +242,15 @@
 	uri->path = g_strconcat ("/", share, info->path, NULL);
       else
 	uri->path = g_strconcat ("/", share, "/", info->path, NULL);
+	
+      user = g_vfs_uri_mount_info_get (info, "user");
+      domain = g_vfs_uri_mount_info_get (info, "domain");
+      if (user) {
+        if (domain)
+          uri->userinfo = g_strconcat (domain, ";", user, NULL);
+        else
+          uri->userinfo = g_strdup (user);
+      }
     }
 
   s = g_vfs_encode_uri (uri, allow_utf8);