Updated with new dc_connect.

[doldaconnect.git] / clients / gaim / gaim-dolcon.c

diff --git a/clients/gaim/gaim-dolcon.c b/clients/gaim/gaim-dolcon.c
index 984f237..5aad9ae 100644 (file)
--- a/clients/gaim/gaim-dolcon.c
+++ b/clients/gaim/gaim-dolcon.c
@@ -98,7 +98,7 @@ static void newpeercb(struct dc_fnetpeer *peer)
     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);
     }
@@ -113,7 +113,7 @@ static void delpeercb(struct dc_fnetpeer *peer)
     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_remove_user(GAIM_CONV_CHAT(conv), buf, NULL);
        free(buf);
     }
@@ -365,7 +365,7 @@ static void gi_login(GaimAccount *act)
        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;
@@ -500,7 +500,7 @@ static void init(GaimPlugin *pl)
     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);