diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/msn/msn.c | 17 | ||||
| -rw-r--r-- | protocols/nogaim.c | 8 | ||||
| -rw-r--r-- | protocols/oscar/oscar.c | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c index 7aa384e6..663bff8c 100644 --- a/protocols/msn/msn.c +++ b/protocols/msn/msn.c @@ -41,8 +41,6 @@ static void msn_login( account_t *acc ) struct gaim_connection *gc = new_gaim_conn( acc ); struct msn_data *md = g_new0( struct msn_data, 1 ); - set_login_progress( gc, 1, "Connecting" ); - gc->proto_data = md; md->fd = -1; @@ -53,19 +51,20 @@ static void msn_login( account_t *acc ) return; } + set_login_progress( gc, 1, "Connecting" ); + md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, gc ); if( md->fd < 0 ) { hide_login_progress( gc, "Could not connect to server" ); signoff( gc ); + return; } - else - { - md->gc = gc; - md->away_state = msn_away_state_list; - - msn_connections = g_slist_append( msn_connections, gc ); - } + + md->gc = gc; + md->away_state = msn_away_state_list; + + msn_connections = g_slist_append( msn_connections, gc ); } static void msn_close( struct gaim_connection *gc ) diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 3e9d7c07..b627a23a 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -577,7 +577,7 @@ void serv_got_update( struct gaim_connection *gc, char *handle, int loggedin, in ( ( ( u->online != oo ) && !u->away ) || /* Voice joining people */ ( ( u->online == oo ) && ( oa == !u->away ) ) ) ) /* (De)voice people changing state */ { - irc_write( gc->irc, ":%s!%s@%s MODE %s %cv %s", gc->irc->mynick, gc->irc->mynick, gc->irc->myhost, + irc_write( gc->irc, ":%s MODE %s %cv %s", gc->irc->myhost, gc->irc->channel, u->away?'-':'+', u->nick ); } } @@ -911,8 +911,8 @@ char *set_eval_away_devoice( set_t *set, char *value ) if( ( strlen( list ) + strlen( u->nick ) ) >= 79 ) { for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0; - irc_write( irc, ":%s!%s@%s MODE %s %c%s%s", - irc->mynick, irc->mynick, irc->myhost, + irc_write( irc, ":%s MODE %s %c%s%s", + irc->myhost, irc->channel, pm, v, list ); *list = 0; @@ -927,7 +927,7 @@ char *set_eval_away_devoice( set_t *set, char *value ) /* $v = 'v' x $i */ for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0; - irc_write( irc, ":%s!%s@%s MODE %s %c%s%s", irc->mynick, irc->mynick, irc->myhost, + irc_write( irc, ":%s MODE %s %c%s%s", irc->myhost, irc->channel, pm, v, list ); } diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index b8cf521b..72078b3c 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -2296,7 +2296,7 @@ static int gaim_icqinfo(aim_session_t *sess, aim_frame_t *fr, ...) } } info_string_append(str, "\n", _("Mobile Phone"), info->mobile); - info_string_append(str, "\n", _("Gender"), info->gender==1 ? _("Female") : _("Male")); + info_string_append(str, "\n", _("Gender"), info->gender==1 ? _("Female") : info->gender==2 ? _("Male") : _("Unknown")); if (info->birthyear || info->birthmonth || info->birthday) { char date[30]; struct tm tm; |