From 179e516c2ab3b80b27e6a655dba3f1823711ea08 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Thu, 20 Aug 2009 09:41:28 +0400
Subject: [PATCH] VFS: moved vfs_translate_url() declaration to the public
 scope.

Fixed missed includes.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 src/layout.c   | 6 +++---
 src/main.c     | 9 +++++----
 vfs/vfs-impl.h | 1 -
 vfs/vfs.h      | 2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/layout.c b/src/layout.c
index 15ee4c2e2..0a2eaa7c5 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -54,10 +54,11 @@
 #include "../src/tty/mouse.h"
 #include "../src/tty/win.h"	/* do_enter_ca_mode() */
 
+#include "../src/mcconfig/mcconfig.h"
+
 #include "dialog.h"
 #include "widget.h"
 #include "command.h"
-#include "../src/mcconfig/mcconfig.h"
 #include "main-widgets.h"
 #include "main.h"
 #include "subshell.h"	/* For use_subshell and resize_subshell() */
@@ -65,7 +66,6 @@
 #include "menu.h"
 #include "strutil.h"
 #include "background.h"         /* we_are_background */
-
 /* Needed for the extern declarations of integer parameters */
 #include "dir.h"
 #include "panel.h"		/* The Panel widget */
@@ -73,8 +73,8 @@
 #include "layout.h"
 #include "info.h"		/* The Info widget */
 #include "view.h"		/* The view widget */
-
 #include "setup.h"		/* For save_setup() */
+#include "../vfs/vfs.h"		/* For vfs_translate_url() */
 
 /* Controls the display of the rotating dash on the verbose mode */
 int nice_rotating_dash = 1;
diff --git a/src/main.c b/src/main.c
index f88b185a5..ca3823746 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,7 +37,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <pwd.h>
+#include <pwd.h>		/* for username in xterm title */
 
 #include "global.h"
 
@@ -47,6 +47,8 @@
 #include "../src/tty/key.h"		/* For init_key() */
 #include "../src/tty/win.h"		/* xterm_flag */
 
+#include "../src/mcconfig/mcconfig.h"
+
 #include "dir.h"
 #include "dialog.h"
 #include "menu.h"
@@ -58,7 +60,6 @@
 #include "cons.saver.h"
 #include "subshell.h"
 #include "setup.h"		/* save_setup() */
-#include "../src/mcconfig/mcconfig.h"
 #include "boxes.h"		/* sort_box() */
 #include "layout.h"
 #include "cmd.h"		/* Normal commands */
@@ -69,13 +70,13 @@
 #include "execute.h"
 #include "ext.h"		/* For flush_extension_file() */
 #include "strutil.h"
-#include <pwd.h>		/* for username in xterm title */
-
 /* Listbox for the command history feature */
 #include "widget.h"
 #include "command.h"
 #include "wtools.h"
 
+#include "../vfs/vfs.h"		/* vfs_translate_url() */
+
 #include "chmod.h"
 #include "chown.h"
 #include "achown.h"
diff --git a/vfs/vfs-impl.h b/vfs/vfs-impl.h
index c12369451..e61564723 100644
--- a/vfs/vfs-impl.h
+++ b/vfs/vfs-impl.h
@@ -133,7 +133,6 @@ char *vfs_path (const char *path);
 int vfs_file_class_flags (const char *filename);
 
 void vfs_fill_names (fill_names_f);
-char *vfs_translate_url (const char *);
 
 /* vfs/direntry.c: */
 void *vfs_s_open (struct vfs_class *, const char *, int, int);
diff --git a/vfs/vfs.h b/vfs/vfs.h
index cc7d34238..23dd0b604 100644
--- a/vfs/vfs.h
+++ b/vfs/vfs.h
@@ -32,6 +32,8 @@ const char *vfs_get_encoding (const char *path);
 /* canonize and translate path, return new string */
 char *vfs_canon_and_translate (const char *path);
 
+char *vfs_translate_url (const char *url);
+
 /* Only the routines outside of the VFS module need the emulation macros */
 
 int mc_open (const char *filename, int flags, ...);