[gnome-commander] Changed param type from (GnomeVFSFileInfo *, GnomeCmdPath *, GnomeCmdCon *) to (GnomeCmdCon *) in gn

[Piotr Eljasiak <epiotr src gnome org>]

commit 3778ce50bc9964599ac32b1c83601a1955671dc6
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Wed Feb 2 19:21:05 2011 +0100

    Changed param type from (GnomeVFSFileInfo *, GnomeCmdPath *, GnomeCmdCon *)
    to (GnomeCmdCon *) in gnome_cmd_dir_new_with_con()

 src/gnome-cmd-con.cc |    2 +-
 src/gnome-cmd-dir.cc |   14 +++++++-------
 src/gnome-cmd-dir.h  |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/gnome-cmd-con.cc b/src/gnome-cmd-con.cc
index ba75eb8..7d165a1 100644
--- a/src/gnome-cmd-con.cc
+++ b/src/gnome-cmd-con.cc
@@ -254,7 +254,7 @@ static gboolean check_con_open_progress (GnomeCmdCon *con)
             {
                 DEBUG('m', "GnomeCmdCon::OPEN_OK detected\n");
 
-                GnomeCmdDir *dir = gnome_cmd_dir_new_with_con (con->base_info, con->base_path, con);
+                GnomeCmdDir *dir = gnome_cmd_dir_new_with_con (con);
 
                 gnome_cmd_con_set_default_dir (con, dir);
 
diff --git a/src/gnome-cmd-dir.cc b/src/gnome-cmd-dir.cc
index 6ba8095..f6e2eee 100644
--- a/src/gnome-cmd-dir.cc
+++ b/src/gnome-cmd-dir.cc
@@ -269,12 +269,12 @@ GnomeCmdDir *gnome_cmd_dir_new_from_info (GnomeVFSFileInfo *info, GnomeCmdDir *p
 }
 
 
-GnomeCmdDir *gnome_cmd_dir_new_with_con (GnomeVFSFileInfo *info, GnomeCmdPath *path, GnomeCmdCon *con)
+GnomeCmdDir *gnome_cmd_dir_new_with_con (GnomeCmdCon *con)
 {
-    g_return_val_if_fail (info != NULL, NULL);
     g_return_val_if_fail (GNOME_CMD_IS_CON (con), NULL);
+    g_return_val_if_fail (con->base_info != NULL, NULL);
 
-    GnomeVFSURI *uri = gnome_cmd_con_create_uri (con, path);
+    GnomeVFSURI *uri = gnome_cmd_con_create_uri (con, con->base_path);
     gchar *uri_str = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
 
     GnomeCmdDir *dir = gnome_cmd_con_cache_lookup (con, uri_str);
@@ -282,16 +282,16 @@ GnomeCmdDir *gnome_cmd_dir_new_with_con (GnomeVFSFileInfo *info, GnomeCmdPath *p
     {
         g_free (uri_str);
         gnome_vfs_uri_unref (uri);
-        GNOME_CMD_FILE (dir)->update_info(info);
+        GNOME_CMD_FILE (dir)->update_info(con->base_info);
         return dir;
     }
 
     dir = (GnomeCmdDir *) g_object_new (GNOME_CMD_TYPE_DIR, NULL);
-    gnome_cmd_file_setup (GNOME_CMD_FILE (dir), info, NULL);
+    gnome_cmd_file_setup (GNOME_CMD_FILE (dir), con->base_info, NULL);
 
     dir->priv->con = con;
-    gnome_cmd_dir_set_path (dir, path);
-    g_object_ref (path);
+    gnome_cmd_dir_set_path (dir, con->base_path);
+    g_object_ref (con->base_path);
     dir->priv->needs_mtime_update = FALSE;
 
     gnome_cmd_con_add_to_cache (con, dir);
diff --git a/src/gnome-cmd-dir.h b/src/gnome-cmd-dir.h
index fc645c5..0f8100e 100644
--- a/src/gnome-cmd-dir.h
+++ b/src/gnome-cmd-dir.h
@@ -86,7 +86,7 @@ struct GnomeCmdDirClass
 struct GnomeCmdCon;
 
 GnomeCmdDir *gnome_cmd_dir_new_from_info (GnomeVFSFileInfo *info, GnomeCmdDir *parent);
-GnomeCmdDir *gnome_cmd_dir_new_with_con (GnomeVFSFileInfo *info, GnomeCmdPath *path, GnomeCmdCon *con);
+GnomeCmdDir *gnome_cmd_dir_new_with_con (GnomeCmdCon *con);
 GnomeCmdDir *gnome_cmd_dir_new (GnomeCmdCon *con, GnomeCmdPath *path);
 GnomeCmdDir *gnome_cmd_dir_get_parent (GnomeCmdDir *dir);
 GnomeCmdDir *gnome_cmd_dir_get_child (GnomeCmdDir *dir, const gchar *child);