diff options
author | Tomi Ollila <tomi.ollila@iki.fi> | 2013-06-07 21:41:13 +0300 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2013-06-08 20:42:33 -0300 |
commit | 8d6aa603ef3a9680c7032cabf59e3673f773dea3 (patch) | |
tree | 8fbd519772b54142dae0d9fd50dee843fb86aef7 | |
parent | 10aac899117e96606b690e5788924ccc703c53c8 (diff) |
cli: Guard deprecated g_type_init calls
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 )
-rw-r--r-- | lib/database.cc | 2 | ||||
-rw-r--r-- | notmuch.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/database.cc b/lib/database.cc index 52ed618b..5cc07658 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) { @@ -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; |