gnome-commander r1670 - in branches/gcmd-1-3: . doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Mar 31 17:21:00 2008
New Revision: 1670
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1670&view=rev

Log:
Fixed problem with copying files to symlinked directories

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/doc/C/gnome-commander.xml
   branches/gcmd-1-3/src/gnome-cmd-con.cc

Modified: branches/gcmd-1-3/doc/C/gnome-commander.xml
==============================================================================
--- branches/gcmd-1-3/doc/C/gnome-commander.xml	(original)
+++ branches/gcmd-1-3/doc/C/gnome-commander.xml	Mon Mar 31 17:21:00 2008
@@ -5858,6 +5858,9 @@
                         <listitem>
                             <para>Fixed problem with sorting of UTF-8 encoded file names</para>
                         </listitem>
+                        <listitem>
+                            <para>Fixed problem with copying files to symlinked directories</para>
+                        </listitem>
                     </itemizedlist>
                 </para>
             </entry>

Modified: branches/gcmd-1-3/src/gnome-cmd-con.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-con.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-con.cc	Mon Mar 31 17:21:00 2008
@@ -467,7 +467,8 @@
     GnomeCmdPath *path = gnome_cmd_con_create_path (con, path_str);
     GnomeVFSURI *uri = gnome_cmd_con_create_uri (con, path);
     GnomeVFSFileInfo *info = gnome_vfs_file_info_new ();
-    GnomeVFSFileInfoOptions infoOpts = GNOME_VFS_FILE_INFO_DEFAULT;
+    GnomeVFSFileInfoOptions infoOpts = info->type!=GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK ? GNOME_VFS_FILE_INFO_DEFAULT
+                                                                                     : (GnomeVFSFileInfoOptions) (GNOME_VFS_FILE_INFO_DEFAULT | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
     GnomeVFSResult res = gnome_vfs_get_file_info_uri (uri, info, infoOpts);
 
     if (res == GNOME_VFS_OK)