From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 22 Sep 2006 08:19:55 +0000 (+0000)
Subject: * gtkutil.c (xg_get_file_with_chooser): Only chow C-l help for
X-Git-Tag: emacs-pretest-22.0.90~407
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b7d4a7915edf6aabe29e0e0045439b3d8086337;p=emacs.git

* gtkutil.c (xg_get_file_with_chooser): Only chow C-l help for
 Gtk+ versions < 2.10.
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index cdc87044c81..19fb8ef69a3 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1382,7 +1382,9 @@ xg_get_file_with_chooser (f, prompt, default_filename,
   if (x_gtk_file_dialog_help_text)
     {
       message[0] = '\0';
-      if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
+      /* Gtk+ 2.10 has the file name text entry box integrated in the dialog.
+         Show the C-l help text only for versions < 2.10.  */
+      if (gtk_check_version(2, 10, 0) && 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, use the "
               "corresponding\nkey binding or customize "