gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-13 04:51:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace eel_make_uri_from_input with the gnome-vfs equivalent. Closes bug

Browse source 
2005-03-25  Martin Wehner  <martin.wehner@gmail.com>

	* 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 <gicmo@gnome.org>
This commit is contained in:
Martin Wehner 2005-03-25 14:02:02 +00:00 committed by Martin Wehner
parent 75803edc7d
commit 8dfdc1cd4b
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2005-03-25 Martin Wehner <martin.wehner@gmail.com>
* 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 <gicmo@gnome.org>
2005-03-25 Martin Wehner <martin.wehner@gmail.com>
* libnautilus-private/nautilus-bookmark.c:

2
src/nautilus-connect-server-dialog.c
View file

@ -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);

6
src/nautilus-location-bar.c
View file

@ -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);

3
src/nautilus-location-dialog.c
View file

@ -29,6 +29,7 @@
#include <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkstock.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libnautilus-private/nautilus-file-utilities.h>
#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);