[Emacs-diffs] Changes to emacs/src/gtkutil.c

[Jan Djärv]

Index: emacs/src/gtkutil.c
diff -c emacs/src/gtkutil.c:1.53 emacs/src/gtkutil.c:1.54
*** emacs/src/gtkutil.c:1.53    Tue Nov 23 19:56:55 2004
--- emacs/src/gtkutil.c Tue Dec  7 08:09:10 2004
***************
*** 1200,1205 ****
--- 1200,1206 ----
                                            GTK_STOCK_OPEN : GTK_STOCK_OK),
                                           GTK_RESPONSE_OK,
                                           NULL);
+   gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filewin), TRUE);
  
    if (default_filename)
      {
***************
*** 1207,1222 ****
        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;
      }
--- 1208,1227 ----
        struct gcpro gcpro1;
        GCPRO1 (file);
  
+       file = build_string (default_filename);
+ 
        /* 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 (file, Qnil);
  
!       default_filename = SDATA (file);
!       if (Ffile_directory_p (file))
!         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin),
!                                              default_filename);
!       else
!         gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
!                                        default_filename);
  
        UNGCPRO;
      }