* 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.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 25dd88d544e..759877f3950 100644
--- 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