diff options
| author | Marius Halden <marius.h@lden.org> | 2018-04-19 10:23:08 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2018-04-19 10:23:08 +0200 |
| commit | db02ac8971379f9fee2f3a618bb08b8076d1a83d (patch) | |
| tree | 0e7d46bad6162509300aa73ae6d77e571a5b26d0 /protocols/purple/purple.c | |
| parent | 6dc54671e368d03ed447d0fbd2d662af6c36b7fd (diff) | |
| parent | 246b98bbdf221448fd7a638fea04373ed1612de5 (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols/purple/purple.c')
| -rw-r--r-- | protocols/purple/purple.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c index 25cd00cf..6204614d 100644 --- a/protocols/purple/purple.c +++ b/protocols/purple/purple.c @@ -30,6 +30,10 @@ #include <glib.h> #include <purple.h> +#if !PURPLE_VERSION_CHECK(2, 12, 0) +#define PURPLE_MESSAGE_REMOTE_SEND 0x10000 +#endif + GSList *purple_connections; /* This makes me VERY sad... :-( But some libpurple callbacks come in without @@ -1217,7 +1221,10 @@ static void handle_conv_msg(PurpleConversation *conv, const char *who, const cha * Those are safe to display. The rest (with just _SEND) may be echoes. */ static void prplcb_conv_msg(PurpleConversation *conv, const char *who, const char *message, PurpleMessageFlags flags, time_t mtime) { - if ((!(flags & PURPLE_MESSAGE_SEND)) || (flags & PURPLE_MESSAGE_DELAYED)) { + if ((!(flags & PURPLE_MESSAGE_SEND)) || + (flags & PURPLE_MESSAGE_DELAYED) || + (flags & PURPLE_MESSAGE_REMOTE_SEND) + ) { handle_conv_msg(conv, who, message, (flags & PURPLE_MESSAGE_SEND) ? OPT_SELFMESSAGE : 0, mtime); } } |