diff options
| author | Alexander Gramiak | 2019-04-07 19:02:03 -0600 |
|---|---|---|
| committer | Alexander Gramiak | 2019-04-14 19:15:45 -0600 |
| commit | fc0f469fb5b5eb28ca4d9948190be6cb1bd8156e (patch) | |
| tree | a872db9e55d150d03c7378b599d860214cab28b5 /src/xterm.c | |
| parent | 5c2f94a182a1154766154040eb5b4b39275fd3b6 (diff) | |
| download | emacs-fc0f469fb5b5eb28ca4d9948190be6cb1bd8156e.tar.gz emacs-fc0f469fb5b5eb28ca4d9948190be6cb1bd8156e.zip | |
Bump minimum GTK versions to 2.24 and 3.10
* configure.ac: Bump required GTK 2 and GTK 3 versions and the
associated GLib versions. Remove obsolete AC_CHECK_FUNCS calls. These
check for functions available in later GTK 2 versions. These checks
and can safely be removed with the exception of
gtk_window_set_has_resize_grip, which according to a comment in
gtkutil.c causes an issue in Ubuntu's GTK 2.
* src/gtkutil.c:
* src/xfns.c:
* src/xterm.c:
* src/xterm.h: Remove now unused conditional blocks. Use HAVE_GTK3
instead of GTK_CHECK_VERSION where now applicable. Remove checks of
now always true USE_GTK_TOOLTIP.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index def6915d62e..b9f4a1fc303 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -12514,7 +12514,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 12514 | 12514 | ||
| 12515 | dpy = DEFAULT_GDK_DISPLAY (); | 12515 | dpy = DEFAULT_GDK_DISPLAY (); |
| 12516 | 12516 | ||
| 12517 | #if ! GTK_CHECK_VERSION (2, 90, 0) | 12517 | #ifndef HAVE_GTK3 |
| 12518 | /* Load our own gtkrc if it exists. */ | 12518 | /* Load our own gtkrc if it exists. */ |
| 12519 | { | 12519 | { |
| 12520 | const char *file = "~/.emacs.d/gtkrc"; | 12520 | const char *file = "~/.emacs.d/gtkrc"; |