Mercurial > pidgin
diff src/buddy_chat.c @ 1030:38452403563b
[gaim-migrate @ 1040]
updating the buddy list to work better with multiple connections. there are still a bunch of things fucked up with this but i wanted more people to start working on it than just me, especially since i won't be here this weekend.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 27 Oct 2000 07:53:32 +0000 |
| parents | 78f69315564a |
| children | 864f4aae0b60 |
line wrap: on
line diff
--- a/src/buddy_chat.c Thu Oct 26 18:05:29 2000 +0000 +++ b/src/buddy_chat.c Fri Oct 27 07:53:32 2000 +0000 @@ -158,6 +158,7 @@ gtk_window_set_focus(GTK_WINDOW(joinchat), entry); gtk_widget_show(entry); +#ifndef NO_MULTI hbox = gtk_hbox_new(TRUE, 10); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5); gtk_widget_show(hbox); @@ -167,6 +168,9 @@ gtk_widget_show(label); create_joinchat_menu(hbox); +#else + joinchatgc = connections->data; +#endif hbox = gtk_hbox_new(TRUE, 10); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5); @@ -843,7 +847,7 @@ c->close = change_text(c->window, _("Close"), c->close, cancel_xpm, opt); gtk_box_reorder_child(GTK_BOX(parent), c->close, 0); gtk_box_set_child_packing(GTK_BOX(parent), c->sep1, dispstyle, dispstyle, 0, GTK_PACK_END); - if (find_buddy(c->name) == NULL) + if (find_buddy(c->gc, c->name) == NULL) c->add = change_text(c->window, _("Add"), c->add, gnome_add_xpm, opt); else c->add = change_text(c->window, _("Remove"), c->add, gnome_remove_xpm, opt);
