pidgin/pidgin

Get rid of some IMHtml traces

2014-02-02, Tomasz Wasilczyk
9f6d0e63e80a
Parents 3fc5097c876d
Children 424f080c23e8
Get rid of some IMHtml traces
3 files changed, 9 insertions(+), 7 deletions(-)
  • +1 -1
    pidgin/gtkconv.c
  • +5 -5
    pidgin/gtksmiley.c
  • +3 -1
    pidgin/gtkwebview.c
    • --- a/pidgin/gtkconv.c Sun Feb 02 01:36:26 2014 +0100
    +++ b/pidgin/gtkconv.c Sun Feb 02 02:00:31 2014 +0100
    @@ -2445,7 +2445,7 @@
    {
    /* This is done in default_formatize, which is called from clear_formatting_cb,
    * which is (obviously) a clear_formatting signal handler. However, if we're
    - * here, we didn't call gtk_imhtml_clear_formatting() (because we want to
    + * here, we didn't call gtk_webview_clear_formatting() (because we want to
    * preserve the formatting exactly as it is), so we have to do this now. */
    gtk_webview_set_whole_buffer_formatting_only(entry,
    (features & PURPLE_CONNECTION_FLAG_FORMATTING_WBFO));
    --- a/pidgin/gtksmiley.c Sun Feb 02 01:36:26 2014 +0100
    +++ b/pidgin/gtksmiley.c Sun Feb 02 02:00:31 2014 +0100
    @@ -90,8 +90,8 @@
    /******************************************************************************
    * GtkWebViewSmileys stuff
    *****************************************************************************/
    -/* Perhaps these should be in gtkimhtml.c instead. -- sadrul */
    -static void add_gtkimhtml_to_list(GtkWebViewSmiley *gtksmiley)
    +/* Perhaps these should be in gtkwebview.c instead. -- sadrul */
    +static void add_gtkwebview_to_list(GtkWebViewSmiley *gtksmiley)
    {
    gtk_smileys = g_slist_prepend(gtk_smileys, gtksmiley);
    @@ -128,7 +128,7 @@
    #endif
    }
    -static GtkWebViewSmiley *smiley_purple_to_gtkimhtml(PurpleSmiley *smiley)
    +static GtkWebViewSmiley *smiley_purple_to_gtkwebview(PurpleSmiley *smiley)
    {
    GtkWebViewSmiley *gtksmiley;
    gchar *filename;
    @@ -188,8 +188,8 @@
    {
    GtkWebViewSmiley *gtksmiley;
    - gtksmiley = smiley_purple_to_gtkimhtml(smiley);
    - add_gtkimhtml_to_list(gtksmiley);
    + gtksmiley = smiley_purple_to_gtkwebview(smiley);
    + add_gtkwebview_to_list(gtksmiley);
    g_signal_connect(G_OBJECT(smiley), "destroy", G_CALLBACK(pidgin_smiley_del_from_list), NULL);
    }
    --- a/pidgin/gtkwebview.c Sun Feb 02 01:36:26 2014 +0100
    +++ b/pidgin/gtkwebview.c Sun Feb 02 02:00:31 2014 +0100
    @@ -293,7 +293,7 @@
    else if (*x == '<') /* Because we're all WYSIWYG now, a '<' char should
    * only appear as the start of a tag. Perhaps a
    * safer (but costlier) check would be to call
    - * gtk_imhtml_is_tag on it */
    + * gtk_webview_is_tag on it */
    break;
    else {
    alen = 1;
    @@ -507,10 +507,12 @@
    wids = gtk_text_child_anchor_get_widgets(anchor);
    +#if 0
    g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext",
    purple_unescape_html(smiley->smile), g_free);
    g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_htmltext",
    g_strdup(smiley->smile), g_free);
    +#endif
    if (smiley->webview) {
    if (wids) {