comparison src/conversation.c @ 1772:896432d66303

[gaim-migrate @ 1782] remove OPT_USR_KEEPALIVE; add OPT_PROTO_UNIQUE_CHATNAME for Jabber. other things that need to be implemented still. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Mon, 30 Apr 2001 01:58:24 +0000
parents 1e0613d9526b
children d7cbedd1d651
comparison
equal deleted inserted replaced
1771:213607e89598 1772:896432d66303
1294 gtk_font_options = gtk_font_options ^ GTK_IMHTML_NO_SIZES; 1294 gtk_font_options = gtk_font_options ^ GTK_IMHTML_NO_SIZES;
1295 1295
1296 if (!(logging_options & OPT_LOG_STRIP_HTML)) 1296 if (!(logging_options & OPT_LOG_STRIP_HTML))
1297 gtk_font_options = gtk_font_options ^ GTK_IMHTML_RETURN_LOG; 1297 gtk_font_options = gtk_font_options ^ GTK_IMHTML_RETURN_LOG;
1298 1298
1299 if (!who) { 1299 if (!c->is_chat || !(c->gc->prpl->options & OPT_PROTO_UNIQUE_CHATNAME)) {
1300 if (flags & WFLAG_SEND) { 1300 if (!who) {
1301 b = find_buddy(c->gc, c->gc->username); 1301 if (flags & WFLAG_SEND) {
1302 b = find_buddy(c->gc, c->gc->username);
1303 if (b)
1304 who = b->show;
1305 else
1306 who = c->gc->username;
1307 } else {
1308 b = find_buddy(c->gc, c->name);
1309 if (b)
1310 who = b->show;
1311 else
1312 who = c->name;
1313 }
1314 } else {
1315 b = find_buddy(c->gc, who);
1302 if (b) 1316 if (b)
1303 who = b->show; 1317 who = b->show;
1304 else 1318 }
1305 who = c->gc->username;
1306 } else {
1307 b = find_buddy(c->gc, c->name);
1308 if (b)
1309 who = b->show;
1310 else
1311 who = c->name;
1312 }
1313 } else {
1314 b = find_buddy(c->gc, who);
1315 if (b)
1316 who = b->show;
1317 } 1319 }
1318 1320
1319 1321
1320 if (flags & WFLAG_SYSTEM) { 1322 if (flags & WFLAG_SYSTEM) {
1321 if (general_options & OPT_DISP_SHOW_TIME) 1323 if (general_options & OPT_DISP_SHOW_TIME)