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



commit d3228fb63ee6c5d19b1e3ed54c7b12bf44c28099
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sun Oct 11 01:13:50 2009 +0200

    Fixed problem #597890 (wrong arguments passed to meld)

 src/gnome-cmd-user-actions.cc |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index a0d6a0c..dfcb410 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -921,21 +921,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(), "");
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]