comparison: src/buddy_chat.c
src/buddy_chat.c
- changeset 1030
- b9fa9eadc0a4
- parent 1018
- 466fdc120697
- child 1053
- e73b159a9047
equal
deleted
inserted
replaced
| 1029:c5ea048dc7ac | 1030:b9fa9eadc0a4 |
|---|---|
| 156 gtk_signal_connect(GTK_OBJECT(entry), "activate", | 156 gtk_signal_connect(GTK_OBJECT(entry), "activate", |
| 157 GTK_SIGNAL_FUNC(do_join_chat), joinchat); | 157 GTK_SIGNAL_FUNC(do_join_chat), joinchat); |
| 158 gtk_window_set_focus(GTK_WINDOW(joinchat), entry); | 158 gtk_window_set_focus(GTK_WINDOW(joinchat), entry); |
| 159 gtk_widget_show(entry); | 159 gtk_widget_show(entry); |
| 160 | 160 |
| 161 #ifndef NO_MULTI | |
| 161 hbox = gtk_hbox_new(TRUE, 10); | 162 hbox = gtk_hbox_new(TRUE, 10); |
| 162 gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5); | 163 gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5); |
| 163 gtk_widget_show(hbox); | 164 gtk_widget_show(hbox); |
| 164 | 165 |
| 165 label = gtk_label_new(_("Join Chat As:")); | 166 label = gtk_label_new(_("Join Chat As:")); |
| 166 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); | 167 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); |
| 167 gtk_widget_show(label); | 168 gtk_widget_show(label); |
| 168 | 169 |
| 169 create_joinchat_menu(hbox); | 170 create_joinchat_menu(hbox); |
| 171 #else | |
| 172 joinchatgc = connections->data; | |
| 173 #endif | |
| 170 | 174 |
| 171 hbox = gtk_hbox_new(TRUE, 10); | 175 hbox = gtk_hbox_new(TRUE, 10); |
| 172 gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5); | 176 gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5); |
| 173 gtk_widget_show(hbox); | 177 gtk_widget_show(hbox); |
| 174 | 178 |
| 841 c = (struct conversation *)bcs->data; | 845 c = (struct conversation *)bcs->data; |
| 842 parent = c->close->parent; | 846 parent = c->close->parent; |
| 843 c->close = change_text(c->window, _("Close"), c->close, cancel_xpm, opt); | 847 c->close = change_text(c->window, _("Close"), c->close, cancel_xpm, opt); |
| 844 gtk_box_reorder_child(GTK_BOX(parent), c->close, 0); | 848 gtk_box_reorder_child(GTK_BOX(parent), c->close, 0); |
| 845 gtk_box_set_child_packing(GTK_BOX(parent), c->sep1, dispstyle, dispstyle, 0, GTK_PACK_END); | 849 gtk_box_set_child_packing(GTK_BOX(parent), c->sep1, dispstyle, dispstyle, 0, GTK_PACK_END); |
| 846 if (find_buddy(c->name) == NULL) | 850 if (find_buddy(c->gc, c->name) == NULL) |
| 847 c->add = change_text(c->window, _("Add"), c->add, gnome_add_xpm, opt); | 851 c->add = change_text(c->window, _("Add"), c->add, gnome_add_xpm, opt); |
| 848 else | 852 else |
| 849 c->add = change_text(c->window, _("Remove"), c->add, gnome_remove_xpm, opt); | 853 c->add = change_text(c->window, _("Remove"), c->add, gnome_remove_xpm, opt); |
| 850 gtk_box_reorder_child(GTK_BOX(parent), c->add, 2); | 854 gtk_box_reorder_child(GTK_BOX(parent), c->add, 2); |
| 851 c->block = change_text(c->window, _("Block"), c->block, block_xpm, opt); | 855 c->block = change_text(c->window, _("Block"), c->block, block_xpm, opt); |
