diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | lib/egg/egg-toolbar-editor.c | 2 | ||||
| -rw-r--r-- | lib/ephy-gui.c | 9 |
5 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,13 @@ +2004-11-04 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + + Updated glib dependency. + + * lib/ephy-gui.c: (ephy_gui_confirm_overwrite_file): + + Use g_filename_display_name() here. + 2004-11-03 Christian Persch <chpe@cvs.gnome.org> * src/ephy-window.c: (modal_alert_cb): diff --git a/autogen.sh b/autogen.sh index 75c5454ab..f16430765 100755 --- a/autogen.sh +++ b/autogen.sh @@ -17,4 +17,4 @@ which gnome-autogen.sh || { exit 1 } -USE_COMMON_DOC_BUILD=yes REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 . gnome-autogen.sh +USE_COMMON_DOC_BUILD=yes REQUIRED_AUTOMAKE_VERSION=1.8 USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.ac b/configure.ac index 24cdb1e4d..4000aa7a2 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ AM_MAINTAINER_MODE AC_PROG_INTLTOOL([0.29]) -GLIB_REQUIRED=2.5.4 +GLIB_REQUIRED=2.5.6 PANGO_REQUIRED=1.6.0 GTK_REQUIRED=2.5.4 LIBXML_REQUIRED=2.6.12 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; } |