Mercurial > pidgin.yaz
diff src/gtkimhtmltoolbar.c @ 8456:5f8d4ab6d375
[gaim-migrate @ 9186]
"his patch fixes an issue where the gtkimhtml and the
gtkimtoolbar did not know what protocol the
conversation was for so they we're either displaying
core smileys or white boxes with an x through them.
this also make gtkimthml honor the ctrl-{b/u/i} and
ctrl-number prefs." --Gary Kramlich
who continues:
"in the first patch i forgot to adjust the protocol name in
the conversation when an item in the send as menu was
selected. This fixes that."
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Tue, 16 Mar 2004 19:35:17 +0000 |
| parents | be4cf7c09ca3 |
| children | 6d0869404696 |
line wrap: on
line diff
--- a/src/gtkimhtmltoolbar.c Tue Mar 16 19:19:36 2004 +0000 +++ b/src/gtkimhtmltoolbar.c Tue Mar 16 19:35:17 2004 +0000 @@ -481,9 +481,10 @@ insert_smiley_text(GtkWidget *widget, GtkIMHtmlToolbar *toolbar) { char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text"); - //GaimPlugin *proto = gaim_find_prpl(gaim_account_get_protocol_id(gaim_conversation_get_account(c))); - gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml), NULL, smiley_text); //proto->info->name, smiley_text); + gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml), + GTK_IMHTML(toolbar->imhtml)->protocol_name, + smiley_text); close_smiley_dialog(NULL, NULL, toolbar); }