rpms/gvfs/F-9 gvfs-ftp-read-directory-2.patch, 1.1, 1.2 gvfs.spec, 1.55, 1.56

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4667

Modified Files:
	gvfs-ftp-read-directory-2.patch gvfs.spec 
Log Message:
* Tue Jun 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.2.4-4
- Minor fixes to the last FTP patch


gvfs-ftp-read-directory-2.patch:

Index: gvfs-ftp-read-directory-2.patch
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-9/gvfs-ftp-read-directory-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gvfs-ftp-read-directory-2.patch	10 Jun 2008 13:58:15 -0000	1.1
+++ gvfs-ftp-read-directory-2.patch	11 Jun 2008 08:52:06 -0000	1.2
@@ -49,7 +49,7 @@
  	  break;
  	ftp_connection_set_error_from_response (conn, response);
  	return 0;
-@@ -564,6 +568,55 @@
+@@ -564,6 +568,57 @@
  }
  
  static void
@@ -96,6 +96,8 @@
 +  if (response == 550)
 +    {
 +      ftp_connection_check_file (conn, handlers, file);
++      if (!ftp_connection_in_error (conn))
++          ftp_connection_set_error_from_response (conn, response);
 +      response = 0;
 +    }
 +  return response;
@@ -105,7 +107,7 @@
  ftp_connection_parse_features (FtpConnection *conn)
  {
    struct {
-@@ -1461,6 +1514,21 @@
+@@ -1461,6 +1516,21 @@
  }
  
  static void
@@ -115,11 +117,11 @@
 +                                        RESPONSE_PASS_550,
 +                                        "CWD %s", file);
 +
-+  if (response == 250)
++  if (STATUS_GROUP (response) == 2)
 +    {
 +      g_set_error (&conn->error, G_IO_ERROR, 
 +                   G_IO_ERROR_IS_DIRECTORY,
-+                   _("File is a directory"));
++                   _("File is directory"));
 +    }
 +}
 +
@@ -127,7 +129,7 @@
  do_open_for_read (GVfsBackend *backend,
  		  GVfsJobOpenForRead *job,
  		  const char *filename)
-@@ -1468,6 +1536,7 @@
+@@ -1468,6 +1538,7 @@
    GVfsBackendFtp *ftp = G_VFS_BACKEND_FTP (backend);
    FtpConnection *conn;
    FtpFile *file;
@@ -135,7 +137,7 @@
  
    conn = g_vfs_backend_ftp_pop_connection (ftp, G_VFS_JOB (job));
    if (!conn)
-@@ -1476,9 +1545,11 @@
+@@ -1476,9 +1547,11 @@
    ftp_connection_ensure_data_connection (conn);
  
    file = ftp_filename_from_gvfs_path (conn, filename);


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-9/gvfs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gvfs.spec	10 Jun 2008 13:58:15 -0000	1.55
+++ gvfs.spec	11 Jun 2008 08:52:06 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -196,6 +196,9 @@
 
 
 %changelog
+* Tue Jun 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.2.4-4
+- Minor fixes to the last FTP patch
+
 * Tue Jun 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.2.4-3
 - Fix transfer of whole directories from FTP (#448560)