gvfs r1524 - in trunk: . daemon hal

[otte svn gnome org]

Author: otte
Date: Tue Mar  4 12:42:16 2008
New Revision: 1524
URL: http://svn.gnome.org/viewvc/gvfs?rev=1524&view=rev

Log:
2008-03-04  Benjamin Otte  <otte gnome org>

	* daemon/gvfsbackendftp.c: (run_list_command):
	don't require \r as line ending for LIST commands. Fixes ftp.netbsd.org
	* hal/ghalvolumemonitor.c: (adopt_orphan_mount):
	unused variable



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendftp.c
   trunk/hal/ghalvolumemonitor.c

Modified: trunk/daemon/gvfsbackendftp.c
==============================================================================
--- trunk/daemon/gvfsbackendftp.c	(original)
+++ trunk/daemon/gvfsbackendftp.c	Tue Mar  4 12:42:16 2008
@@ -1730,8 +1730,8 @@
       status = soup_socket_read_until (conn->data,
 				       name + bytes_read,
 				       size - bytes_read - 1,
-				       "\r\n",
-				       2,
+				       "\n",
+				       1,
 				       &n_bytes,
 				       &got_boundary,
 				       conn->job->cancellable,
@@ -1749,7 +1749,7 @@
 	      }
 	    if (got_boundary)
 	      {
-		name[bytes_read - 2] = 0;
+		name[bytes_read - 1] = 0;
 		list = g_list_prepend (list, g_strdup (name));
 		bytes_read = 0;
 	      }

Modified: trunk/hal/ghalvolumemonitor.c
==============================================================================
--- trunk/hal/ghalvolumemonitor.c	(original)
+++ trunk/hal/ghalvolumemonitor.c	Tue Mar  4 12:42:16 2008
@@ -492,7 +492,6 @@
   GList *l;
   GFile *mount_root;
   GVolume *ret;
-  GHalVolumeMonitor *volume_monitor;
   
   /* This is called by the union volume monitor which does
      have a ref to this. So its guaranteed to live, unfortunately