diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-08-21 06:39:18 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-08-21 06:39:18 +0000 |
| commit | 9d601c6799ca74f398d5df8dc0144f74084f546b (patch) | |
| tree | a006906797b6fd55a738b1c3e653f46a2a15ce31 /gtk/file_dlg.c | |
| parent | aacb4d90f0ef62557d0fa370c5bfcafe89c466a0 (diff) | |
On Windows, use the directory in which the binary resides as the
directory in which global data files are stored. If an installed binary
is being run, that's the correct directory for them; if a build-tree
binary is being run, the "manuf" file will be there, and you can put
other data files there as well, if necessary.
Do the same with plugins, except that, if there's no
"plugins\\{version}" subdirectory of that directory, fall back on the
default installation directory, so you at least have a place where you
can put plugins for use by build-tree binaries. (Should we, instead,
have the Windows build procedure create a subdirectory of the "plugins"
source directory, with the plugin version number as its name, and copy
the plugins there, so you'd use the build-tree plugin binaries?)
Move "test_for_directory()" out of "util.c" and into
"epan/filesystem.c", with the other file system access portability
wrappers and convenience routines. Fix "util.h" not to declare it - or
other routines moved to "epan/filesystem.c" a while ago.
svn path=/trunk/; revision=3858
Diffstat (limited to 'gtk/file_dlg.c')
| -rw-r--r-- | gtk/file_dlg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 8f89941b0a..4c6067e427 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.40 2001/06/05 07:38:37 guy Exp $ + * $Id: file_dlg.c,v 1.41 2001/08/21 06:39:18 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -36,6 +36,8 @@ #include <string.h> +#include <epan/filesystem.h> + #include "globals.h" #include "gtkglobals.h" #include "prefs.h" @@ -47,7 +49,6 @@ #include "menu.h" #include "file_dlg.h" #include "dlg_utils.h" -#include "util.h" #include "main.h" static void file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs); |