[Gaim-commits] CVS: gaim/src conversation.c,1.344,1.345

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv8085

Modified Files:
	conversation.c 
Log Message:
oatmeal.



Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- conversation.c	16 Mar 2002 00:32:53 -0000	1.344
+++ conversation.c	19 Mar 2002 06:29:30 -0000	1.345
@@ -95,13 +95,8 @@
 /*------------------------------------------------------------------------*/
 
 
-void gaim_setup_imhtml(GtkWidget *imhtml)
+void gaim_setup_imhtml_smileys(GtkWidget *imhtml)
 {
-	g_return_if_fail(imhtml != NULL);
-	g_return_if_fail(GTK_IS_IMHTML(imhtml));
-	if (!(convo_options & OPT_CONVO_SHOW_SMILEY))
-		gtk_imhtml_show_smileys(GTK_IMHTML(imhtml), FALSE);
-	gtk_signal_connect(GTK_OBJECT(imhtml), "url_clicked", GTK_SIGNAL_FUNC(open_url), NULL);
 	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), "C:)", luke03_xpm);
 	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), "C:-)", luke03_xpm);
 	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), "O-)", oneeye_xpm);
@@ -113,6 +108,17 @@
 	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), ":-]", farted_xpm);
 }
 
+void gaim_setup_imhtml(GtkWidget *imhtml)
+{
+	g_return_if_fail(imhtml != NULL);
+	g_return_if_fail(GTK_IS_IMHTML(imhtml));
+	if (!(convo_options & OPT_CONVO_SHOW_SMILEY))
+		gtk_imhtml_show_smileys(GTK_IMHTML(imhtml), FALSE);
+
+	gtk_signal_connect(GTK_OBJECT(imhtml), "url_clicked", GTK_SIGNAL_FUNC(open_url), NULL);
+	gaim_setup_imhtml_smileys(imhtml);	
+}
+
 void quiet_set(GtkWidget *tb, int state)
 {
 	state_lock = 1;
@@ -2208,6 +2214,7 @@
 	update_icon(cnv);
 	update_checkbox(cnv);
 	update_smilies(cnv);
+	gaim_setup_imhtml_smileys(cnv->text);
 }
 
 int set_dispstyle(int chat)
@@ -2366,6 +2373,7 @@
 	update_icon(c);
 	update_checkbox(c);
 	update_smilies(c);
+	gaim_setup_imhtml_smileys(c->text);
 }
 
 void update_buttons_by_protocol(struct conversation *c)