[Commits] [SCM] claws branch, master, updated. 3.16.0-110-g0d14eb5

[claws at claws-mail.org]

The branch, master has been updated
       via  0d14eb513dd15a2dd1aecb89dba47c98238a5b8e (commit)
       via  6ebafce395d07f6036b571487d26fecd792e7707 (commit)
       via  e92ba4b16a734387fce2bc463bd8815804e3d817 (commit)
      from  f25722af77b9378ce0fcfb4c3d09b9bd3c01902a (commit)

Summary of changes:


- Log -----------------------------------------------------------------
commit 0d14eb513dd15a2dd1aecb89dba47c98238a5b8e
Merge: 6ebafce f25722a
Author: Paul <paul at claws-mail.org>
Date:   Tue Apr 10 08:14:21 2018 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit 6ebafce395d07f6036b571487d26fecd792e7707
Merge: e92ba4b a5b4afc
Author: Paul <paul at claws-mail.org>
Date:   Sun Apr 8 19:32:04 2018 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit e92ba4b16a734387fce2bc463bd8815804e3d817
Author: wwp <wwp at free.fr>
Date:   Sun Apr 8 17:03:50 2018 +0200

    addritem+person_get_picture now returns something useful: a copy
    of the addritem's picture full path (still to be free'd by the caller),
    instead of a copy of the addritem's UID string.

diff --git a/src/addritem.c b/src/addritem.c
index f6d9d12..3a81826 100644
--- a/src/addritem.c
+++ b/src/addritem.c
@@ -270,12 +270,16 @@ void addritem_person_set_picture( ItemPerson *person, const gchar *value ) {
 }
 
 /**
- * Get picture for person object.
+ * Get picture filename for person object.
  * \param person Person object.
+ * \return copy of picture file path string (to be freed by caller - and there is
+ *         no guarantee that path does exist, or NULL.
  */
 gchar *addritem_person_get_picture( ItemPerson *person) {
 	if (person->picture)
-		return g_strdup(person->picture);
+		return g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S,
+			ADDRBOOK_DIR, G_DIR_SEPARATOR_S, person->picture,
+			".png", NULL );
 	return NULL;
 }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail