* gtkutil.c (xg_get_file_name): Rename use-old-gtk-file-dialog to

x-use-old-gtk-file-dialog.

* xfns.c: Define x_use_old_gtk_file_dialog.
(syms_of_xfns): Rename use-old-gtk-file-dialog to x-...  Move it
outside ifdef USE_GTK.

diff --git a/src/ChangeLog b/src/ChangeLog
index c9d6b946962cd0c3b5cdbc8c5961694528b63230..a767007f3f0c5a673a3ffec76765cb35b3e66400 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-23  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * gtkutil.c (xg_get_file_name): Rename use-old-gtk-file-dialog to
+       x-use-old-gtk-file-dialog.
+
+       * xfns.c: Define x_use_old_gtk_file_dialog.
+       (syms_of_xfns): Rename use-old-gtk-file-dialog to x-...  Move it
+       outside ifdef USE_GTK.
+
 2004-11-23  Kim F. Storm  <storm@cua.dk>
 
        * dispextern.h (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P)

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 25dd88d544e568388cbc9691d829e31bbbb54bc8..759877f39502a626fcfe0dabe3ca97bf9affee24 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1122,10 +1122,6 @@ create_dialog (wv, select_cb, deactivate_cb)
 /***********************************************************************
                       File dialog functions
  ***********************************************************************/
-#ifdef HAVE_GTK_FILE_BOTH
-int use_old_gtk_file_dialog;
-#endif
-
 /* Function that is called when the file dialog pops down.
    W is the dialog widget, RESPONSE is the response code.
    USER_DATA is what we passed in to g_signal_connect (pointer to int).  */
@@ -1311,7 +1307,9 @@ xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p)
   xg_get_file_func func;
 
 #ifdef HAVE_GTK_FILE_BOTH
-  if (use_old_gtk_file_dialog)
+  extern int x_use_old_gtk_file_dialog;
+
+  if (x_use_old_gtk_file_dialog)
     w = xg_get_file_with_selection (f, prompt, default_filename,
                                     mustmatch_p, only_dir_p, &func);
   else

diff --git a/src/xfns.c b/src/xfns.c
index 165ba37571d437f459ca8be414726ce005a0e516..aa66c017f3c6afc7a16ef1114a8cd6237922c8d0 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -151,6 +151,10 @@ char *gray_bitmap_bits = gray_bits;
 
 int display_hourglass_p;
 
+/* Non-zero means prompt with the old GTK file selection dialog.  */
+
+int x_use_old_gtk_file_dialog;
+
 /* The background and shape of the mouse pointer, and shape when not
    over text or in the modeline.  */
 
@@ -5574,6 +5578,14 @@ such a font.  This is especially effective for such large fonts as
 Chinese, Japanese, and Korean.  */);
   Vx_pixel_size_width_font_regexp = Qnil;
 
+/* This is not ifdef:ed, so other builds than GTK can customize it.  */
+  DEFVAR_BOOL ("x-use-old-gtk-file-dialog", &x_use_old_gtk_file_dialog,
+    doc: /* *Non-nil means prompt with the old GTK file selection dialog.
+If nil or if the file selection dialog is not available, the new GTK file
+chooser is used instead.  To turn off all file dialogs set the
+variable `use-file-dialog'.  */);
+  x_use_old_gtk_file_dialog = 0;
+
 #ifdef USE_X_TOOLKIT
   Fprovide (intern ("x-toolkit"), Qnil);
 #ifdef USE_MOTIF
@@ -5593,14 +5605,6 @@ Chinese, Japanese, and Korean.  */);
   Fprovide (intern ("x-toolkit"), Qnil);
   Fprovide (intern ("gtk"), Qnil);
 
-#ifdef HAVE_GTK_FILE_BOTH
-  DEFVAR_BOOL ("use-old-gtk-file-dialog", &use_old_gtk_file_dialog,
-    doc: /* *Non-nil means that the old GTK file selection dialog is used.
-If nil the new GTK file chooser is used instead.  To turn off
-all file dialogs set the variable `use-file-dialog'.  */);
-  use_old_gtk_file_dialog = 0;
-#endif
-
   DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,
                doc: /* Version info for GTK+.  */);
   {