Changeset 61dddd0

Timestamp:

2006-03-18T08:33:33Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

42d9571

Parents:

8ba511d

Message:

Fixed #111, Jabber away states get set correctly at connect-time now.

Location:

protocols

Files:

• jabber/jabber.c (modified) (2 diffs)
• msn/msn_util.c (modified) (1 diff)
• nogaim.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -1232 +1232 @@
         }
 
-        x = jutil_presnew(0, NULL, "Online");
-        gjab_send(gjc, x);
-        xmlnode_free(x);
+        account_online(GJ_GC(gjc));
 }
 
@@ -1250 +1248 @@
                 } else {
                         gjab_reqroster(gjc);
-                        account_online(GJ_GC(gjc));
                         
                         ((struct jabber_data *)GJ_GC(gjc)->proto_data)->did_import = TRUE;

protocols/msn/msn_util.c

@@ -50 +50 @@
         
         account_online( gc );
-        
-        /* account_online() sets an away state if there is any, so only
-           execute this code if we're not away. */
-        if( md->away_state == msn_away_state_list )
-        {
-                g_snprintf( buf, sizeof( buf ), "CHG %d %s %d\r\n", ++md->trId, md->away_state->code, 0 );
-                return( msn_write( gc, buf, strlen( buf ) ) );
-        }
         
         return( 0 );

protocols/nogaim.c

@@ -364 +364 @@
         gc->flags |= OPT_LOGGED_IN;
         
-        if( u && u->away ) proto_away( gc, u->away );
+        /* Also necessary when we're not away, at least for some of the
+           protocols. */
+        proto_away( gc, u->away );
         
         if( strcmp( gc->prpl->name, "ICQ" ) == 0 )