Changeset daae10f for protocols/jabber/message.c

Timestamp:

2010-08-07T16:33:02Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7b87539

Parents:

289bd2d

Message:

OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen <dam@…>
with some changes.

File:

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

protocols/jabber/message.c

@@ -59 +59 @@
                         {
                                 room = from;
-                                from = xt_find_attr( inv, "from" ) ? : from;
+                                if( ( from = xt_find_attr( inv, "from" ) ) == NULL )
+                                        from = room;
 
                                 g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room );
@@ -72 +73 @@
                         {
                                 bud->last_msg = time( NULL );
-                                from = bud->ext_jid ? : bud->bare_jid;
+                                from = bud->ext_jid ? bud->ext_jid : bud->bare_jid;
                         }
                         else