diff options
| author | Michael K. Fleming <mfleming@eazel.com> | 2001-02-12 23:29:57 +0000 |
|---|---|---|
| committer | Michael Fleming <mfleming@src.gnome.org> | 2001-02-12 23:29:57 +0000 |
| commit | eb7fea928b7422997d2effb1df8c61694556494b (patch) | |
| tree | 8e5cf1bc1ffc4a5b3b2a752d435cf7329887ae03 /libnautilus-private/nautilus-file-utilities.h | |
| parent | 34cb359888e996ccf73b39c689774689a176f17c (diff) | |
| download | nautilus-eb7fea928b7422997d2effb1df8c61694556494b.tar.gz | |
reviewed by: <sullivan@eazel.com>
2001-02-11 Michael K. Fleming <mfleming@eazel.com>
reviewed by: <sullivan@eazel.com>
Bug 5961: Starting nautilus with path to local HTML file
causes images not to load.
The problem here was that any argument specified on the commandline
was being passed directly into Nautilus and its components as a
valid URI. Added pre-processing to commandline arguments, including
ability to handle relative file pathnames. (so you can do "nautilus ."
to open a window on the current directory)
* libnautilus-extensions/nautilus-file-utilities.c:
(file_uri_from_local_relative_path),
(nautilus_make_uri_from_shell_arg), (is_uri_partial),
(remove_internal_relative_components),
(nautilus_uri_make_full_from_relative),
(nautilus_self_check_file_utilities):
* libnautilus-extensions/nautilus-file-utilities.h:
* src/nautilus-application.c:
(nautilus_make_uri_list_from_shell_strv),
(nautilus_application_startup):
Diffstat (limited to 'libnautilus-private/nautilus-file-utilities.h')
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h index 25086a5ec..910327bf5 100644 --- a/libnautilus-private/nautilus-file-utilities.h +++ b/libnautilus-private/nautilus-file-utilities.h @@ -40,6 +40,8 @@ typedef struct NautilusReadFileHandle NautilusReadFileHandle; char * nautilus_format_uri_for_display (const char *uri); char * nautilus_make_uri_from_input (const char *location); +char * nautilus_make_uri_from_shell_arg (const char *location); + gboolean nautilus_uri_is_trash (const char *uri); gboolean nautilus_uri_is_trash_folder (const char *uri); gboolean nautilus_uri_is_in_trash (const char *uri); @@ -49,6 +51,10 @@ gboolean nautilus_uris_match (const char char * nautilus_uri_get_basename (const char *uri); char * nautilus_uri_get_scheme (const char *uri); +char * nautilus_uri_make_full_from_relative (const char *base_uri, + const char *uri); + + /* FIXME bugzilla.eazel.com 2424: * This is the same as gnome-libs g_concat_dir_and_file except * for handling path == NULL. |