Re-add PURPLE_MESSAGE_REMOTE_SEND flag lost in a merge

Tue, 25 Sep 2018 15:55:42 -0500

author
Mike Ruprecht <cmaiku@gmail.com>
date
Tue, 25 Sep 2018 15:55:42 -0500
changeset 39235
179d8aaafb1e
parent 39232
ec0083623643
child 39236
b39bfbb7212f

Re-add PURPLE_MESSAGE_REMOTE_SEND flag lost in a merge

This patch re-adds dx's PURPLE_MESSAGE_REMOTE_SEND flag (from c0d8d2d),
which was lost in a merge from the 2.x.y branch.

libpurple/conversation.h file | annotate | diff | comparison | revisions
--- a/libpurple/conversation.h	Mon Sep 24 21:12:06 2018 -0500
+++ b/libpurple/conversation.h	Tue Sep 25 15:55:42 2018 -0500
@@ -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>

mercurial