comparison: pidgin/gtkdialogs.c
pidgin/gtkdialogs.c
- branch
- cpw.qulogic.gtk3-required
- changeset 33128
- 88ee8f3bfff3
- parent 32881
- 4ef6d1d86818
- parent 33120
- f6f1a27ade72
- child 33132
- 24afd2b22579
equal
deleted
inserted
replaced
| 32893:6063be322695 | 33128:88ee8f3bfff3 |
|---|---|
| 464 gtk_webview_append_html(GTK_WEBVIEW(webview), string->str); | 464 gtk_webview_append_html(GTK_WEBVIEW(webview), string->str); |
| 465 | 465 |
| 466 button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, | 466 button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, |
| 467 G_CALLBACK(destroy_win), win); | 467 G_CALLBACK(destroy_win), win); |
| 468 | 468 |
| 469 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); | 469 gtk_widget_set_can_default(button, TRUE); |
| 470 gtk_widget_grab_default(button); | 470 gtk_widget_grab_default(button); |
| 471 | 471 |
| 472 gtk_widget_show_all(win); | 472 gtk_widget_show_all(win); |
| 473 gtk_window_present(GTK_WINDOW(win)); | 473 gtk_window_present(GTK_WINDOW(win)); |
| 474 | 474 |
| 970 gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK); | 970 gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK); |
| 971 g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL); | 971 g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(gtk_widget_destroy), NULL); |
| 972 | 972 |
| 973 gtk_container_set_border_width (GTK_CONTAINER(window), PIDGIN_HIG_BOX_SPACE); | 973 gtk_container_set_border_width (GTK_CONTAINER(window), PIDGIN_HIG_BOX_SPACE); |
| 974 gtk_window_set_resizable(GTK_WINDOW(window), FALSE); | 974 gtk_window_set_resizable(GTK_WINDOW(window), FALSE); |
| 975 gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE); | 975 /* TODO: figure out how to set no separator in a dialog in GTK+ 3.0 */ |
| 976 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(window)->vbox), PIDGIN_HIG_BORDER); | 976 /*gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE);*/ |
| 977 gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(window)->vbox), PIDGIN_HIG_BOX_SPACE); | 977 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))), |
| 978 PIDGIN_HIG_BORDER); | |
| 979 gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))), | |
| 980 PIDGIN_HIG_BOX_SPACE); | |
| 978 | 981 |
| 979 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); | 982 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER); |
| 980 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); | 983 gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))), hbox); |
| 981 img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_COOL, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); | 984 img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_COOL, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); |
| 982 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); | 985 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); |
| 983 | 986 |
| 984 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 987 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 985 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 988 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
