gaim/gaim

Parents 23122c859445
Children 21c195ccfa54
this confuses too many people (and flat out doesn't work) so I got rid of it
--- a/src/gtkconv.c Tue Apr 19 23:55:17 2005 -0400
+++ b/src/gtkconv.c Fri Apr 22 09:40:04 2005 -0400
@@ -1493,9 +1493,13 @@
gtk_widget_show(button);
}
- /* XXX: jabber can only add buddies from here in certain circumstances */
/* Added by Jonas <jonas@birme.se> */
- if (gc) {
+ /* XXX: jabber can add here sometimes, but we have to assume not
+ * so we don't confuse anyone. we'll need to do a prpl-specific add
+ * or some way to ask the prpl for the "real" buddy name for someone
+ * in a chat when the prpl has UNIQUE_CHATNAME set
+ */
+ if (gc && prpl_info && !(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
if (gaim_find_buddy(gc->account, who))
button = gtk_menu_item_new_with_label(_("Remove"));
else