diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-04-14 11:27:50 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-04-14 11:27:50 +0200 |
| commit | 21c87a78f1c01fe24610a5d05a65e52bd8eaa796 (patch) | |
| tree | c4d95580134610222f8a2630d386be460fa74bb4 /protocols/jabber/message.c | |
| parent | 81186cab101fa8c2f82137014d0b3c060b658cb0 (diff) | |
| parent | 156bbd7b66cf29220c2ff6a86217c4dec5e33765 (diff) | |
Merging loads of stuff from mainline.
Diffstat (limited to 'protocols/jabber/message.c')
| -rw-r--r-- | protocols/jabber/message.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/jabber/message.c b/protocols/jabber/message.c index a226a225..e8161029 100644 --- a/protocols/jabber/message.c +++ b/protocols/jabber/message.c @@ -79,8 +79,8 @@ xt_status jabber_pkt_message( struct xt_node *node, gpointer data ) if( type && strcmp( type, "headline" ) == 0 ) { - c = xt_find_node( node->children, "subject" ); - g_string_append_printf( fullmsg, "Headline: %s\n", c && c->text_len > 0 ? c->text : "" ); + if( ( c = xt_find_node( node->children, "subject" ) ) && c->text_len > 0 ) + g_string_append_printf( fullmsg, "Headline: %s\n", c->text ); /* <x xmlns="jabber:x:oob"><url>http://....</url></x> can contain a URL, it seems. */ for( c = node->children; c; c = c->next ) |