diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2004-11-04 15:05:27 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2004-11-04 15:05:27 +0000 |
| commit | 0a4f23f30e353cbe4c85cef460eca779a2553037 (patch) | |
| tree | 164b4a88f87f06a55f2051ecfda12a98a0147de6 | |
| parent | a872928c524e28d328ad5abd87ed3bb0f0ebc771 (diff) | |
| download | emacs-0a4f23f30e353cbe4c85cef460eca779a2553037.tar.gz emacs-0a4f23f30e353cbe4c85cef460eca779a2553037.tar.bz2 emacs-0a4f23f30e353cbe4c85cef460eca779a2553037.zip | |
* 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.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/gtkutil.c | 10 | ||||
| -rw-r--r-- | src/gtkutil.h | 4 | ||||
| -rw-r--r-- | src/xfns.c | 8 |
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+. */); { |