Changeset daae10f for protocols/jabber/jabber.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/jabber.c (modified) (2 diffs)

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 );