2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f41abc46bb..7f4c3f731f4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port --without-x --enable-gcc-warnings to Fedora 19.
+        * gfilenotify.c (globals_of_gfilenotify):
+        Call g_type_init only if using an older glib version that needs it.
+
 2013-09-06  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * lisp.h (last_glyphless_glyph_frame, last_glyphless_glyph_face_id)
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 8f13c72df81..7415c3a2413 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -249,7 +249,9 @@ WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'.  */)
 void
 globals_of_gfilenotify (void)
 {
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
   g_type_init ();
+#endif
   watch_list = Qnil;
 }