diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-10-27 19:06:41 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-10-27 19:06:41 +0000 |
| commit | ad6543423d7a3899a1d3801d317c4d45eddb011a (patch) | |
| tree | 7c5e4dfba16c1b7f5b9f6bb3269101fb8dd59952 /libnautilus-private | |
| parent | 9fbd1e2b4cd365a60bbbd63614b3020387e8b9c1 (diff) | |
| download | nautilus-ad6543423d7a3899a1d3801d317c4d45eddb011a.tar.gz | |
Grumble grumble canonical grumble ui grumble.
Josh found another assertion failure involving
canonical uris. Yay Josh! Boo canonical uri troubles!
* libnautilus-extensions/nautilus-directory.c:
(nautilus_directory_get_internal): Removed call to
nautilus_uri_is_canonical_uri since it isn't quite the
right check. Decided that the right check here is
pointless.
* libnautilus-extensions/nautilus-file-utilities.c:
* libnautilus-extensions/nautilus-file-utilities.h:
Removed nautilus_uri_is_canonical_uri since it now has
no callers.
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-directory.c | 1 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.c | 13 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.h | 1 |
3 files changed, 0 insertions, 15 deletions
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index 78a70752f..96245e52a 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -313,7 +313,6 @@ nautilus_directory_get_internal (const char *uri, gboolean create) /* If the object is already in the hash table, look it up. */ - g_assert (nautilus_uri_is_canonical_uri (canonical_uri)); directory = g_hash_table_lookup (directories, canonical_uri); if (directory != NULL) { diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index 5b41c31f3..ea26136bf 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -1171,19 +1171,6 @@ nautilus_copy_uri_simple ( const char *source_uri, const char *dest_uri) return result; } -gboolean -nautilus_uri_is_canonical_uri (const char *uri) -{ - gboolean result; - char *canonical_uri; - - canonical_uri = nautilus_make_uri_canonical (uri); - result = nautilus_strcmp (uri, canonical_uri) == 0; - g_free (canonical_uri); - - return result; -} - #ifdef EAZEL_BUILD_TIMESTAMP static const char *BUILD_TIMESTAMP = EAZEL_BUILD_TIMESTAMP; #else diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h index efbe43bc9..c440d474b 100644 --- a/libnautilus-private/nautilus-file-utilities.h +++ b/libnautilus-private/nautilus-file-utilities.h @@ -40,7 +40,6 @@ char * nautilus_format_uri_for_display (const char char * nautilus_make_uri_from_input (const char *location); gboolean nautilus_uri_is_trash (const char *uri); char * nautilus_make_uri_canonical (const char *uri); -gboolean nautilus_uri_is_canonical_uri (const char *uri); gboolean nautilus_uris_match (const char *uri_1, const char *uri_2); char * nautilus_uri_get_basename (const char *uri); |