From: Luke S. <lsc...@us...> - 2004-03-28 18:08:51
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31445/src Modified Files: gtkconv.c gtkimhtml.c Log Message: " If "Show graphical smileys" is disabled in preferences and you use the smiley button to enter a smiley in a conversation, it shows as a graphical smiley in the entry box, but as a text smiley in the conversation itself. This patch fixes that so the preferences is used." --Stu Tomlinson Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.340 retrieving revision 1.341 diff -u -d -p -r1.340 -r1.341 --- gtkconv.c 26 Mar 2004 14:14:14 -0000 1.340 +++ gtkconv.c 28 Mar 2004 17:57:31 -0000 1.341 @@ -5527,6 +5527,7 @@ show_smileys_pref_cb(const char *name, G gtkconv = GAIM_GTK_CONVERSATION(conv); gtk_imhtml_show_smileys(GTK_IMHTML(gtkconv->imhtml), (gboolean)GPOINTER_TO_INT(value)); + gtk_imhtml_show_smileys(GTK_IMHTML(gtkconv->entry), (gboolean)GPOINTER_TO_INT(value)); } } Index: gtkimhtml.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v retrieving revision 1.295 retrieving revision 1.296 diff -u -d -p -r1.295 -r1.296 --- gtkimhtml.c 26 Mar 2004 14:14:15 -0000 1.295 +++ gtkimhtml.c 28 Mar 2004 17:57:32 -0000 1.296 @@ -2931,6 +2931,11 @@ void gtk_imhtml_insert_smiley(GtkIMHtml GtkTextChildAnchor *anchor; char *unescaped = gaim_unescape_html(smiley); + if (!imhtml->show_smileys) { + gtk_text_buffer_insert_at_cursor(imhtml->text_buffer, smiley, strlen(smiley)); + return; + } + gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, ins); anchor = gtk_text_buffer_create_child_anchor(imhtml->text_buffer, &iter); g_object_set_data(G_OBJECT(anchor), "text_tag", unescaped); |