From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Fri, 7 Jun 2013 18:41:13 +0000 (+0300)
Subject: cli: Guard deprecated g_type_init calls
X-Git-Tag: 0.16_rc1~61
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=8d6aa603ef3a9680c7032cabf59e3673f773dea3

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 )
---

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) {
diff --git a/notmuch.c b/notmuch.c
index 99ddd6d0..45a73ce0 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;