Changeset 814aa52 for protocols/jabber/message.c

Timestamp:

2010-06-03T11:00:45Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

a6b2f13

Parents:

5f8ab6a9 (diff), f4bcc22 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in bitlbee 1.2.6

File:

• protocols/jabber/message.c (modified) (2 diffs)

protocols/jabber/message.c

@@ -71 +71 @@
                         if( bud )
                         {
-                                bud->last_act = time( NULL );
+                                bud->last_msg = time( NULL );
                                 from = bud->ext_jid ? : bud->bare_jid;
                         }
@@ -80 +80 @@
                 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. */