# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1099580727 0
# Node ID 68ea73fe257bf22f3b8bb2ad23b819bdc64e52f0
# Parent  a3fa0e63dd673b4baaf7f4c092c1f3b8c11c3159
* 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.

diff -r a3fa0e63dd67 -r 68ea73fe257b src/ChangeLog
--- a/src/ChangeLog	Thu Nov 04 14:18:22 2004 +0000
+++ b/src/ChangeLog	Thu Nov 04 15:05:27 2004 +0000
@@ -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 -r a3fa0e63dd67 -r 68ea73fe257b src/gtkutil.c
--- a/src/gtkutil.c	Thu Nov 04 14:18:22 2004 +0000
+++ b/src/gtkutil.c	Thu Nov 04 15:05:27 2004 +0000
@@ -1131,7 +1131,7 @@
 };
 
 #ifdef HAVE_GTK_FILE_BOTH
-static int use_old_gtk_file_dialog;
+int use_old_gtk_file_dialog;
 #endif
 
 
@@ -3554,14 +3554,6 @@
                                     "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 -r a3fa0e63dd67 -r 68ea73fe257b src/gtkutil.h
--- a/src/gtkutil.h	Thu Nov 04 14:18:22 2004 +0000
+++ b/src/gtkutil.h	Thu Nov 04 15:05:27 2004 +0000
@@ -126,6 +126,10 @@
   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 -r a3fa0e63dd67 -r 68ea73fe257b src/xfns.c
--- a/src/xfns.c	Thu Nov 04 14:18:22 2004 +0000
+++ b/src/xfns.c	Thu Nov 04 15:05:27 2004 +0000
@@ -5557,6 +5557,14 @@
   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+.  */);
   {