[Commits] [SCM] claws branch, master, updated. 3.16.0-106-ga5b4afc

[wwp at claws-mail.org]

The branch, master has been updated
  discards  e92ba4b16a734387fce2bc463bd8815804e3d817 (commit)
       via  a5b4afcf66c7f86f4d3b6ce9a5a792ea124541fd (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (e92ba4b16a734387fce2bc463bd8815804e3d817)
            \
             N -- N -- N (a5b4afcf66c7f86f4d3b6ce9a5a792ea124541fd)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Summary of changes:


- Log -----------------------------------------------------------------
commit a5b4afcf66c7f86f4d3b6ce9a5a792ea124541fd
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