Changes in protocols/jabber/jabber.c [f9928cb:823de9d]

File:

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

protocols/jabber/jabber.c

@@ -67 +67 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
-        s = set_add( &acc->set, "resource_select", "activity", NULL, acc );
+        s = set_add( &acc->set, "resource_select", "priority", NULL, acc );
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
@@ -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;
 }
 
@@ -366 +364 @@
         while( bud )
         {
-                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)" );
-                
+                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)" );
                 bud = bud->next;
         }
@@ -380 +377 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        
-        /* 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;
-        
+        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. */
         g_free( jd->away_message );
         jd->away_message = ( message && *message ) ? g_strdup( message ) : NULL;
@@ -429 +425 @@
 }
 
-static struct groupchat *jabber_chat_join_( struct im_connection *ic, const char *room, const char *nick, const char *password )
+static struct groupchat *jabber_chat_join_( struct im_connection *ic, char *room, char *nick, char *password )
 {
         if( strchr( room, '@' ) == NULL )
@@ -532 +528 @@
         
         ret->name = "jabber";
+    ret->mms = 0;                        /* no limit */
         ret->login = jabber_login;
         ret->init = jabber_init;