comparison: pidgin/gtkrequest.c
pidgin/gtkrequest.c
- changeset 38007
- 3b971d2ecae1
- parent 38000
- fd598f54e5c1
- child 38358
- 30ba44276e74
equal
deleted
inserted
replaced
| 38006:98fc851b9c99 | 38007:3b971d2ecae1 |
|---|---|
| 593 | 593 |
| 594 label = GTK_LABEL(gtk_label_new(NULL)); | 594 label = GTK_LABEL(gtk_label_new(NULL)); |
| 595 | 595 |
| 596 gtk_label_set_markup(label, label_text); | 596 gtk_label_set_markup(label, label_text); |
| 597 gtk_label_set_line_wrap(label, TRUE); | 597 gtk_label_set_line_wrap(label, TRUE); |
| 598 gtk_label_set_alignment(label, 0, 0); | 598 gtk_label_set_xalign(label, 0); |
| 599 gtk_label_set_yalign(label, 0); | |
| 599 gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(label), FALSE, FALSE, 0); | 600 gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(label), FALSE, FALSE, 0); |
| 600 | 601 |
| 601 g_free(label_text); | 602 g_free(label_text); |
| 602 | 603 |
| 603 /* Entry field. */ | 604 /* Entry field. */ |
| 750 | 751 |
| 751 label = gtk_label_new(NULL); | 752 label = gtk_label_new(NULL); |
| 752 | 753 |
| 753 gtk_label_set_markup(GTK_LABEL(label), label_text); | 754 gtk_label_set_markup(GTK_LABEL(label), label_text); |
| 754 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 755 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 755 gtk_label_set_alignment(GTK_LABEL(label), 0, 0); | 756 gtk_label_set_xalign(GTK_LABEL(label), 0); |
| 757 gtk_label_set_yalign(GTK_LABEL(label), 0); | |
| 756 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); | 758 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); |
| 757 | 759 |
| 758 g_free(label_text); | 760 g_free(label_text); |
| 759 | 761 |
| 760 vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE); | 762 vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE); |
| 874 | 876 |
| 875 label = gtk_label_new(NULL); | 877 label = gtk_label_new(NULL); |
| 876 | 878 |
| 877 gtk_label_set_markup(GTK_LABEL(label), label_text); | 879 gtk_label_set_markup(GTK_LABEL(label), label_text); |
| 878 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 880 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 879 gtk_label_set_alignment(GTK_LABEL(label), 0, 0); | 881 gtk_label_set_xalign(GTK_LABEL(label), 0); |
| 882 gtk_label_set_yalign(GTK_LABEL(label), 0); | |
| 880 gtk_label_set_selectable(GTK_LABEL(label), TRUE); | 883 gtk_label_set_selectable(GTK_LABEL(label), TRUE); |
| 881 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); | 884 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); |
| 882 | 885 |
| 883 g_free(label_text); | 886 g_free(label_text); |
| 884 | 887 |
| 989 | 992 |
| 990 label = gtk_label_new(NULL); | 993 label = gtk_label_new(NULL); |
| 991 | 994 |
| 992 gtk_label_set_markup(GTK_LABEL(label), label_text); | 995 gtk_label_set_markup(GTK_LABEL(label), label_text); |
| 993 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 996 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 994 gtk_label_set_alignment(GTK_LABEL(label), 0, 0); | 997 gtk_label_set_xalign(GTK_LABEL(label), 0); |
| 998 gtk_label_set_yalign(GTK_LABEL(label), 0); | |
| 995 gtk_label_set_selectable(GTK_LABEL(label), FALSE); | 999 gtk_label_set_selectable(GTK_LABEL(label), FALSE); |
| 996 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); | 1000 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); |
| 997 | 1001 |
| 998 g_free(label_text); | 1002 g_free(label_text); |
| 999 | 1003 |
| 1557 escaped = g_markup_escape_text(str, -1); | 1561 escaped = g_markup_escape_text(str, -1); |
| 1558 | 1562 |
| 1559 cert_label = gtk_label_new(NULL); | 1563 cert_label = gtk_label_new(NULL); |
| 1560 gtk_label_set_markup(GTK_LABEL(cert_label), escaped); | 1564 gtk_label_set_markup(GTK_LABEL(cert_label), escaped); |
| 1561 gtk_label_set_line_wrap(GTK_LABEL(cert_label), TRUE); | 1565 gtk_label_set_line_wrap(GTK_LABEL(cert_label), TRUE); |
| 1562 gtk_label_set_alignment(GTK_LABEL(cert_label), 0, 0); | 1566 gtk_label_set_xalign(GTK_LABEL(cert_label), 0); |
| 1567 gtk_label_set_yalign(GTK_LABEL(cert_label), 0); | |
| 1563 | 1568 |
| 1564 g_free(str); | 1569 g_free(str); |
| 1565 g_free(escaped); | 1570 g_free(escaped); |
| 1566 | 1571 |
| 1567 return cert_label; | 1572 return cert_label; |
| 2070 g_free(primary_esc); | 2075 g_free(primary_esc); |
| 2071 label = gtk_label_new(NULL); | 2076 label = gtk_label_new(NULL); |
| 2072 | 2077 |
| 2073 gtk_label_set_markup(GTK_LABEL(label), label_text); | 2078 gtk_label_set_markup(GTK_LABEL(label), label_text); |
| 2074 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 2079 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 2075 gtk_label_set_alignment(GTK_LABEL(label), 0, 0); | 2080 gtk_label_set_xalign(GTK_LABEL(label), 0); |
| 2081 gtk_label_set_yalign(GTK_LABEL(label), 0); | |
| 2076 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); | 2082 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); |
| 2077 gtk_widget_show(label); | 2083 gtk_widget_show(label); |
| 2078 g_free(label_text); | 2084 g_free(label_text); |
| 2079 } | 2085 } |
| 2080 | 2086 |
| 2151 label = gtk_label_new(NULL); | 2157 label = gtk_label_new(NULL); |
| 2152 | 2158 |
| 2153 gtk_label_set_markup(GTK_LABEL(label), secondary_esc); | 2159 gtk_label_set_markup(GTK_LABEL(label), secondary_esc); |
| 2154 g_free(secondary_esc); | 2160 g_free(secondary_esc); |
| 2155 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 2161 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 2156 gtk_label_set_alignment(GTK_LABEL(label), 0, 0); | 2162 gtk_label_set_xalign(GTK_LABEL(label), 0); |
| 2163 gtk_label_set_yalign(GTK_LABEL(label), 0); | |
| 2157 gtk_box_pack_start(GTK_BOX(vbox), label, (notebook == NULL), | 2164 gtk_box_pack_start(GTK_BOX(vbox), label, (notebook == NULL), |
| 2158 (notebook == NULL), 0); | 2165 (notebook == NULL), 0); |
| 2159 gtk_widget_show(label); | 2166 gtk_widget_show(label); |
| 2160 } | 2167 } |
| 2161 | 2168 |
| 2312 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), text ? text : field_label); | 2319 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), text ? text : field_label); |
| 2313 g_free(text); | 2320 g_free(text); |
| 2314 | 2321 |
| 2315 gtk_widget_set_hexpand(label, TRUE); | 2322 gtk_widget_set_hexpand(label, TRUE); |
| 2316 gtk_widget_set_vexpand(label, TRUE); | 2323 gtk_widget_set_vexpand(label, TRUE); |
| 2317 gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5); | 2324 gtk_label_set_xalign(GTK_LABEL(label), 0); |
| 2318 | 2325 |
| 2319 gtk_size_group_add_widget(sg, label); | 2326 gtk_size_group_add_widget(sg, label); |
| 2320 | 2327 |
| 2321 if (type == PURPLE_REQUEST_FIELD_LABEL || | 2328 if (type == PURPLE_REQUEST_FIELD_LABEL || |
| 2322 type == PURPLE_REQUEST_FIELD_LIST || | 2329 type == PURPLE_REQUEST_FIELD_LIST || |
