Changeset 840bba8 for protocols/jabber/jabber.c

Timestamp:

2010-03-06T14:50:52Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2bc8ac0

Parents:

d1ad6f0

Message:

The Jabber part of the change. Also made representation of not-away a bit
more consistent. Except for free-for-chat, which is nuts anyway.

File:

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

protocols/jabber/jabber.c

@@ -80 +80 @@
         s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
 }
 
@@ -377 +379 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_away_state *state;
-        
-        /* Save all this info. We need it, for example, when changing the priority setting. */
-        state = (void *) jabber_away_state_by_name( state_txt );
-        jd->away_state = state ? state : (void *) jabber_away_state_list; /* Fall back to "Away" if necessary. */
+        
+        /* 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;
+        
         g_free( jd->away_message );
         jd->away_message = ( message && *message ) ? g_strdup( message ) : NULL;