diff -r 8ba9a23354ff -r 63a5361c11a1 pidgin/plugins/xmppconsole.c --- a/pidgin/plugins/xmppconsole.c Mon Feb 10 01:09:47 2014 +0530 +++ b/pidgin/plugins/xmppconsole.c Mon Feb 10 02:09:20 2014 +0530 @@ -188,7 +188,7 @@ return; str = purple_xmlnode_to_pretty_str(*packet, NULL); formatted = g_strdup_printf("
%s
", str); - gtk_webview_append_html(GTK_WEBVIEW(console->webview), formatted); + pidgin_webview_append_html(PIDGIN_WEBVIEW(console->webview), formatted); g_free(formatted); g_free(str); } @@ -209,7 +209,7 @@ str = purple_xmlnode_to_pretty_str(node, NULL); formatted = g_strdup_printf("
%s
", str); - gtk_webview_append_html(GTK_WEBVIEW(console->webview), formatted); + pidgin_webview_append_html(PIDGIN_WEBVIEW(console->webview), formatted); g_free(formatted); g_free(str); purple_xmlnode_free(node); @@ -230,13 +230,13 @@ if (gc) protocol = purple_connection_get_protocol(gc); - text = gtk_webview_get_body_text(GTK_WEBVIEW(widget)); + text = pidgin_webview_get_body_text(PIDGIN_WEBVIEW(widget)); if (protocol) purple_protocol_server_iface_send_raw(protocol, gc, text, strlen(text)); g_free(text); - gtk_webview_load_html_string(GTK_WEBVIEW(console->entry), ""); + pidgin_webview_load_html_string(PIDGIN_WEBVIEW(console->entry), ""); return TRUE; } @@ -278,15 +278,15 @@ gtk_widget_set_size_request(console->sw, -1, height + 6); #endif - str = gtk_webview_get_body_text(GTK_WEBVIEW(webview)); + str = pidgin_webview_get_body_text(PIDGIN_WEBVIEW(webview)); if (!str) return; xmlstr = g_strdup_printf("%s", str); node = purple_xmlnode_from_str(xmlstr, -1); if (node) { - gtk_webview_clear_formatting(GTK_WEBVIEW(console->entry)); + pidgin_webview_clear_formatting(PIDGIN_WEBVIEW(console->entry)); } else { - gtk_webview_toggle_backcolor(GTK_WEBVIEW(console->entry), "#ffcece"); + pidgin_webview_toggle_backcolor(PIDGIN_WEBVIEW(console->entry), "#ffcece"); } g_free(str); g_free(xmlstr); @@ -363,7 +363,7 @@ g_random_int(), gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(type_combo))); - gtk_webview_load_html_string_with_selection(GTK_WEBVIEW(console->entry), stanza); + pidgin_webview_load_html_string_with_selection(PIDGIN_WEBVIEW(console->entry), stanza); gtk_widget_grab_focus(console->entry); g_free(to); g_free(stanza); @@ -518,7 +518,7 @@ *priority ? priority : "", *priority ? "</priority>" : ""); - gtk_webview_load_html_string_with_selection(GTK_WEBVIEW(console->entry), stanza); + pidgin_webview_load_html_string_with_selection(PIDGIN_WEBVIEW(console->entry), stanza); gtk_widget_grab_focus(console->entry); g_free(stanza); g_free(to); @@ -659,7 +659,7 @@ *thread ? thread : "", *thread ? "</thread>" : ""); - gtk_webview_load_html_string_with_selection(GTK_WEBVIEW(console->entry), stanza); + pidgin_webview_load_html_string_with_selection(PIDGIN_WEBVIEW(console->entry), stanza); gtk_widget_grab_focus(console->entry); g_free(stanza); g_free(to); @@ -690,7 +690,7 @@ if (console->count == 1) { console->gc = gc; - gtk_webview_load_html_string(GTK_WEBVIEW(console->webview), EMPTY_HTML); + pidgin_webview_load_html_string(PIDGIN_WEBVIEW(console->webview), EMPTY_HTML); gtk_combo_box_set_active(GTK_COMBO_BOX(console->dropdown), 0); } else gtk_widget_show_all(console->hbox); @@ -724,7 +724,7 @@ if (gc == console->gc) { char *tmp = g_strdup_printf("
%s
", _("Logged out.")); - gtk_webview_append_html(GTK_WEBVIEW(console->webview), tmp); + pidgin_webview_append_html(PIDGIN_WEBVIEW(console->webview), tmp); g_free(tmp); console->gc = NULL; } @@ -745,7 +745,7 @@ return; console->gc = g_list_nth_data(console->accounts, gtk_combo_box_get_active(GTK_COMBO_BOX(console->dropdown))); - gtk_webview_load_html_string(GTK_WEBVIEW(console->webview), EMPTY_HTML); + pidgin_webview_load_html_string(PIDGIN_WEBVIEW(console->webview), EMPTY_HTML); } static void @@ -790,12 +790,12 @@ gtk_box_pack_start(GTK_BOX(console->hbox), console->dropdown, TRUE, TRUE, 0); g_signal_connect(G_OBJECT(console->dropdown), "changed", G_CALLBACK(dropdown_changed_cb), NULL); - console->webview = gtk_webview_new(FALSE); - gtk_webview_load_html_string(GTK_WEBVIEW(console->webview), EMPTY_HTML); + console->webview = pidgin_webview_new(FALSE); + pidgin_webview_load_html_string(PIDGIN_WEBVIEW(console->webview), EMPTY_HTML); if (console->count == 0) { char *tmp = g_strdup_printf("
%s
", _("Not connected to XMPP")); - gtk_webview_append_html(GTK_WEBVIEW(console->webview), tmp); + pidgin_webview_append_html(PIDGIN_WEBVIEW(console->webview), tmp); g_free(tmp); } gtk_box_pack_start(GTK_BOX(vbox), @@ -820,8 +820,8 @@ gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); - console->entry = gtk_webview_new(TRUE); - gtk_webview_set_whole_buffer_formatting_only(GTK_WEBVIEW(console->entry), TRUE); + console->entry = pidgin_webview_new(TRUE); + pidgin_webview_set_whole_buffer_formatting_only(PIDGIN_WEBVIEW(console->entry), TRUE); g_signal_connect(G_OBJECT(console->entry),"key-press-event", G_CALLBACK(message_send_cb), console); console->sw = pidgin_make_scrollable(console->entry, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_ETCHED_IN, -1, -1);