diff options
| author | Robert Pluim | 2018-11-27 09:39:30 +0100 |
|---|---|---|
| committer | Robert Pluim | 2018-11-27 09:41:59 +0100 |
| commit | a291f624289bd2009b7fa230d62b5940e0484c83 (patch) | |
| tree | df21d9b3189008676d61904c70e572411f72b946 /src/gtkutil.h | |
| parent | f0531b8e64250414baf1c0d2dde3fbfc55a748a0 (diff) | |
| download | emacs-a291f624289bd2009b7fa230d62b5940e0484c83.tar.gz emacs-a291f624289bd2009b7fa230d62b5940e0484c83.zip | |
Don't call xwidget functions until GTK has been initialized
Follow up fix to Bug#33294.
* src/gtkutil.c: Define xg_gtk_initialized.
(xg_initialize): Set it when GTK has finished initializing.
* src/gtkutil.h: Declare xg_gtk_initialized.
* src/xwidget.c (Fmake_xwidget): Error out if GTK has not been
initialized.
(xwidget_init_view): Likewise.
Diffstat (limited to 'src/gtkutil.h')
| -rw-r--r-- | src/gtkutil.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gtkutil.h b/src/gtkutil.h index 7dcd549f5c0..3b074073e44 100644 --- a/src/gtkutil.h +++ b/src/gtkutil.h | |||
| @@ -202,5 +202,6 @@ extern void xg_initialize (void); | |||
| 202 | to indicate that the callback should do nothing. */ | 202 | to indicate that the callback should do nothing. */ |
| 203 | extern bool xg_ignore_gtk_scrollbar; | 203 | extern bool xg_ignore_gtk_scrollbar; |
| 204 | 204 | ||
| 205 | extern bool xg_gtk_initialized; | ||
| 205 | #endif /* USE_GTK */ | 206 | #endif /* USE_GTK */ |
| 206 | #endif /* GTKUTIL_H */ | 207 | #endif /* GTKUTIL_H */ |