Changeset fb020ac for protocols/jabber

Timestamp:

2010-03-07T18:43:23Z (15 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.

Location:

protocols/jabber

Files:

• jabber.c (modified) (3 diffs)
• jabber.h (modified) (1 diff)
• jabber_util.c (modified) (3 diffs)
• presence.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;

protocols/jabber/jabber.h

@@ -84 +84 @@
         /* After changing one of these two (or the priority setting), call
            presence_send_update() to inform the server about the changes. */
-        struct jabber_away_state *away_state;
+        const struct jabber_away_state *away_state;
         char *away_message;
         

protocols/jabber/jabber_util.c

@@ -228 +228 @@
 {
         { "away",  "Away" },
-        { "chat",  "Free for Chat" },
+        { "chat",  "Free for Chat" },   /* WTF actually uses this? */
         { "dnd",   "Do not Disturb" },
         { "xa",    "Extended Away" },
-        { "",      "Online" },
         { "",      NULL }
 };
@@ -238 +237 @@
 {
         int i;
+        
+        if( code == NULL )
+                return NULL;
         
         for( i = 0; jabber_away_state_list[i].full_name; i ++ )
@@ -249 +251 @@
 {
         int i;
+        
+        if( name == NULL )
+                return NULL;
         
         for( i = 0; jabber_away_state_list[i].full_name; i ++ )

protocols/jabber/presence.c

@@ -190 +190 @@
                 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 );
         }
@@ -209 +208 @@
         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;
@@ -216 +213 @@
         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