[PATCH 1/1] cli: Guard deprecated g_type_init calls

Tomi Ollila tomi.ollila at iki.fi
Fri Jun 7 07:08:10 PDT 2013


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 )
---
 notmuch.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/notmuch.c b/notmuch.c
index 99ddd6d..f9902ed 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -291,8 +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



More information about the notmuch mailing list