From: Jani Nikula <jani@nikula.org>
To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: Re: [PATCH v2 1/1] cli: Guard deprecated g_type_init calls
Date: Sat, 08 Jun 2013 11:38:45 +0300 [thread overview]
Message-ID: <878v2lro8a.fsf@nikula.org> (raw)
In-Reply-To: <1370630473-2033-1-git-send-email-tomi.ollila@iki.fi>
On Fri, 07 Jun 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> g_type_init was deprecated in GLib 2.35.1. In order to compile
> cleanly, guard these with a suitable #if.
Looks good, tests pass.
Jani.
>
> (commit msg from https://bugs.freedesktop.org/attachment.cgi?id=73774 )
> ---
>
> v2 of id:1370614090-1715-1-git-send-email-tomi.ollila@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
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2013-06-08 8:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-07 18:41 [PATCH v2 1/1] cli: Guard deprecated g_type_init calls Tomi Ollila
2013-06-08 8:38 ` Jani Nikula [this message]
2013-06-09 0:10 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878v2lro8a.fsf@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).