comparison: src/multi.c
src/multi.c
- changeset 4998
- a20d977d0f4f
- parent 4987
- fda0ee39b454
- child 5024
- 3b5412e4b483
equal
deleted
inserted
replaced
| 4997:98022a16490b | 4998:a20d977d0f4f |
|---|---|
| 67 char proto_opt[7][256]; | 67 char proto_opt[7][256]; |
| 68 | 68 |
| 69 /* stuff for modify window */ | 69 /* stuff for modify window */ |
| 70 GtkWidget *mod; | 70 GtkWidget *mod; |
| 71 GtkWidget *main; | 71 GtkWidget *main; |
| 72 GtkWidget *disc_box; | |
| 72 GtkWidget *name; | 73 GtkWidget *name; |
| 73 GtkWidget *alias; | 74 GtkWidget *alias; |
| 74 GtkWidget *pwdbox; | 75 GtkWidget *pwdbox; |
| 75 GtkWidget *pass; | 76 GtkWidget *pass; |
| 76 GtkWidget *rempass; | 77 GtkWidget *rempass; |
| 534 g_snprintf(ma->username, sizeof(ma->username), "%s", | 535 g_snprintf(ma->username, sizeof(ma->username), "%s", |
| 535 gtk_entry_get_text(GTK_ENTRY(ma->name))); | 536 gtk_entry_get_text(GTK_ENTRY(ma->name))); |
| 536 | 537 |
| 537 generate_login_options(ma, ma->main); | 538 generate_login_options(ma, ma->main); |
| 538 generate_user_options(ma, ma->main); | 539 generate_user_options(ma, ma->main); |
| 539 generate_protocol_options(ma, ma->main); | 540 generate_protocol_options(ma, ma->disc_box); |
| 540 } | 541 } |
| 541 } | 542 } |
| 542 | 543 |
| 543 static GtkWidget *make_protocol_menu(GtkWidget *box, struct mod_account *ma) | 544 static GtkWidget *make_protocol_menu(GtkWidget *box, struct mod_account *ma) |
| 544 { | 545 { |
| 701 gtk_widget_destroy(ma->login_frame); | 702 gtk_widget_destroy(ma->login_frame); |
| 702 ma->login_frame = NULL; | 703 ma->login_frame = NULL; |
| 703 | 704 |
| 704 frame = make_frame(box, _("Login Options")); | 705 frame = make_frame(box, _("Login Options")); |
| 705 ma->login_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); | 706 ma->login_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); |
| 707 gtk_box_reorder_child(GTK_BOX(box), ma->login_frame, 0); | |
| 706 | 708 |
| 707 vbox = gtk_vbox_new(FALSE, 5); | 709 vbox = gtk_vbox_new(FALSE, 5); |
| 708 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); | 710 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); |
| 709 gtk_container_add(GTK_CONTAINER(frame), vbox); | 711 gtk_container_add(GTK_CONTAINER(frame), vbox); |
| 710 | 712 |
| 838 gtk_widget_destroy(ma->user_frame); | 840 gtk_widget_destroy(ma->user_frame); |
| 839 ma->user_frame = NULL; | 841 ma->user_frame = NULL; |
| 840 | 842 |
| 841 frame = make_frame(box, _("User Options")); | 843 frame = make_frame(box, _("User Options")); |
| 842 ma->user_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); | 844 ma->user_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); |
| 845 gtk_box_reorder_child(GTK_BOX(box), ma->user_frame, 1); | |
| 843 gtk_widget_show_all(ma->user_frame); | 846 gtk_widget_show_all(ma->user_frame); |
| 844 | 847 |
| 845 vbox = gtk_vbox_new(FALSE, 5); | 848 vbox = gtk_vbox_new(FALSE, 5); |
| 846 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); | 849 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); |
| 847 gtk_container_add(GTK_CONTAINER(frame), vbox); | 850 gtk_container_add(GTK_CONTAINER(frame), vbox); |
| 902 g_snprintf(buf, sizeof(buf), _("%s Options"), p->name); | 905 g_snprintf(buf, sizeof(buf), _("%s Options"), p->name); |
| 903 frame = make_frame(box, buf); | 906 frame = make_frame(box, buf); |
| 904 | 907 |
| 905 /* BLEH */ | 908 /* BLEH */ |
| 906 ma->proto_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); | 909 ma->proto_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); |
| 910 gtk_box_reorder_child(GTK_BOX(box), ma->proto_frame, 0); | |
| 907 gtk_widget_show_all(ma->proto_frame); | 911 gtk_widget_show_all(ma->proto_frame); |
| 908 | 912 |
| 909 vbox = gtk_vbox_new(FALSE, 5); | 913 vbox = gtk_vbox_new(FALSE, 5); |
| 910 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); | 914 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); |
| 911 gtk_container_add(GTK_CONTAINER(frame), vbox); | 915 gtk_container_add(GTK_CONTAINER(frame), vbox); |
| 1200 generate_login_options(ma, ma->main); | 1204 generate_login_options(ma, ma->main); |
| 1201 generate_user_options(ma, ma->main); | 1205 generate_user_options(ma, ma->main); |
| 1202 disc = gaim_disclosure_new(_("Show more options"), _("Show fewer options")); | 1206 disc = gaim_disclosure_new(_("Show more options"), _("Show fewer options")); |
| 1203 gtk_box_pack_start(GTK_BOX(ma->main), disc, FALSE, FALSE, 0); | 1207 gtk_box_pack_start(GTK_BOX(ma->main), disc, FALSE, FALSE, 0); |
| 1204 gtk_widget_show(disc); | 1208 gtk_widget_show(disc); |
| 1205 dbox = gtk_vbox_new(FALSE, 12); | 1209 ma->disc_box = dbox = gtk_vbox_new(FALSE, 12); |
| 1206 gtk_container_set_border_width(GTK_CONTAINER(dbox), 6); | 1210 gtk_container_set_border_width(GTK_CONTAINER(dbox), 6); |
| 1207 gtk_box_pack_start(GTK_BOX(ma->main), dbox, FALSE, FALSE, 0); | 1211 gtk_box_pack_start(GTK_BOX(ma->main), dbox, FALSE, FALSE, 0); |
| 1208 gaim_disclosure_set_container(GAIM_DISCLOSURE(disc), dbox); | 1212 gaim_disclosure_set_container(GAIM_DISCLOSURE(disc), dbox); |
| 1209 generate_protocol_options(ma, dbox); | 1213 generate_protocol_options(ma, dbox); |
| 1210 generate_proxy_options(ma, dbox); | 1214 generate_proxy_options(ma, dbox); |
