diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-09-07 21:57:42 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-09-07 21:57:42 +0000 |
| commit | 325450ebda0e66983f0c7b2aec81b011bec7953e (patch) | |
| tree | 499fcde259c05dc7a2ef7cc96bd05e0f97d4f37a /libnautilus-private/nautilus-file-utilities.c | |
| parent | 3693f5742d764f7375f32d31bd5f86617eba7061 (diff) | |
| download | nautilus-325450ebda0e66983f0c7b2aec81b011bec7953e.tar.gz | |
Fixed bug 2875 (update set of built-in bookmarks)
* data/static_bookmarks.xml:
Fixed bug 2872 (Complaint about bookmark location mismatch
when visiting new folder)
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_uris_match): New function, compares two uris
after canonicalizing each.
* src/nautilus-window-manage-views.c:
(check_last_bookmark_location_matches_window):
Use nautilus_uris_match to compare bookmark's uri with
window's uri.
Diffstat (limited to 'libnautilus-private/nautilus-file-utilities.c')
| -rw-r--r-- | libnautilus-private/nautilus-file-utilities.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index d00c4c58c..7152a1eba 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -205,6 +205,24 @@ nautilus_make_uri_canonical (const char *uri) return canonical_uri; } +gboolean +nautilus_uris_match (const char *uri_1, const char *uri_2) +{ + char *canonical_1; + char *canonical_2; + gboolean result; + + canonical_1 = nautilus_make_uri_canonical (uri_1); + canonical_2 = nautilus_make_uri_canonical (uri_2); + + result = nautilus_str_is_equal (canonical_1, canonical_2); + + g_free (canonical_1); + g_free (canonical_2); + + return result; +} + /** * nautilus_make_path: |