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("%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);
}
if((conv = gaim_find_chat(data->gc, fn->id)) != NULL)
{
peer = icwcstombs(ires->argv[3].val.str, "UTF-8");
- /* XXX: No more gaim_escape_html?! */
- msg = sstrdup(icswcstombs(ires->argv[4].val.str, "UTF-8", NULL));
+ msg = g_markup_escape_text(icswcstombs(ires->argv[4].val.str, "UTF-8", NULL), -1);
serv_got_chat_in(data->gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv)), peer, 0, msg, time(NULL));
- free(msg);
+ g_free(msg);
free(peer);
}
} else {
peer = sprintf2("%i:%s", fn->id, icswcstombs(ires->argv[3].val.str, "UTF-8", NULL));
- msg = sstrdup(icswcstombs(ires->argv[4].val.str, "UTF-8", NULL));
+ msg = g_markup_escape_text(icswcstombs(ires->argv[4].val.str, "UTF-8", NULL), -1);
if(!gaim_account_get_bool(data->gc->account, "represspm", FALSE) || (gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, peer, data->gc->account) != NULL))
serv_got_im(data->gc, peer, msg, 0, time(NULL));
- free(msg);
+ g_free(msg);
free(peer);
}
}
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;
conv = serv_got_joined_chat(data->gc, fn->id, icswcstombs(fn->name, "UTF-8", NULL));
ul = fl = NULL;
for(peer = fn->peers; peer != NULL; peer = peer->next) {
- buf = sprintf2("%i:%s", fn->id, icswcstombs(peer->nick, "UTF-8", NULL));
+ buf = icwcstombs(peer->nick, "UTF-8");
ul = g_list_append(ul, buf);
fl = g_list_append(fl, GINT_TO_POINTER(0));
}
g_list_free(fl);
}
+static char *gi_cbname(GaimConnection *gc, int id, const char *who)
+{
+ return(g_strdup_printf("%i:%s", id, who));
+}
+
static GaimPluginProtocolInfo protinfo = {
.options = OPT_PROTO_PASSWORD_OPTIONAL,
.icon_spec = NO_BUDDY_ICONS,
.join_chat = gi_joinchat,
.chat_send = gi_sendchat,
.send_im = gi_sendim,
+ .get_cb_real_name = gi_cbname,
};
static GaimPluginInfo info = {
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);