* emacs.c (main) [HAVE_GFILENOTIFY]: Call globals_of_gfilenotify.

* gfilenotify.c (globals_of_gfilenotify): New function.
(syms_of_gfilenotify): Move global initialization there.

* lisp.h (globals_of_gfilenotify) [HAVE_GFILENOTIFY]: Add prototype.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 4ccc430d815..9b93961f172 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -233,10 +233,15 @@ WATCH-DESCRIPTOR should be an object returned by `gfile-add-watch'.  */)
 
 
 void
-syms_of_gfilenotify (void)
+globals_of_gfilenotify (void)
 {
-
   g_type_init ();
+  watch_list = Qnil;
+}
+
+void
+syms_of_gfilenotify (void)
+{
 
   DEFSYM (Qgfile_add_watch, "gfile-add-watch");
   defsubr (&Sgfile_add_watch);
@@ -255,8 +260,6 @@ syms_of_gfilenotify (void)
   DEFSYM (Qunmounted, "unmounted");
   DEFSYM (Qmoved, "moved");
 
-  /* Initialize internal objects.  */
-  watch_list = Qnil;
   staticpro (&watch_list);
 
   Fprovide (intern_c_string ("gfilenotify"), Qnil);