qulogic/pidgin

Merged in dequisdequis/pidgin/release-2.x.y (pull request #176)
release-2.x.y
2017-02-23, Gary Kramlich
274575856b52
Parents e11ea6f07c5bc0d8d2d1497a
Children fe644fbe41c9b3d0ba7c75f6c308c43378dd
Merged in dequisdequis/pidgin/release-2.x.y (pull request #176)

Add PURPLE_MESSAGE_REMOTE_SEND flag to PurpleMessageFlags

Approved-by: Eion Robb
Approved-by: Gary Kramlich
2 files changed, 10 insertions(+), 1 deletions(-)
  • +6 -0
    ChangeLog.API
  • +4 -1
    libpurple/conversation.h
    • --- a/ChangeLog.API Thu Sep 22 01:24:53 2016 +0200
    +++ b/ChangeLog.API Thu Feb 23 06:35:24 2017 +0000
    @@ -1,5 +1,11 @@
    Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
    +version 2.12.0:
    + libpurple:
    + Added:
    + * PURPLE_MESSAGE_REMOTE_SEND in PurpleMessageFlags, to specify
    + messages like _SEND that were sent from another location.
    +
    version 2.11.0:
    libpurple:
    Added:
    --- a/libpurple/conversation.h Thu Sep 22 01:24:53 2016 +0200
    +++ b/libpurple/conversation.h Thu Feb 23 06:35:24 2017 +0000
    @@ -126,7 +126,10 @@
    PURPLE_MESSAGE_NOTIFY = 0x2000, /**< Message is a notification */
    PURPLE_MESSAGE_NO_LINKIFY = 0x4000, /**< Message should not be auto-
    linkified @since 2.1.0 */
    - PURPLE_MESSAGE_INVISIBLE = 0x8000 /**< Message should not be displayed */
    + PURPLE_MESSAGE_INVISIBLE = 0x8000, /**< Message should not be displayed */
    + PURPLE_MESSAGE_REMOTE_SEND = 0x10000 /**< Message sent from another location,
    + not an echo of a local one
    + @since 2.12.0 */
    } PurpleMessageFlags;
    /**