};
static struct conndata *inuse = NULL;
+static GaimPlugin *me;
static void dcfdcb(struct conndata *data, int fd, GaimInputCondition condition);
}
}
+static gboolean gi_chatjoincb(GaimConversation *conv, const char *user, GaimConvChatBuddyFlags flags, void *uudata)
+{
+ GaimConnection *c;
+
+ if((c = gaim_conversation_get_gc(conv)) == NULL)
+ return(FALSE);
+ if(c->prpl == me)
+ return(TRUE);
+ return(FALSE);
+}
+
+static gboolean gi_chatleavecb(GaimConversation *conv, const char *user, const char *reason, void *uudata)
+{
+ GaimConnection *c;
+
+ if((c = gaim_conversation_get_gc(conv)) == NULL)
+ return(FALSE);
+ if(c->prpl == me)
+ return(TRUE);
+ return(FALSE);
+}
+
static void newpeercb(struct dc_fnetpeer *peer)
{
struct conndata *data;
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);
}
}
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);
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);
}
}
/* XXX: Handle chat rooms */
if((wwhat = icmbstowcs((char *)what, "UTF-8")) == NULL)
return(-errno);
- dc_queuecmd(NULL, NULL, L"sendchat", L"%%i", fn->id, L"1", L"", L"%%ls", wwhat, NULL);
+ dc_queuecmd(NULL, NULL, L"sendchat", L"%i", fn->id, L"1", L"", L"%ls", wwhat, NULL);
free(wwhat);
updatewrite(data);
return(0);
free(wwho);
return(-en);
}
- dc_queuecmd(NULL, NULL, L"sendchat", L"%%i", fn->id, L"0", L"%%ls", peer->nick, L"%%ls", wwhat, NULL);
+ dc_queuecmd(NULL, NULL, L"sendchat", L"%i", fn->id, L"0", L"%ls", peer->nick, L"%ls", wwhat, NULL);
free(wwho);
free(wwhat);
updatewrite(data);
return("dolcon");
}
+static char *gi_statustext(GaimBuddy *b)
+{
+ GaimPresence *p;
+
+ p = gaim_buddy_get_presence(b);
+ if (gaim_presence_is_online(p) && !gaim_presence_is_available(p))
+ return(g_strdup("Away"));
+ return(NULL);
+}
+
+static void gi_tiptext(GaimBuddy *b, GaimNotifyUserInfo *inf, gboolean full)
+{
+ /* Nothing for now */
+}
+
+static GList *gi_statustypes(GaimAccount *act)
+{
+ GList *ret;
+
+ ret = NULL;
+ ret = g_list_append(ret, gaim_status_type_new(GAIM_STATUS_AVAILABLE, "avail", NULL, TRUE));
+ ret = g_list_append(ret, gaim_status_type_new(GAIM_STATUS_AWAY, "away", NULL, TRUE)); /* Coming up in ADC */
+ ret = g_list_append(ret, gaim_status_type_new(GAIM_STATUS_OFFLINE, "offline", NULL, TRUE));
+ return(ret);
+}
+
static struct conndata *newconndata(void)
{
struct conndata *new;
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;
GaimConversation *conv;
struct dc_fnetpeer *peer;
char *buf;
+ GList *ul, *fl, *c;
data = gc->proto_data;
if((fn = dc_findfnetnode(GPOINTER_TO_INT(g_hash_table_lookup(chatdata, "id")))) == NULL)
if(gaim_find_chat(gc, fn->id) != NULL)
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));
- gaim_conv_chat_add_user(GAIM_CONV_CHAT(conv), buf, NULL, GAIM_CBFLAGS_NONE, FALSE);
- free(buf);
+ buf = icwcstombs(peer->nick, "UTF-8");
+ ul = g_list_append(ul, buf);
+ fl = g_list_append(fl, GINT_TO_POINTER(0));
}
+ gaim_conv_chat_add_users(GAIM_CONV_CHAT(conv), ul, NULL, fl, FALSE);
+ for(c = ul; c != NULL; c = c->next)
+ free(c->data);
+ g_list_free(ul);
+ 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,
.list_icon = gi_listicon,
+ .status_text = gi_statustext,
+ .tooltip_text = gi_tiptext,
+ .status_types = gi_statustypes,
.login = gi_login,
.close = gi_close,
.roomlist_get_list = gi_getlist,
.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");
- protinfo.protocol_options = g_list_append(protinfo.protocol_options, opt);
- opt = gaim_account_option_int_new("Port", "port", -1);
+ opt = gaim_account_option_string_new("Server", "server", "");
protinfo.protocol_options = g_list_append(protinfo.protocol_options, opt);
opt = gaim_account_option_bool_new("Do not pop up private messages automatically", "represspm", FALSE);
protinfo.protocol_options = g_list_append(protinfo.protocol_options, opt);
+ gaim_signal_connect(gaim_conversations_get_handle(), "chat-buddy-joining", pl, GAIM_CALLBACK(gi_chatjoincb), NULL);
+ gaim_signal_connect(gaim_conversations_get_handle(), "chat-buddy-leaving", pl, GAIM_CALLBACK(gi_chatleavecb), NULL);
+ me = pl;
}
GAIM_INIT_PLUGIN(dolcon, init, info);
Dolda2000 GitWeb / doldaconnect.git / blobdiff