X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-password.c;h=a191b9f131c6b91be5362b68d2a3ff80bc4b63d5;hb=5e55b6b5e74175b5638337616b84527fb8286908;hp=463d1e71af71d049c5b54781b8dd14a9e3c4071f;hpb=60b8f6615b70c2f828c66641e01585ac791d5dc8;p=evince.git

diff --git a/shell/ev-password.c b/shell/ev-password.c
index 463d1e71..a191b9f1 100644
--- a/shell/ev-password.c
+++ b/shell/ev-password.c
@@ -22,9 +22,9 @@
 #endif
 
 #include <glib/gi18n.h>
+#include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 
 #ifdef WITH_KEYRING
 #include <gnome-keyring.h>
@@ -75,15 +75,15 @@ ev_password_dialog_set_property (GObject      *object,
 	char *format;
 	char *markup;
 	char *base_name;
-	char *file_name;
+	GFile *file;
 
-	switch (prop_id)
-	{
+	switch (prop_id) {
 	case PROP_URI:
 		dialog->priv->uri = g_strdup (g_value_get_string (value));
+		
+		file = g_file_new_for_uri (dialog->priv->uri);
 
-		file_name = gnome_vfs_format_uri_for_display (dialog->priv->uri);
-		base_name = g_path_get_basename (file_name);
+		base_name = g_file_get_basename (file);
 		format = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
 					  _("Password required"),
 					  _("The document “%s” is locked and requires a password before it can be opened."));
@@ -92,9 +92,9 @@ ev_password_dialog_set_property (GObject      *object,
 		gtk_label_set_markup (GTK_LABEL (dialog->priv->label), markup);
 
 		g_free (base_name);
-		g_free (file_name);
 		g_free (format);
 		g_free (markup);
+		g_object_unref (file);
 
 		ev_password_search_in_keyring (dialog, dialog->priv->uri);
 		break;
@@ -256,7 +256,7 @@ ev_password_dialog_save_password (EvPasswordDialog *dialog)
 	attribute.value.string = g_strdup (dialog->priv->uri);
 	g_array_append_val (attributes, attribute);
 	
-	unescaped_uri = gnome_vfs_unescape_string_for_display (dialog->priv->uri);
+	unescaped_uri = g_uri_unescape_string (dialog->priv->uri, NULL);
 	name = g_strdup_printf (_("Password for document %s"), unescaped_uri);	
 
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->check_default))) {
@@ -334,10 +334,10 @@ ev_password_search_in_keyring (EvPasswordDialog *dialog, const gchar *uri)
 	return;
 }
 
-char *
+const char *
 ev_password_dialog_get_password (EvPasswordDialog *dialog)
 {
-	return g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->priv->entry)));
+	return gtk_entry_get_text (GTK_ENTRY (dialog->priv->entry));
 }
 
 void