From 53b0b121d9b891989f2c1bad4934bd475746891d Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 4 Nov 2004 01:43:58 +0000 Subject: Updated glib dependency. 2004-11-04 Christian Persch * configure.ac: Updated glib dependency. * lib/ephy-gui.c: (ephy_gui_confirm_overwrite_file): Use g_filename_display_name() here. --- lib/egg/egg-toolbar-editor.c | 2 ++ lib/ephy-gui.c | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c index 0187188ff..43003d0bf 100755 --- a/lib/egg/egg-toolbar-editor.c +++ b/lib/egg/egg-toolbar-editor.c @@ -18,6 +18,8 @@ * $Id$ */ +#include "config.h" + #include "egg-toolbar-editor.h" #include "egg-editable-toolbar.h" #include "eggintl.h" diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c index de4d3abdc..65e0b0de6 100644 --- a/lib/ephy-gui.c +++ b/lib/ephy-gui.c @@ -132,7 +132,7 @@ gboolean ephy_gui_confirm_overwrite_file (GtkWidget *parent, const char *filename) { GtkWidget *dialog; - char *converted; + char *display_name; gboolean retval; if (filename == NULL) return FALSE; @@ -142,15 +142,14 @@ ephy_gui_confirm_overwrite_file (GtkWidget *parent, const char *filename) return TRUE; } - converted = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL); - if (converted == NULL) return FALSE; + display_name = g_filename_display_name (filename); dialog = gtk_message_dialog_new (parent ? GTK_WINDOW (parent) : NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, - _("A file %s already exists."), converted); + _("A file %s already exists."), display_name); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), @@ -169,7 +168,7 @@ ephy_gui_confirm_overwrite_file (GtkWidget *parent, const char *filename) gtk_widget_destroy (dialog); - g_free (converted); + g_free (display_name); return retval; } -- cgit v1.2.3