Changeset daae10f for protocols/msn

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/msn

Files:

• Makefile (modified) (1 diff)
• msn.c (modified) (1 diff)

protocols/msn/Makefile

@@ -15 +15 @@
 objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
 
-CFLAGS += -Wall
 LFLAGS += -r
 

protocols/msn/msn.c

@@ -176 +176 @@
         struct msn_data *md = ic->proto_data;
         
-        if( state )
-                md->away_state = msn_away_state_by_name( state ) ? :
-                                 msn_away_state_list + 1;
-        else
+        if( state == NULL )
                 md->away_state = msn_away_state_list;
+        else if( ( md->away_state = msn_away_state_by_name( state ) ) == NULL )
+                md->away_state = msn_away_state_list + 1;
         
         g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );