From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 4 Sep 2006 14:47:52 +0000 (+0000)
Subject: * gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
X-Git-Tag: emacs-pretest-22.0.90~771
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae6c1c19504fac2228f15125cdbcbddc0c67c0bf;p=emacs.git

* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
 the file chooser message.  Only call gtk_file_chooser_set_current_name
 when action is SAVE.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b730c8d9889..e21593fbd45 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
+	the file chooser message.  Only call gtk_file_chooser_set_current_name
+	when action is SAVE.
+
 2006-09-04  Andreas Schwab  <schwab@suse.de>
 
 	* Makefile.in: Double all single and back quotes in C-style
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 172c7b94a64..89b0f8b11c6 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1326,12 +1326,9 @@ xg_get_file_with_chooser (f, prompt, default_filename,
   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 ");
-  if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
-    strcat (message, "C-x C-f to visit files.");
-  else
-    strcat (message, "C-x C-w to write files.");
+  strcat (message, "\nIf you don't like this file selector, use the "
+          "corresponding\nkey binding or customize "
+          "use-file-dialog to turn it off.");
     
   wmessage = gtk_label_new (message);
   gtk_widget_show (wmessage);
@@ -1359,12 +1356,15 @@ xg_get_file_with_chooser (f, prompt, default_filename,
                                              utf8_filename);
       else
         {
-          char *cp = strrchr (utf8_filename, '/');
-          if (cp) ++cp;
-          else cp = utf8_filename;
           gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
                                          utf8_filename);
-          gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filewin), cp);
+          if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
+            {
+              char *cp = strrchr (utf8_filename, '/');
+              if (cp) ++cp;
+              else cp = utf8_filename;
+              gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filewin), cp);
+            }
         }
 
       UNGCPRO;