Changeset be609ff for protocols/jabber/presence.c

Timestamp:

2010-03-12T19:10:16Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dde9d571

Parents:

08e5bb2 (diff), 8b6b740 (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 mainline.

File:

• protocols/jabber/presence.c (modified) (3 diffs)

protocols/jabber/presence.c

@@ -187 +187 @@
                 int is_away = 0;
 
-                if( send_presence->away_state && !( *send_presence->away_state->code == 0 ||
-                    strcmp( send_presence->away_state->code, "chat" ) == 0 ) )
+                if( send_presence->away_state &&
+                    strcmp( send_presence->away_state->code, "chat" ) != 0 )
                         is_away = OPT_AWAY;
 
                 imcb_buddy_status( ic, send_presence->bare_jid, OPT_LOGGED_IN | is_away,
-                                   ( is_away && send_presence->away_state ) ?
-                                   send_presence->away_state->full_name : NULL,
+                                   is_away ? send_presence->away_state->full_name : NULL,
                                    send_presence->away_message );
         }
@@ -206 +205 @@
         struct jabber_data *jd = ic->proto_data;
         struct xt_node *node, *cap;
-        char *show = jd->away_state->code;
-        char *status = jd->away_message;
         struct groupchat *c;
         int st;
@@ -213 +210 @@
         node = jabber_make_packet( "presence", NULL, NULL, NULL );
         xt_add_child( node, xt_new_node( "priority", set_getstr( &ic->acc->set, "priority" ), NULL ) );
-        if( show && *show )
-                xt_add_child( node, xt_new_node( "show", show, NULL ) );
-        if( status )
-                xt_add_child( node, xt_new_node( "status", status, NULL ) );
+        if( jd->away_state )
+                xt_add_child( node, xt_new_node( "show", jd->away_state->code, NULL ) );
+        if( jd->away_message )
+                xt_add_child( node, xt_new_node( "status", jd->away_message, NULL ) );
         
         /* This makes the packet slightly bigger, but clients interested in