Ignore:
Timestamp:
2006-10-22T17:00:15Z (18 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
f0071b7
Parents:
66f783f (diff), 6237ded (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:

Merge from main tree.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/msn.c

    r66f783f re8a6211  
    4242        struct msn_data *md = g_new0( struct msn_data, 1 );
    4343       
    44         set_login_progress( gc, 1, "Connecting" );
    45        
    4644        gc->proto_data = md;
    4745        md->fd = -1;
     
    5452        }
    5553       
     54        set_login_progress( gc, 1, "Connecting" );
     55       
    5656        md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, gc );
    5757        if( md->fd < 0 )
     
    5959                hide_login_progress( gc, "Could not connect to server" );
    6060                signoff( gc );
    61         }
    62         else
    63         {
    64                 md->gc = gc;
    65                 md->away_state = msn_away_state_list;
    66                
    67                 msn_connections = g_slist_append( msn_connections, gc );
    68         }
     61                return;
     62        }
     63       
     64        md->gc = gc;
     65        md->away_state = msn_away_state_list;
     66       
     67        msn_connections = g_slist_append( msn_connections, gc );
    6968}
    7069
Note: See TracChangeset for help on using the changeset viewer.