changeset
Merged in CMaiku/pidgin (pull request #400)
Wed, 26 Sep 2018 02:06:22 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Wed, 26 Sep 2018 02:06:22 +0000
- changeset 39236
- b39bfbb7212f
- parent 39234
- 14861f3ffe0c (current diff)
- parent 39235
- 179d8aaafb1e (diff)
- child 39237
- 8d0af3b47338
Merged in CMaiku/pidgin (pull request #400)
Re-add PURPLE_MESSAGE_REMOTE_SEND flag lost in a merge
Approved-by: Eion Robb <eionrobb@gmail.com>
Approved-by: Gary Kramlich <grim@reaperworld.com>
--- a/libpurple/conversation.h Tue Sep 25 15:19:56 2018 -0500 +++ b/libpurple/conversation.h Wed Sep 26 02:06:22 2018 +0000 @@ -125,6 +125,8 @@ * @PURPLE_MESSAGE_NOTIFY: Message is a notification * @PURPLE_MESSAGE_NO_LINKIFY: Message should not be auto-linkified * @PURPLE_MESSAGE_INVISIBLE: Message should not be displayed + * @PURPLE_MESSAGE_REMOTE_SEND: Message sent from another location, + * not an echo of a local one * * Flags applicable to a message. Most will have send, recv or system. */ @@ -143,7 +145,8 @@ PURPLE_MESSAGE_IMAGES = 0x1000, PURPLE_MESSAGE_NOTIFY = 0x2000, PURPLE_MESSAGE_NO_LINKIFY = 0x4000, - PURPLE_MESSAGE_INVISIBLE = 0x8000 + PURPLE_MESSAGE_INVISIBLE = 0x8000, + PURPLE_MESSAGE_REMOTE_SEND = 0x10000 } PurpleMessageFlags; #include <glib.h>
