Changeset fb020ac for protocols/jabber/jabber.c

Timestamp:

2010-03-07T18:43:23Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

279607e

Parents:

e08e53c (diff), c32f492 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging in mainline, including improved away/status stuff.

File:

• protocols/jabber/jabber.c (modified) (3 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;
 }
 
@@ -364 +366 @@
         while( bud )
         {
-                imcb_log( ic, "Buddy %s (%d) information:\nAway state: %s\nAway message: %s",
-                                   bud->full_jid, bud->priority,
-                                   bud->away_state ? bud->away_state->full_name : "(none)",
-                                   bud->away_message ? : "(none)" );
+                imcb_log( ic, "Buddy %s (%d) information:", bud->full_jid, bud->priority );
+                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)" );
+                
                 bud = bud->next;
         }
@@ -377 +380 @@
 {
         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;