g_type_init was deprecated in GLib 2.35.1. In order to compile cleanly, guard these with a suitable #if.
(commit msg from https://bugs.freedesktop.org/attachment.cgi?id=73774 ) --- v2 of id:1370614090-1715-1-git-send-email-tomi.ollila at iki.fi database.cc was not caught by my na?ve grep g_type_init **/*.c (have to learn git grep !) also added back one newline removed in v1 lib/database.cc | 2 ++ notmuch.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/database.cc b/lib/database.cc index 52ed618..5cc0765 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -649,7 +649,9 @@ notmuch_database_open (const char *path, } /* Initialize the GLib type system and threads */ +#if !GLIB_CHECK_VERSION(2, 35, 1) g_type_init (); +#endif /* Initialize gmime */ if (! initialized) { diff --git a/notmuch.c b/notmuch.c index 99ddd6d..45a73ce 100644 --- a/notmuch.c +++ b/notmuch.c @@ -291,7 +291,9 @@ main (int argc, char *argv[]) local = talloc_new (NULL); g_mime_init (0); +#if !GLIB_CHECK_VERSION(2, 35, 1) g_type_init (); +#endif /* Globally default to the current output format version. */ notmuch_format_version = NOTMUCH_FORMAT_CUR; -- 1.8.0
