diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-06-23 08:27:28 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-06-23 08:27:28 +0000 |
| commit | 199f10b46d760d3578179bf469fcf36520991a12 (patch) | |
| tree | 4090a227bb5954f4c503ee592d6df84da787ecb6 /libnautilus-private/nautilus-file-utilities.c | |
| parent | 5a0426d093a78234fcbf128a6d011180a761cf70 (diff) | |
| download | nautilus-199f10b46d760d3578179bf469fcf36520991a12.tar.gz | |
Patch from Jamie McCracken <jamiemcc@blueyonder.co.uk>
2005-06-23 Alexander Larsson <alexl@redhat.com>
Patch from Jamie McCracken <jamiemcc@blueyonder.co.uk>
* src/nautilus-bookmark-list.[ch]:
Share bookmarks with gtk+.
* libnautilus-private/nautilus-file-utilities.[ch]:
* src/nautilus-window.c: (real_get_title):
Move compute_default_title to nautilus_compute_title_for_uri.
* libnautilus-private/nautilus-bookmark.[ch]:
* src/nautilus-bookmarks-window.c:
Add has_custom_name boolean to NautilusBookmark
* src/Makefile.am:
* src/nautilus-bookmark-parsing.[ch]:
* src/nautilus-navigation-window-menus.c:
Remove no longer needed files nautilus-bookmark-parsing.[ch].
Diffstat (limited to 'libnautilus-private/nautilus-file-utilities.c')
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index 4227eef9f..25ebf13be 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -29,6 +29,7 @@ #include "nautilus-lib-self-check-functions.h" #include "nautilus-metadata.h" #include "nautilus-metafile.h" +#include "nautilus-file.h" #include <eel/eel-glib-extensions.h> #include <eel/eel-string.h> #include <eel/eel-vfs-extensions.h> @@ -47,6 +48,42 @@ #define LEGACY_DESKTOP_DIRECTORY_NAME ".gnome-desktop" #define DEFAULT_DESKTOP_DIRECTORY_MODE (0755) + +char * +nautilus_compute_title_for_uri (const char *text_uri) +{ + NautilusFile *file; + GnomeVFSURI *uri; + char *title, *displayname; + const char *hostname; + + hostname = NULL; + + if (text_uri) { + file = nautilus_file_get (text_uri); + uri = gnome_vfs_uri_new (text_uri); + if (uri && !gnome_vfs_uri_is_local (uri)) { + hostname = gnome_vfs_uri_get_host_name (uri); + } + displayname = nautilus_file_get_display_name (file); + if (hostname) { + title = g_strdup_printf (_("%s on %s"), displayname, hostname); + g_free (displayname); + } else { + title = displayname; + } + if (uri) { + gnome_vfs_uri_unref (uri); + } + nautilus_file_unref (file); + } else { + title = g_strdup (""); + } + + return title; +} + + gboolean nautilus_file_name_matches_hidden_pattern (const char *name_or_relative_uri) { |