diff options
| author | Marius Halden <marius.h@lden.org> | 2016-10-16 17:15:32 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-10-16 17:15:32 +0200 |
| commit | 305a1ddb6c5b03615f98ad45e80ee3d7a5387a3a (patch) | |
| tree | 68d677081a1ec5806de151f71465e38c84b751d3 /protocols/jabber/conference.c | |
| parent | fe1b713ba65a2735548eec660c5b00357b15690a (diff) | |
| parent | 6e991a9464ce13fb742dcd50a37d5e00084b4233 (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols/jabber/conference.c')
| -rw-r--r-- | protocols/jabber/conference.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/jabber/conference.c b/protocols/jabber/conference.c index 3a6cff7c..593e4233 100644 --- a/protocols/jabber/conference.c +++ b/protocols/jabber/conference.c @@ -465,7 +465,8 @@ void jabber_chat_pkt_message(struct im_connection *ic, struct jabber_buddy *bud, } if (subject && chat) { - char *subject_text = subject->text_len > 0 ? subject->text : ""; + char empty[1] = ""; + char *subject_text = subject->text_len > 0 ? subject->text : empty; if (g_strcmp0(chat->topic, subject_text) != 0) { bare_jid = (bud) ? jabber_get_bare_jid(bud->ext_jid) : NULL; imcb_chat_topic(chat, bare_jid, subject_text, |