Re: [PATCH 2/2] notmuch: fix compilation error at get_nm_message()

[Karel Zak]

 (ah... I forgot CC: to list)

 Note that to compile the current git HEAD you have to update to
 notmuch >= 0.9 (on Fedora you have to use f17/rawhide notmuch).

    Karel

On Mon, Feb 27, 2012 at 09:58:38AM +0100, Karel Zak wrote:
>  On Sun, Feb 26, 2012 at 03:41:29PM +0100, Víctor Manuel Jáquez Leal
> wrote:
>  > The shown error is:
>  > 
>  > mutt_notmuch.c: In function ‘get_nm_message’:
>  > mutt_notmuch.c:643:2: error: too few arguments to function
> ‘notmuch_database_find_message’
>  > /usr/include/notmuch.h:371:1: note: declared here
>  > make[2]: *** [mutt_notmuch.o] Error 1
>  > 
>  > The mutt-ks is made for notmuch version 0.8, but in version 0.9 the API
>  > changed, in particular with this commit:
>  > 
>  >
> http://git.notmuchmail.org/git/notmuch/commitdiff/02a30767116ad8abcbd0a33...
>  > 
>  > This patch updates the function notmuch_database_find_message() usage.
>  
>   Applied, thanks.
>  
>      Karel
>  
>  
>  > Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez(a)igalia.com&gt;
>  > ---
>  >  mutt_notmuch.c |    5 +++--
>  >  1 files changed, 3 insertions(+), 2 deletions(-)
>  > 
>  > diff --git a/mutt_notmuch.c b/mutt_notmuch.c
>  > index 2f21407..e77f547 100644
>  > --- a/mutt_notmuch.c
>  > +++ b/mutt_notmuch.c
>  > @@ -635,12 +635,13 @@ char *nm_uri_from_query(CONTEXT *ctx, char *buf, size_t
> bufsz)
>  >   */
>  >  static notmuch_message_t *get_nm_message(notmuch_database_t *db, HEADER *hdr)
>  >  {
>  > -	notmuch_message_t *msg;
>  > +	notmuch_message_t *msg = NULL;
>  >  	char *id = nm_header_get_id(hdr);
>  >  
>  >  	dprint(2, (debugfile, "nm: find message (%s)\n", id));
>  >  
>  > -	msg = id && db ? notmuch_database_find_message(db, id) : NULL;
>  > +	if (id && db)
>  > +		notmuch_database_find_message(db, id, &msg);
>  >  
>  >  	FREE(&id);
>  >  	return msg;
>  > -- 
>  > 1.7.9
>  > 
>  
>  -- 
>   Karel Zak  <kzak(a)redhat.com&gt;
>   http://karelzak.blogspot.com 
-- 
 Karel Zak  <kzak(a)redhat.com&gt;
 http://karelzak.blogspot.com