comparison src/buddy_chat.c @ 4349:0c68d402f59f

[gaim-migrate @ 4614] XML Blist Gaim stores all the buddy lists in one big happy file now. You can order the buddies however you want, and they'll stay ordered that way. We can also store some per-buddy information now, which will be cool. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sun, 19 Jan 2003 22:16:52 +0000
parents 12d3ca8f5b5f
children 5fb47ec9bfe4
comparison
equal deleted inserted replaced
4348:922b66840a51 4349:0c68d402f59f
352 tmp = NULL; 352 tmp = NULL;
353 353
354 tmp = g_list_append(tmp, ""); 354 tmp = g_list_append(tmp, "");
355 355
356 if (gc) { 356 if (gc) {
357 grp = gc->groups; 357 grp = groups;
358 358
359 while (grp) { 359 while (grp) {
360 g = (struct group *)grp->data; 360 g = (struct group *)grp->data;
361 361
362 bl = g->members; 362 bl = g->members;
363 363
364 while (bl) { 364 while (bl) {
365 buddy = (struct buddy *)bl->data; 365 buddy = (struct buddy *)bl->data;
366 366
367 if (buddy->present) 367 if (buddy->user->gc == gc && buddy->present)
368 tmp = g_list_append(tmp, buddy->name); 368 tmp = g_list_append(tmp, buddy->name);
369 369
370 bl = g_slist_next(bl); 370 bl = g_slist_next(bl);
371 } 371 }
372 372
804 804
805 /* Added by Jonas <jonas@birme.se> */ 805 /* Added by Jonas <jonas@birme.se> */
806 static void chat_press_add(GtkObject *obj, struct conversation *c) 806 static void chat_press_add(GtkObject *obj, struct conversation *c)
807 { 807 {
808 char *name = gtk_object_get_user_data(obj); 808 char *name = gtk_object_get_user_data(obj);
809 struct buddy *b = find_buddy(c->gc, name); 809 struct buddy *b = find_buddy(c->gc->user, name);
810 810
811 if (b) { 811 if (b) {
812 show_confirm_del(c->gc, name); 812 show_confirm_del(c->gc, name);
813 } else if (c->gc) 813 } else if (c->gc)
814 show_add_buddy(c->gc, name, NULL, NULL); 814 show_add_buddy(c->gc, name, NULL, NULL);
894 gtk_widget_show(button); 894 gtk_widget_show(button);
895 } 895 }
896 896
897 /* Added by Jonas <jonas@birme.se> */ 897 /* Added by Jonas <jonas@birme.se> */
898 if (b->gc) { 898 if (b->gc) {
899 if (find_buddy(b->gc, who)) 899 if (find_buddy(b->gc->user, who))
900 button = gtk_menu_item_new_with_label(_("Remove")); 900 button = gtk_menu_item_new_with_label(_("Remove"));
901 else 901 else
902 button = gtk_menu_item_new_with_label(_("Add")); 902 button = gtk_menu_item_new_with_label(_("Add"));
903 g_signal_connect(GTK_OBJECT(button), "activate", 903 g_signal_connect(GTK_OBJECT(button), "activate",
904 G_CALLBACK(chat_press_add), b); 904 G_CALLBACK(chat_press_add), b);
1580 gtk_widget_destroy(c->sep2); 1580 gtk_widget_destroy(c->sep2);
1581 c->sep2 = gtk_vseparator_new(); 1581 c->sep2 = gtk_vseparator_new();
1582 gtk_box_pack_end(GTK_BOX(parent), c->sep2, FALSE, TRUE, 0); 1582 gtk_box_pack_end(GTK_BOX(parent), c->sep2, FALSE, TRUE, 0);
1583 gtk_widget_show(c->sep2); 1583 gtk_widget_show(c->sep2);
1584 1584
1585 if (find_buddy(c->gc, c->name) == NULL) 1585 if (find_buddy(c->gc->user, c->name) == NULL)
1586 c->add = change_text(c->window, _("Add"), c->add, "gtk-add", opt); 1586 c->add = change_text(c->window, _("Add"), c->add, "gtk-add", opt);
1587 else 1587 else
1588 c->add = change_text(c->window, _("Remove"), c->add, "gtk-remove", opt); 1588 c->add = change_text(c->window, _("Remove"), c->add, "gtk-remove", opt);
1589 1589
1590 gtk_box_pack_start(GTK_BOX(parent), c->add, FALSE, FALSE, 0); 1590 gtk_box_pack_start(GTK_BOX(parent), c->add, FALSE, FALSE, 0);