Declare some DEFVARs globally, not locally

	* gtkutil.h (x_gtk_use_old_file_dialog, x_gtk_show_hidden_files)
	(x_gtk_file_dialog_help_text, x_gtk_whole_detached_tool_bar):
	Declare.
	* gtkutil.c (xg_uses_old_file_dialog):
	(xg_get_file_with_chooser):
	(xg_tool_bar_detach_callback): Don't redeclare globals.

3 files changed, 14 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d6808bb27b7..1b9655e9605 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-18  Tom Tromey  <tromey@redhat.com>
 
+        * gtkutil.h (x_gtk_use_old_file_dialog, x_gtk_show_hidden_files)
+        (x_gtk_file_dialog_help_text, x_gtk_whole_detached_tool_bar):
+        Declare.
+        * gtkutil.c (xg_uses_old_file_dialog):
+        (xg_get_file_with_chooser):
+        (xg_tool_bar_detach_callback): Don't redeclare globals.
+
+2011-01-18  Tom Tromey  <tromey@redhat.com>
+
         * lisp.h (DEFVAR_BUFFER_DEFAULTS): New macro.
         * buffer.c (syms_of_buffer): Use DEFVAR_BUFFER_DEFAULTS.
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 52512687a07..9d55f52c9f9 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1536,7 +1536,6 @@ int
 xg_uses_old_file_dialog (void)
 {
 #ifdef HAVE_GTK_FILE_SELECTION_NEW
-  extern int x_gtk_use_old_file_dialog;
   return x_gtk_use_old_file_dialog;
 #else
   return 0;
@@ -1577,8 +1576,6 @@ xg_toggle_visibility_cb (GtkWidget *widget, gpointer data)
 static void
 xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data)
 {
-  extern int x_gtk_show_hidden_files;
-
   if (strcmp (arg1->name, "show-hidden") == 0)
     {
       GtkWidget *wtoggle = GTK_WIDGET (user_data);
@@ -1626,9 +1623,6 @@ xg_get_file_with_chooser (FRAME_PTR f,
   GtkFileChooserAction action = (mustmatch_p ?
                                  GTK_FILE_CHOOSER_ACTION_OPEN :
                                  GTK_FILE_CHOOSER_ACTION_SAVE);
-  extern int x_gtk_show_hidden_files;
-  extern int x_gtk_file_dialog_help_text;
-
 
   if (only_dir_p)
     action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
@@ -3794,7 +3788,6 @@ xg_tool_bar_detach_callback (GtkHandleBox *wbox,
                              gpointer client_data)
 {
   FRAME_PTR f = (FRAME_PTR) client_data;
-  extern int x_gtk_whole_detached_tool_bar;
 
   g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar,
                 NULL);
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 78df4fe7863..1bc3a1e77ea 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -182,6 +182,11 @@ extern void xg_initialize (void);
    to indicate that the callback should do nothing.  */
 extern int xg_ignore_gtk_scrollbar;
 
+extern int x_gtk_use_old_file_dialog;
+extern int x_gtk_show_hidden_files;
+extern int x_gtk_file_dialog_help_text;
+extern int x_gtk_whole_detached_tool_bar;
+
 #endif /* USE_GTK */
 #endif /* GTKUTIL_H */