gnome-commander r1907 - in trunk: . src

[epiotr svn gnome org]

Author: epiotr
Date: Fri Jul 25 20:02:26 2008
New Revision: 1907
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1907&view=rev

Log:
Fix for "(null)" filename in message dlg

Modified:
   trunk/ChangeLog
   trunk/src/gnome-cmd-xfer.cc

Modified: trunk/src/gnome-cmd-xfer.cc
==============================================================================
--- trunk/src/gnome-cmd-xfer.cc	(original)
+++ trunk/src/gnome-cmd-xfer.cc	Fri Jul 25 20:02:26 2008
@@ -158,7 +158,8 @@
 
     if (info->status == GNOME_VFS_XFER_PROGRESS_STATUS_OVERWRITE)
     {
-        gchar *t = gnome_vfs_get_local_path_from_uri (info->target_name);
+        gchar *t = gnome_cmd_dir_is_local (data->to_dir) ? gnome_vfs_get_local_path_from_uri (info->target_name) :
+                                                           str_uri_basename (info->target_name);
         gchar *fn = get_utf8 (t);
         gchar *msg = g_strdup_printf (_("The file \"%s\" already exists.\n\nDo you want to overwrite it?\n"), fn);
 
@@ -177,7 +178,8 @@
             && data->prev_status != GNOME_VFS_XFER_PROGRESS_STATUS_OVERWRITE)
         {
             const gchar *error = gnome_vfs_result_to_string (info->vfs_status);
-            gchar *t = gnome_vfs_get_local_path_from_uri (info->target_name);
+            gchar *t = gnome_cmd_dir_is_local (data->to_dir) ? gnome_vfs_get_local_path_from_uri (info->target_name) :
+                                                               str_uri_basename (info->target_name);
             gchar *fn = get_utf8 (t);
             gchar *msg = g_strdup_printf (_("Error while copying to %s\n\n%s"), fn, error);