data = peer->fn->udata;
if((conv = gaim_find_chat(data->gc, peer->fn->id)) != NULL)
{
- buf = sprintf2("%i:%s", peer->fn->id, icswcstombs(peer->nick, "UTF-8", NULL));
+ buf = sprintf2("%s", icswcstombs(peer->nick, "UTF-8", NULL));
gaim_conv_chat_add_user(GAIM_CONV_CHAT(conv), buf, NULL, GAIM_CBFLAGS_NONE, TRUE);
free(buf);
}
data = peer->fn->udata;
if((conv = gaim_find_chat(data->gc, peer->fn->id)) != NULL)
{
- buf = sprintf2("%s", peer->fn->id, icswcstombs(peer->nick, "UTF-8", NULL));
+ buf = sprintf2("%s", icswcstombs(peer->nick, "UTF-8", NULL));
gaim_conv_chat_remove_user(GAIM_CONV_CHAT(conv), buf, NULL);
free(buf);
}
}
while((resp = dc_getresp()) != NULL) {
if(!wcscmp(resp->cmdname, L".connect")) {
- if(resp->code == 200) {
- gaim_connection_update_progress(data->gc, "Authenticating", 2, 3);
- dc_loginasync(NULL, 1, (int (*)(int, wchar_t *, char **, void *))loginconv, (void (*)(int, wchar_t *, void *))logincb, data);
- } else {
+ if(resp->code != 201) {
dc_disconnect();
disconnected(data);
gaim_connection_error(data->gc, "Server refused connection");
return;
+ } else if(dc_checkprotocol(resp, DC_LATEST)) {
+ dc_disconnect();
+ disconnected(data);
+ gaim_connection_error(data->gc, "Server protocol revision mismatch");
+ return;
+ } else {
+ gaim_connection_update_progress(data->gc, "Authenticating", 2, 3);
+ dc_loginasync(NULL, 1, (int (*)(int, wchar_t *, char **, void *))loginconv, (void (*)(int, wchar_t *, void *))logincb, data);
}
} else if(!wcscmp(resp->cmdname, L".notify")) {
dc_uimisc_handlenotify(resp);
return;
}
gaim_connection_update_progress(gc, "Connecting", 1, 3);
- if((data->fd = dc_connect((char *)gaim_account_get_string(act, "server", "localhost"), -1)) < 0)
+ if((data->fd = dc_connect((char *)gaim_account_get_string(act, "server", "localhost"))) < 0)
{
gaim_connection_error(gc, "Could not connect to server");
return;
GaimAccountOption *opt;
dc_init();
- opt = gaim_account_option_string_new("Server", "server", "localhost");
+ opt = gaim_account_option_string_new("Server", "server", "");
protinfo.protocol_options = g_list_append(protinfo.protocol_options, opt);
opt = gaim_account_option_int_new("Port", "port", -1);
protinfo.protocol_options = g_list_append(protinfo.protocol_options, opt);