aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-11-04 09:43:58 +0800
committerChristian Persch <chpe@src.gnome.org>2004-11-04 09:43:58 +0800
commit53b0b121d9b891989f2c1bad4934bd475746891d (patch)
treea7503b5731901ad69a7d773f789357761129b9e3
parent3808248a3d7e6de282f38f92d77311ed5d603d77 (diff)
downloadgsoc2013-epiphany-53b0b121d9b891989f2c1bad4934bd475746891d.tar
gsoc2013-epiphany-53b0b121d9b891989f2c1bad4934bd475746891d.tar.gz
gsoc2013-epiphany-53b0b121d9b891989f2c1bad4934bd475746891d.tar.bz2
gsoc2013-epiphany-53b0b121d9b891989f2c1bad4934bd475746891d.tar.lz
gsoc2013-epiphany-53b0b121d9b891989f2c1bad4934bd475746891d.tar.xz
gsoc2013-epiphany-53b0b121d9b891989f2c1bad4934bd475746891d.tar.zst
gsoc2013-epiphany-53b0b121d9b891989f2c1bad4934bd475746891d.zip
Updated glib dependency.
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.
-rw-r--r--ChangeLog10
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac2
-rwxr-xr-xlib/egg/egg-toolbar-editor.c2
-rw-r--r--lib/ephy-gui.c9
5 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e9ee6a68..1d6cd7f92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;
}