[gnome-commander/gcmd-1-2-8] Fixed problem #597890 (wrong arguments passed to meld)

[Piotr Eljasiak <epiotr src gnome org>]

commit e6d377e039f11f84f15649e07e43fe7694df4477
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sun Oct 11 01:10:41 2009 +0200

    Fixed problem #597890 (wrong arguments passed to meld)

 NEWS                          |    1 +
 doc/C/gnome-commander.xml     |    3 +++
 src/gnome-cmd-user-actions.cc |   15 ++-------------
 3 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/NEWS b/NEWS
index b7f3014..29f519e 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Bug fixes:
  * Fixed problem #596973 (documentation build error)
  * Fixed problem #597144 (missing call to pclose)
  * Fixed problem #597233 (validating of doc translations)
+ * Fixed problem #597890 (wrong arguments passed to meld)
 
 
 ===================================
diff --git a/doc/C/gnome-commander.xml b/doc/C/gnome-commander.xml
index 55a84cb..2143001 100644
--- a/doc/C/gnome-commander.xml
+++ b/doc/C/gnome-commander.xml
@@ -6039,6 +6039,9 @@
                         <listitem>
                             <para>Fixed problem #597233 (validating of doc translations)</para>
                         </listitem>
+                        <listitem>
+                            <para>Fixed problem #597890 (wrong arguments passed to meld)</para>
+                        </listitem>
                     </itemizedlist>
                 </para>
             </entry>
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index c371ac1..90773f2 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -851,21 +851,10 @@ void file_sync_dirs (GtkMenuItem *menuitem, gpointer not_used)
         return;
     }
 
-    GnomeVFSURI *active_dir_uri = gnome_cmd_dir_get_uri (active_fs->get_directory());
-    GnomeVFSURI *inactive_dir_uri = gnome_cmd_dir_get_uri (inactive_fs->get_directory());
-    gchar *active_dir = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (active_dir_uri), NULL);
-    gchar *inactive_dir = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (inactive_dir_uri), NULL);
-
-    gnome_vfs_uri_unref (active_dir_uri);
-    gnome_vfs_uri_unref (inactive_dir_uri);
-
     string s;
 
-    append_real_path (s, active_dir);
-    append_real_path (s, inactive_dir);
-
-    g_free (active_dir);
-    g_free (inactive_dir);
+    append_real_path (s, GNOME_CMD_FILE (active_fs->get_directory()));
+    append_real_path (s, GNOME_CMD_FILE (inactive_fs->get_directory()));
 
     gchar *cmd = g_strdup_printf (gnome_cmd_data.get_differ(), s.c_str(), "");