Mercurial > emacs
changeset 57941:68ea73fe257b
* 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.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 04 Nov 2004 15:05:27 +0000 |
| parents | a3fa0e63dd67 |
| children | 3a6cc929df05 |
| files | src/ChangeLog src/gtkutil.c src/gtkutil.h src/xfns.c |
| diffstat | 4 files changed, 19 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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 /.
--- 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 */
--- 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 *));
--- 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+. */); {