summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Ruprecht <cmaiku@gmail.com>2016-01-22 02:11:08 -0600
committerMike Ruprecht <cmaiku@gmail.com>2016-01-22 02:11:08 -0600
commit5e75a1819d25aaca478104cc6b60506a3d9d624d (patch)
treefb73cbf6bb11d99557aaedd8cc6241687aeac091
parente67292fa61348252ada7030c98f9a45c05b99070 (diff)
downloadpidgin-5e75a1819d25aaca478104cc6b60506a3d9d624d.tar.gz
Silence warning when system messages are being logged aka from == NULL
-rw-r--r--libpurple/log.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpurple/log.c b/libpurple/log.c
index 2de592402e..0029d4fbb3 100644
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -1334,7 +1334,8 @@ static gsize html_logger_write(PurpleLog *log, PurpleMessageFlags type,
if(!data->file)
return 0;
- escaped_from = g_markup_escape_text(from, -1);
+ escaped_from = g_markup_escape_text(from != NULL ? from : "<NULL>",
+ -1);
image_corrected_msg = convert_image_tags(log, message);
purple_markup_html_to_xhtml(image_corrected_msg, &msg_fixed, NULL);