gnome-commander r1669 - in trunk: . doc/C src

[epiotr svn gnome org]

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

Log:
Fixed problem with copying files to symlinked directories

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gnome-commander.xml
   trunk/src/gnome-cmd-con.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Mar 31 17:19:56 2008
@@ -5,6 +5,7 @@
 Bug fixes:
  * Fixed problem #392959 (dynamically changing user to root)
  * Fixed problem with sorting of UTF-8 encoded file names
+ * Fixed problem with copying files to symlinked directories
 
 New features:
  * Root Mode for starting GNOME Commander with administrator privileges

Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml	(original)
+++ trunk/doc/C/gnome-commander.xml	Mon Mar 31 17:19:56 2008
@@ -5823,6 +5823,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>
                 <para>New features:</para>

Modified: trunk/src/gnome-cmd-con.cc
==============================================================================
--- trunk/src/gnome-cmd-con.cc	(original)
+++ trunk/src/gnome-cmd-con.cc	Mon Mar 31 17:19:56 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)