Mercurial > emacs
changeset 112360:3215a5cff4dd
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.
| author | Tom Tromey <tromey@redhat.com> |
|---|---|
| date | Tue, 18 Jan 2011 10:28:28 -0700 |
| parents | 011b1eb5c384 |
| children | 116a3428737d |
| files | src/ChangeLog src/gtkutil.c src/gtkutil.h |
| diffstat | 3 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Jan 18 10:00:04 2011 -0700 +++ b/src/ChangeLog Tue Jan 18 10:28:28 2011 -0700 @@ -1,3 +1,12 @@ +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.
--- a/src/gtkutil.c Tue Jan 18 10:00:04 2011 -0700 +++ b/src/gtkutil.c Tue Jan 18 10:28:28 2011 -0700 @@ -1536,7 +1536,6 @@ 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 @@ 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 @@ 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 @@ 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);
--- a/src/gtkutil.h Tue Jan 18 10:00:04 2011 -0700 +++ b/src/gtkutil.h Tue Jan 18 10:28:28 2011 -0700 @@ -182,6 +182,11 @@ 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 */