diff options
| author | Dmitry Antipov | 2013-09-17 10:33:24 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-17 10:33:24 +0400 |
| commit | 19452b86657532741d78fa3bcc12b12b58a8a54b (patch) | |
| tree | 5c928382e6df92cb838f8483415b8932bb3e15a4 /src/ChangeLog | |
| parent | 1149ffdb07563832d2593320d79970c8266ae85c (diff) | |
| download | emacs-19452b86657532741d78fa3bcc12b12b58a8a54b.tar.gz emacs-19452b86657532741d78fa3bcc12b12b58a8a54b.zip | |
* configure.ac: Do not check for g_type_init because we
require glib >= 2.28 for GTK3, glib >= 2.10 for GTK2,
glib >= 2.26 for GSettings and glib >= 2.7.0 for GConf, so
suitable glib should provide g_type_init unconditionally.
* src/image.c (fn_g_type_init) [WINDOWSNT]: Define and load
only if Glib < 2.36.0.
(fn_g_type_init) [!WINDOWSNT]: Define only if Glib < 2.36.0.
* src/xsettings.c (init_gconf, init_gsettings): Do not check
for g_type_init.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ceae9e1a63e..c3c64f79d89 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2013-09-17 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * image.c (fn_g_type_init) [WINDOWSNT]: Define and load | ||
| 4 | only if Glib < 2.36.0. | ||
| 5 | (fn_g_type_init) [!WINDOWSNT]: Define only if Glib < 2.36.0. | ||
| 6 | * xsettings.c (init_gconf, init_gsettings): Do not check | ||
| 7 | for g_type_init. | ||
| 8 | |||
| 1 | 2013-09-16 Jan Djärv <jan.h.d@swipnet.se> | 9 | 2013-09-16 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 10 | ||
| 3 | * xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0 | 11 | * xsettings.c (init_gconf, init_gsettings): Check for Glib 2.36.0 |