Mercurial > pidgin
changeset 4423:4bb433a7331c
[gaim-migrate @ 4696]
Hopefully this will fix Luke's lil problem. I have a feeling it won't,
thought.
Also, I swapped the buttons for the join chat dialog.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 26 Jan 2003 05:11:36 +0000 |
| parents | 2fd80799d8f4 |
| children | eb116cc20200 |
| files | src/buddy_chat.c src/protocols/oscar/oscar.c src/protocols/oscar/ssi.c |
| diffstat | 3 files changed, 13 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy_chat.c Sun Jan 26 05:04:03 2003 +0000 +++ b/src/buddy_chat.c Sun Jan 26 05:11:36 2003 +0000 @@ -293,19 +293,19 @@ bbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0); + /* Join button. */ + join = gaim_pixbuf_button_from_stock(_("Join"), GTK_STOCK_JUMP_TO, + GAIM_BUTTON_HORIZONTAL); + gtk_box_pack_end(GTK_BOX(bbox), join, FALSE, FALSE, 0); + g_signal_connect(G_OBJECT(join), "clicked", + G_CALLBACK(do_join_chat), NULL); /* Cancel button. */ cancel = gaim_pixbuf_button_from_stock(_("Cancel"), GTK_STOCK_CANCEL, - GAIM_BUTTON_HORIZONTAL); + GAIM_BUTTON_HORIZONTAL); gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(cancel), "clicked", - G_CALLBACK(destroy_join_chat), joinchat); + G_CALLBACK(destroy_join_chat), joinchat); - /* Join button. */ - join = gaim_pixbuf_button_from_stock(_("Join"), GTK_STOCK_JUMP_TO, - GAIM_BUTTON_HORIZONTAL); - gtk_box_pack_end(GTK_BOX(bbox), join, FALSE, FALSE, 0); - g_signal_connect(G_OBJECT(join), "clicked", - G_CALLBACK(do_join_chat), NULL); } gtk_widget_show_all(joinchat);
--- a/src/protocols/oscar/oscar.c Sun Jan 26 05:04:03 2003 +0000 +++ b/src/protocols/oscar/oscar.c Sun Jan 26 05:11:36 2003 +0000 @@ -4144,7 +4144,7 @@ debug_printf("ssi: syncing local list and server list\n"); /* Clean the buddy list */ - /* aim_ssi_cleanlist(sess, fr->conn); */ + aim_ssi_cleanlist(sess, fr->conn); /* Add from server list to local list */ tmp = 0;
--- a/src/protocols/oscar/ssi.c Sun Jan 26 05:04:03 2003 +0000 +++ b/src/protocols/oscar/ssi.c Sun Jan 26 05:11:36 2003 +0000 @@ -654,11 +654,11 @@ next = cur->next; if (!cur->name) { if (cur->type == AIM_SSI_TYPE_BUDDY) - aim_ssi_delbuddy(sess, conn, cur->name, NULL); + aim_ssi_delbuddy(sess, conn, NULL, NULL); else if (cur->type == AIM_SSI_TYPE_PERMIT) - aim_ssi_delpermit(sess, conn, cur->name); + aim_ssi_delpermit(sess, conn, NULL); else if (cur->type == AIM_SSI_TYPE_DENY) - aim_ssi_deldeny(sess, conn, cur->name); + aim_ssi_deldeny(sess, conn, NULL); } else if ((cur->type == AIM_SSI_TYPE_BUDDY) && ((cur->gid == 0x0000) || (!aim_ssi_itemlist_find(sess->ssi.local, cur->gid, 0x0000)))) { aim_ssi_addbuddy(sess, conn, cur->name, "orphans", NULL, NULL, NULL, 0); aim_ssi_delbuddy(sess, conn, cur->name, NULL); @@ -682,9 +682,6 @@ if ((cur = aim_ssi_itemlist_find(sess->ssi.local, 0x0000, 0x0000)) && (!cur->data)) aim_ssi_itemlist_del(&sess->ssi.local, cur); - /* Sync our local list with the server list */ - aim_ssi_sync(sess, conn); - return 0; } @@ -802,7 +799,7 @@ { struct aim_ssi_item *del; - if (!sess || !conn || !name) + if (!sess || !conn) return -EINVAL; /* Find the buddy */