# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1099577902 0
# Node ID a3fa0e63dd673b4baaf7f4c092c1f3b8c11c3159
# Parent  35cb9a370d9eb3083007761310b2d5b079269f9d
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
it doesn't start with /.

diff -r 35cb9a370d9e -r a3fa0e63dd67 src/ChangeLog
--- a/src/ChangeLog	Thu Nov 04 10:23:45 2004 +0000
+++ b/src/ChangeLog	Thu Nov 04 14:18:22 2004 +0000
@@ -1,3 +1,8 @@
+2004-11-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
+	it doesn't start with /.
+
 2004-11-04  Kenichi Handa  <handa@m17n.org>
 
 	* fontset.c (fontset_pattern_regexp): If '*' is preceded by '\',
diff -r 35cb9a370d9e -r a3fa0e63dd67 src/gtkutil.c
--- a/src/gtkutil.c	Thu Nov 04 10:23:45 2004 +0000
+++ b/src/gtkutil.c	Thu Nov 04 14:18:22 2004 +0000
@@ -1178,8 +1178,24 @@
 
 
   if (default_filename)
-    gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
-                                   default_filename);
+    {
+      Lisp_Object file;
+      struct gcpro gcpro1;
+      GCPRO1 (file);
+
+      /* File chooser does not understand ~/... in the file name.  It must be
+         an absolute name starting with /.  */
+      if (default_filename[0] != '/')
+        {
+          file = Fexpand_file_name (build_string (default_filename), Qnil);
+          default_filename = SDATA (file);
+        }
+
+      gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
+                                     default_filename);
+
+      UNGCPRO;
+    }
 
   gtk_widget_show (filewin);