Changeset daae10f for protocols/jabber

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.

Location:

protocols/jabber

Files:

• Makefile (modified) (1 diff)
• jabber.c (modified) (2 diffs)
• message.c (modified) (2 diffs)

protocols/jabber/Makefile

@@ -15 +15 @@
 objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o
 
-CFLAGS += -Wall
 LFLAGS += -r
 

protocols/jabber/jabber.c

@@ -381 +381 @@
                 if( bud->away_state )
                         imcb_log( ic, "Away state: %s", bud->away_state->full_name );
-                imcb_log( ic, "Status message: %s", bud->away_message ? : "(none)" );
+                imcb_log( ic, "Status message: %s", bud->away_message ? bud->away_message : "(none)" );
                 
                 bud = bud->next;
@@ -395 +395 @@
         /* state_txt == NULL -> Not away.
            Unknown state -> fall back to the first defined away state. */
-        jd->away_state = state_txt ? jabber_away_state_by_name( state_txt )
-                         ? : jabber_away_state_list : NULL;
+        if( state_txt == NULL )
+                jd->away_state = NULL;
+        else if( ( jd->away_state = jabber_away_state_by_name( state_txt ) ) == NULL )
+                jd->away_state = jabber_away_state_list;
         
         g_free( jd->away_message );

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