comparison: pidgin/gtkdialogs.c
pidgin/gtkdialogs.c
- branch
- cpw.masca.webkit
- changeset 32507
- 5d345f996c80
- parent 32150
- 771effb35c33
- parent 32504
- 8243b910ed4c
- child 32522
- 8dea964d2d5b
equal
deleted
inserted
replaced
| 32324:1a50ce0394d2 | 32507:5d345f996c80 |
|---|---|
| 37 #include "util.h" | 37 #include "util.h" |
| 38 #include "core.h" | 38 #include "core.h" |
| 39 | 39 |
| 40 #include "gtkblist.h" | 40 #include "gtkblist.h" |
| 41 #include "gtkdialogs.h" | 41 #include "gtkdialogs.h" |
| 42 #include "gtkimhtml.h" | |
| 43 #include "gtkimhtmltoolbar.h" | |
| 44 #include "gtklog.h" | 42 #include "gtklog.h" |
| 45 #include "gtkutils.h" | 43 #include "gtkutils.h" |
| 44 #include "gtkwebview.h" | |
| 46 #include "pidginstock.h" | 45 #include "pidginstock.h" |
| 47 | 46 |
| 48 static GList *dialogwindows = NULL; | 47 static GList *dialogwindows = NULL; |
| 49 | 48 |
| 50 struct _PidginGroupMergeObject { | 49 struct _PidginGroupMergeObject { |
| 450 atk_object_set_description(obj, tmp); | 449 atk_object_set_description(obj, tmp); |
| 451 g_free(tmp); | 450 g_free(tmp); |
| 452 gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0); | 451 gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0); |
| 453 | 452 |
| 454 frame = pidgin_create_imhtml(FALSE, &imhtml, NULL, NULL); | 453 frame = pidgin_create_imhtml(FALSE, &imhtml, NULL, NULL); |
| 454 /* FIXME: Compile now and fix it later when we have a proper replacement for this function | |
| 455 gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY); | 455 gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY); |
| 456 */ | |
| 456 gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); | 457 gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); |
| 457 | 458 |
| 458 gtk_imhtml_append_text(GTK_IMHTML(imhtml), string->str, GTK_IMHTML_NO_SCROLL); | 459 gtk_webview_append_html(GTK_WEBVIEW(imhtml), string->str); |
| 459 gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(imhtml)), &iter); | 460 gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(imhtml)), &iter); |
| 460 gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(imhtml)), &iter); | 461 gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(imhtml)), &iter); |
| 461 | 462 |
| 462 button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, | 463 button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, |
| 463 G_CALLBACK(destroy_win), win); | 464 G_CALLBACK(destroy_win), win); |
