* gtkutil.h: Declare use_old_gtk_file_dialog.

* gtkutil.c: Make use_old_gtk_file_dialog non-static.
(xg_initialize): Moved DEFVAR_BOOL for use_old_gtk_file_dialog ...
* xfns.c (syms_of_xfns): ... to here.

4 files changed, 19 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b88374e71e..0921957b577 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2004-11-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
+        * gtkutil.h: Declare use_old_gtk_file_dialog.
+
+        * gtkutil.c: Make use_old_gtk_file_dialog non-static.
+        (xg_initialize): Moved DEFVAR_BOOL for use_old_gtk_file_dialog ...
+        * xfns.c (syms_of_xfns): ... to here.
+
         * gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
         it doesn't start with /.
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index f59ccecbcb8..f5f05709e48 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1131,7 +1131,7 @@ enum
 };
 
 #ifdef HAVE_GTK_FILE_BOTH
-static int use_old_gtk_file_dialog;
+int use_old_gtk_file_dialog;
 #endif
 
 
@@ -3554,14 +3554,6 @@ xg_initialize ()
                                     "gtk-key-theme-name",
                                     "Emacs",
                                     EMACS_CLASS);
-
-#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
 }
 
 #endif /* USE_GTK */
diff --git a/src/gtkutil.h b/src/gtkutil.h
index b2e2c5f2fff..44e82885d7f 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -126,6 +126,10 @@ typedef struct _widget_value
   struct _widget_value *free_list;
 } widget_value;
 
+#ifdef HAVE_GTK_FILE_BOTH
+extern int use_old_gtk_file_dialog;
+#endif
+
 extern widget_value *malloc_widget_value P_ ((void));
 extern void free_widget_value P_ ((widget_value *));
 
diff --git a/src/xfns.c b/src/xfns.c
index 2cf8a59ca52..3179fa1c77b 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5557,6 +5557,14 @@ 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+.  */);
   {