commit 0eee2312758104f3b9b04753a358d82aa96a28a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 18:15:38 2014 +0200

    3.12.4

 NEWS         | 6 ++++++
 configure.ac | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

commit 8ac7209da2305762f9ef2c711c555afb19e85b62
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 15:35:03 2014 +0200

    individual-menu: stop creating single_individual

    This code was always pretty hacky and created loads of nasty bugs
    so I'm glad
    to get rid of it.

    https://bugzilla.gnome.org/show_bug.cgi?id=732100

 libempathy-gtk/empathy-individual-menu.c | 10 ----------
 1 file changed, 10 deletions(-)

commit a2a7b6ecc313022e4e0904651ba4b27ae83ca293
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 15:33:11 2014 +0200

    individual-menu: remove 'block' item from personas sub menus

    Blocking a specific persona from an individual is a very uncommon
    operation.
    Either you want to block the full individual or the personas
    shouldn't be
    linked together.
    There is not much point cluttering the menu with it.

    https://bugzilla.gnome.org/show_bug.cgi?id=732100

 libempathy-gtk/empathy-individual-menu.c | 14 --------------
 1 file changed, 14 deletions(-)

commit 1f9230409b3e8bdba369a994102b53a9e591ba6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 15:10:17 2014 +0200

    individual-menu: use the proper persona in submenus

    'single_individual' uses to be a FolksIndivudal containing a single
    persona
    (the one from the submenu) ensuring that operations (chat, call,
    etc) were
    performed on this very persona.

    But we broke this in 0909d1f884c4542553d98b18e7622664d2a02169 by
    replacing the
    empathy_create_individual_from_tp_contact() call by
    empathy_ensure_individual_from_tp_contact() as the same individuals
    (the one
    will all the personas) was now used in all the sub menus.

    Fixing this by introducing 'contact' variant of the menu_item_new
    methods
    which is always cleaner.

    https://bugzilla.gnome.org/show_bug.cgi?id=732100

 libempathy-gtk/empathy-individual-menu.c | 155
 +++++++++++++++++++++++++++++--
 1 file changed, 146 insertions(+), 9 deletions(-)

commit ad1b40b1d31b4c612a94736f27072baab4ac1364
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 14:54:09 2014 +0200

    individual-menu: factor out some item_new() code

    https://bugzilla.gnome.org/show_bug.cgi?id=732100

 libempathy-gtk/empathy-individual-menu.c | 158
 +++++++++++++++++++++++--------
 1 file changed, 121 insertions(+), 37 deletions(-)

commit 8a91bd6aa01f46742c11b22c7d404c9f6d56b7a9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 23 14:39:28 2014 +0200

    individual-menu: rename menu_item_new functions

    - Remove the namespace prefix for static functions
    - Add 'individual' suffix

    https://bugzilla.gnome.org/show_bug.cgi?id=732100

 libempathy-gtk/empathy-individual-menu.c | 114
 ++++++++++++++-----------------
 libempathy-gtk/empathy-individual-menu.h |   4 +-
 libempathy-gtk/empathy-individual-view.c |   6 +-
 3 files changed, 59 insertions(+), 65 deletions(-)

commit d53111417536194edd8bfd66f98630416de72e50
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date:   Fri Jan 10 11:03:28 2014 +0100

    EmpathySmileyManager: use the proper Unicode characters

    For emoticons that are part of the freedesktop icon spec and of
    Unicode 6.3, recognize the character and replace it with the icon.
    Also, prefer the unicode character to the older ASCII encoding.
    This ensures the maximum compatibility with Hangouts, and also
    looks nice on iOS/Android.

    https://bugzilla.gnome.org/show_bug.cgi?id=692689

 libempathy-gtk/empathy-smiley-manager.c | 69
 ++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 23 deletions(-)

commit 1d7db6929a00bf0fc87be40e3a9628ff6bed473a
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date:   Mon Jan 28 10:21:49 2013 +0100

    Be more compatible with Facebook emoticon codes

    Since we support Facebook chat, and interoperate with the chat
    from the
    browser, we need to support roughly the same emoticon codes.

    https://bugzilla.gnome.org/show_bug.cgi?id=692689

 libempathy-gtk/empathy-smiley-manager.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit 1460786fe3362c7b33a3f37f8f353e391e267566
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jun 11 14:02:28 2014 +0200

    remove released flag

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)