[Gaim-commits] CVS: gaim/src conversation.c,1.340,1.341 gtkimhtml.c,1.102,1.103 gtkimhtml.h,1.12,1.13

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

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

Modified Files:
	conversation.c gtkimhtml.c gtkimhtml.h 
Log Message:
This fixes smileys when changing protocols.



Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -d -r1.340 -r1.341
--- conversation.c	15 Mar 2002 00:56:14 -0000	1.340
+++ conversation.c	15 Mar 2002 02:34:10 -0000	1.341
@@ -2207,6 +2207,7 @@
 
 	update_icon(cnv);
 	update_checkbox(cnv);
+	update_smilies(cnv);
 }
 
 int set_dispstyle(int chat)
@@ -3380,6 +3381,7 @@
 	GSList *smilies;
 
 	if (c->gc->prpl->smiley_list) {
+		gtk_imhtml_remove_smileys(GTK_IMHTML(c->text));
 		smilies = c->gc->prpl->smiley_list();
 
 		while (smilies) {
@@ -3389,6 +3391,8 @@
 			gtk_imhtml_associate_smiley(GTK_IMHTML(c->text), smile->key, smile->xpm);
 			smilies = g_slist_next(smilies);
 		}
+	} else {
+		gtk_imhtml_reset_smileys(GTK_IMHTML(c->text));
 	}
 }
 

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- gtkimhtml.c	5 Mar 2002 18:19:18 -0000	1.102
+++ gtkimhtml.c	15 Mar 2002 02:34:10 -0000	1.103
@@ -256,6 +256,14 @@
 	imhtml->smiley_data = gtk_smiley_tree_new ();
 }
 
+void
+gtk_imhtml_reset_smileys (GtkIMHtml *imhtml) 
+{
+	gtk_imhtml_remove_smileys(imhtml);
+	gtk_imhtml_init_smileys (imhtml);
+}
+	
+
 struct im_image {
 	gchar *filename;
 	

Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gtkimhtml.h	2 Mar 2002 04:52:21 -0000	1.12
+++ gtkimhtml.h	15 Mar 2002 02:34:10 -0000	1.13
@@ -121,7 +121,11 @@
 					gchar            *text,
 					gchar           **xpm);
 
+static void 	   gtk_imhtml_init_smileys     (GtkIMHtml *imhtml);
+
 void       gtk_imhtml_remove_smileys   (GtkIMHtml        *imhtml);
+
+void       gtk_imhtml_reset_smileys   (GtkIMHtml        *imhtml);
 
 void       gtk_imhtml_show_smileys     (GtkIMHtml        *imhtml,
 					gboolean          show);