comparison src/oscar.c @ 516:ee4e18868584

[gaim-migrate @ 526] Make it obvious that it happens. committer: Tailor Script <[e-mail]>

515:b33ed0a7f49b

				debug_print(_("connection error!\n"));
				if (direct) {
					struct conversation *cnv = find_conversation(direct);
					debug_print("connection error for directim\n");
					if (cnv) {
						cnv->is_direct = 0;
						cnv->conn = NULL;
						gdk_input_remove(cnv->watcher);
					}
				}
				aim_conn_kill(gaim_sess, &conn);
				if (!aim_getconn_type(gaim_sess, AIM_CONN_TYPE_BOS)) {
					debug_print(_("major connection error\n"));

}

void oscar_do_directim(char *name) {
	struct aim_conn_t *newconn = aim_directim_initiate(gaim_sess, gaim_conn, NULL, name);
	struct conversation *cnv = find_conversation(name); /* this will never be null because it just got set up */
	cnv->is_direct = TRUE;
	cnv->conn = newconn;
	cnv->watcher = gdk_input_add(newconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, oscar_callback, newconn);
	aim_conn_addhandler(gaim_sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE, gaim_directim_initiate, 0);
}

516:ee4e18868584

				debug_print(_("connection error!\n"));
				if (direct) {
					struct conversation *cnv = find_conversation(direct);
					debug_print("connection error for directim\n");
					if (cnv) {
						make_direct(cnv, FALSE, NULL, 0);
					}
				}
				aim_conn_kill(gaim_sess, &conn);
				if (!aim_getconn_type(gaim_sess, AIM_CONN_TYPE_BOS)) {
					debug_print(_("major connection error\n"));

}

void oscar_do_directim(char *name) {
	struct aim_conn_t *newconn = aim_directim_initiate(gaim_sess, gaim_conn, NULL, name);
	struct conversation *cnv = find_conversation(name); /* this will never be null because it just got set up */
	int watcher = gdk_input_add(newconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, oscar_callback, newconn);
	make_direct(cnv, TRUE, newconn, watcher);
	aim_conn_addhandler(gaim_sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE, gaim_directim_initiate, 0);
}