gvfs r1255 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Mon Feb 11 12:59:43 2008
New Revision: 1255
URL: http://svn.gnome.org/viewvc/gvfs?rev=1255&view=rev

Log:
2008-02-11  Alexander Larsson  <alexl redhat com>

        * daemon/gvfsbackendsftp.c:
	Set new path in set_display name.
	
        * daemon/gvfsjobsetdisplayname.c:
	Assert that new_path is set



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendsftp.c
   trunk/daemon/gvfsjobsetdisplayname.c

Modified: trunk/daemon/gvfsbackendsftp.c
==============================================================================
--- trunk/daemon/gvfsbackendsftp.c	(original)
+++ trunk/daemon/gvfsbackendsftp.c	Mon Feb 11 12:59:43 2008
@@ -3193,7 +3193,7 @@
                         gpointer user_data)
 {
   if (reply_type == SSH_FXP_STATUS)
-    result_from_status (job, reply, -1, -1); 
+    result_from_status (job, reply, -1, -1);
   else
     g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_FAILED,
                       _("Invalid reply received"));
@@ -3222,6 +3222,9 @@
   new_name = g_build_filename (dirname, basename, NULL);
   g_free (dirname);
   g_free (basename);
+
+  g_vfs_job_set_display_name_set_new_path (job,
+                                           new_name);
   
   command = new_command_stream (op_backend,
                                 SSH_FXP_RENAME,

Modified: trunk/daemon/gvfsjobsetdisplayname.c
==============================================================================
--- trunk/daemon/gvfsjobsetdisplayname.c	(original)
+++ trunk/daemon/gvfsjobsetdisplayname.c	Mon Feb 11 12:59:43 2008
@@ -170,6 +170,8 @@
 
   dbus_message_iter_init_append (reply, &iter);
 
+  g_assert (op_job->new_path != NULL);
+  
   _g_dbus_message_iter_append_cstring (&iter, op_job->new_path);
   
   return reply;