* gtkutil.c (xg_get_file_with_chooser): Changed message shown

 in file chooser.

diff --git a/src/ChangeLog b/src/ChangeLog
index da18386f37fc4ef2dd025e606af204dc006184b8..4f6cb895004ede17a7fb17e34b3d1dc10970b2c1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-28  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * gtkutil.c (xg_get_file_with_chooser): Changed message shown
+       in file chooser.
+
 2005-12-27  Richard M. Stallman  <rms@gnu.org>
 
        * lread.c (readevalloop): Set PT and ZV in the proper buffer,

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 7e7687dd0447f4391b9c3ed04e0d8308bb9d3f6d..cb8e5a21860cb87e2552293381a52392eee150df 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1285,20 +1285,11 @@ xg_get_file_with_chooser (f, prompt, default_filename,
   g_signal_connect (G_OBJECT (wtoggle), "clicked",
                     G_CALLBACK (xg_toggle_visibility_cb), G_OBJECT(filewin));
 
-#ifdef HAVE_GTK_FILE_SELECTION_NEW
-  strcpy (message, "If you find this file dialog inconvinient "
-          "you can customize\n"
-          "x-use-old-gtk-file-dialog to get the old file dialog,\n"
-          "or you can customize use-file-dialog to disable file dialogs,\n"
-          "or just use C-x C-f to open files.");
-#else
-  strcpy (message, "If you find this file dialog inconvinient "
-          "you can customize\n"
-          "use-file-dialog to disable file dialogs,\n"
-          "or just use C-x C-f to open files.");
-#endif
-  if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
-    strcat (message, "\nUse C-l to bring up a text input area.");
+  message[0] = '\0';
+  if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
+    strcat (message, "\nType C-l to display a file name text entry box.\n");
+  strcat (message, "\nIf you don't like this file selector, customize "
+          "use-file-dialog\nto turn it off, or type C-x C-f to visit files.");
 
   wmessage = gtk_label_new (message);
   gtk_widget_show (wmessage);