Mercurial > pidgin.yaz
diff pidgin/gtkdialogs.c @ 32521:67143ecbddb1
propagate from branch 'im.pidgin.pidgin' (head 9b3deec2188b0d6cd5015cc06c8de2f7d5696a59)
to branch 'im.pidgin.soc.2009.webkitmessageview' (head f4f724d0d7a1a3cf374b8eff0a2ce1e07ab7fb41)
author | tdrhq@soc.pidgin.im |
---|---|
date | Mon, 27 Jul 2009 03:14:08 +0000 |
parents | cc8f641d2fde fe75cd926073 |
children | c410e48a31c6 |
line wrap: on
line diff
--- a/pidgin/gtkdialogs.c Sun Jul 26 21:42:21 2009 +0000 +++ b/pidgin/gtkdialogs.c Mon Jul 27 03:14:08 2009 +0000 @@ -38,12 +38,13 @@ #include "gtkblist.h" #include "gtkdialogs.h" -#include "gtkimhtml.h" -#include "gtkimhtmltoolbar.h" #include "gtklog.h" #include "gtkutils.h" +#include "gtkwebview.h" #include "pidginstock.h" + + static GList *dialogwindows = NULL; static GtkWidget *about = NULL; @@ -399,10 +400,10 @@ { GtkWidget *vbox; GtkWidget *logo; - GtkWidget *frame; - GtkWidget *text; + GtkWidget *scrolled_window; GtkWidget *button; - GtkTextIter iter; + GtkWidget *web_view; + GString *str; AtkObject *obj; char* filename, *tmp; @@ -440,9 +441,14 @@ g_free(tmp); gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0); - frame = pidgin_create_imhtml(FALSE, &text, NULL, NULL); - gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY); - gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + web_view = gtk_webview_new (); + gtk_container_add (GTK_CONTAINER (scrolled_window), web_view); + + gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0); str = g_string_sized_new(4096); @@ -683,11 +689,9 @@ /* End of not to be translated section */ - gtk_imhtml_append_text(GTK_IMHTML(text), str->str, GTK_IMHTML_NO_SCROLL); + webkit_web_view_load_html_string (WEBKIT_WEB_VIEW(web_view), str->str, ""); g_string_free(str, TRUE); - gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); - gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter); /* Close Button */ button = pidgin_dialog_add_button(GTK_DIALOG(about), GTK_STOCK_CLOSE,