From 8dfdc1cd4ba873369cc2ee8f27b85533f1ba49e2 Mon Sep 17 00:00:00 2001 From: Martin Wehner Date: Fri, 25 Mar 2005 14:02:02 +0000 Subject: [PATCH] Replace eel_make_uri_from_input with the gnome-vfs equivalent. Closes bug 2005-03-25 Martin Wehner * src/nautilus-connect-server-dialog.c: (connect_to_server): * src/nautilus-location-bar.c: (nautilus_location_bar_get_location), (nautilus_location_bar_update_label): * src/nautilus-location-dialog.c: (open_current_location): Replace eel_make_uri_from_input with the gnome-vfs equivalent. Closes bug #165743. Patch from Christian Kellner --- ChangeLog | 12 ++++++++++++ src/nautilus-connect-server-dialog.c | 2 +- src/nautilus-location-bar.c | 6 +++--- src/nautilus-location-dialog.c | 3 ++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ad81faeb..47c321d88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-03-25 Martin Wehner + + * src/nautilus-connect-server-dialog.c: (connect_to_server): + * src/nautilus-location-bar.c: + (nautilus_location_bar_get_location), + (nautilus_location_bar_update_label): + * src/nautilus-location-dialog.c: (open_current_location): + Replace eel_make_uri_from_input with the gnome-vfs equivalent. + Closes bug #165743. + + Patch from Christian Kellner + 2005-03-25 Martin Wehner * libnautilus-private/nautilus-bookmark.c: diff --git a/src/nautilus-connect-server-dialog.c b/src/nautilus-connect-server-dialog.c index 3788655c6..66175e84b 100644 --- a/src/nautilus-connect-server-dialog.c +++ b/src/nautilus-connect-server-dialog.c @@ -130,7 +130,7 @@ connect_to_server (NautilusConnectServerDialog *dialog) if (type == TYPE_URI) { user_uri = gtk_editable_get_chars (GTK_EDITABLE (dialog->details->uri_entry), 0, -1); - uri = eel_make_uri_from_input (user_uri); + uri = gnome_vfs_make_uri_from_input (user_uri); g_free (user_uri); vfs_uri = gnome_vfs_uri_new (uri); diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c index fb0c422f9..0416e21c4 100644 --- a/src/nautilus-location-bar.c +++ b/src/nautilus-location-bar.c @@ -484,7 +484,7 @@ nautilus_location_bar_set_location (NautilusNavigationBar *navigation_bar, * @bar: A NautilusLocationBar. * * returns a newly allocated "string" containing the mangled - * (by eel_make_uri_from_input) text that the user typed in...maybe a URI + * (by gnome_vfs_make_uri_from_input) text that the user typed in...maybe a URI * but not guaranteed. * **/ @@ -497,7 +497,7 @@ nautilus_location_bar_get_location (NautilusNavigationBar *navigation_bar) bar = NAUTILUS_LOCATION_BAR (navigation_bar); user_location = gtk_editable_get_chars (GTK_EDITABLE (bar->details->entry), 0, -1); - best_uri = eel_make_uri_from_input (user_location); + best_uri = gnome_vfs_make_uri_from_input (user_location); g_free (user_location); return best_uri; } @@ -515,7 +515,7 @@ nautilus_location_bar_update_label (NautilusLocationBar *bar) char *current_location; current_text = gtk_entry_get_text (GTK_ENTRY (bar->details->entry)); - current_location = eel_make_uri_from_input (current_text); + current_location = gnome_vfs_make_uri_from_input (current_text); if (gnome_vfs_uris_match (bar->details->last_location, current_location)) { gtk_label_set_text (GTK_LABEL (bar->details->label), LOCATION_LABEL); diff --git a/src/nautilus-location-dialog.c b/src/nautilus-location-dialog.c index 2226cc243..231b79110 100644 --- a/src/nautilus-location-dialog.c +++ b/src/nautilus-location-dialog.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include "nautilus-location-entry.h" #include "nautilus-desktop-window.h" @@ -77,7 +78,7 @@ open_current_location (NautilusLocationDialog *dialog) char *user_location; user_location = gtk_editable_get_chars (GTK_EDITABLE (dialog->details->entry), 0, -1); - uri = eel_make_uri_from_input (user_location); + uri = gnome_vfs_make_uri_from_input (user_location); g_free (user_location); nautilus_window_go_to (dialog->details->window, uri);