Revision f379ea53d73bcaaebf665fb435f7d6d5a617d468

[nosnilmot at pidgin.im]

o   -----------------------------------------------------------------
|   Revision: f379ea53d73bcaaebf665fb435f7d6d5a617d468
|   Ancestor: 220f773a75441c843300e6923053e603c3921660
|   Author: nosnilmot
|   Date: 2005-01-18T02:12:29
|   Branch: im.pidgin.gaim.oldstatus
|   
|   Modified files:
|           src/gtkdialogs.c src/gtkimhtml.c
|   
|   ChangeLog: 
|   
|   [gaim-migrate @ 11839]
|   Don't show smileys in Help -> About, apparently some people put smileys in
|   their compiler flags.
|   ============================================================
|   --- src/gtkdialogs.c	0a21a596bdd9deeaed44337e38eed59bba01d8e0
|   +++ src/gtkdialogs.c	5d5e2a1579a18528dbf420fe73d4525cdea4f6fa
|   @@ -229,6 +229,7 @@ void gaim_gtkdialogs_about(GtkWidget *w,
|    
|    	text = gtk_imhtml_new(NULL, NULL);
|    	gtk_container_add(GTK_CONTAINER(sw), text);
|   +	gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY);
|    	gaim_setup_imhtml(text);
|    
|    	str = g_string_sized_new(4096);
|   ============================================================
|   --- src/gtkimhtml.c	e5598fa4ce4e31ab07c1095f8d0eb898fd44cba4
|   +++ src/gtkimhtml.c	9261abe5d4ae3f7939b5e17d78721c6572752697
|   @@ -3915,14 +3915,17 @@ void gtk_imhtml_insert_smiley_at_iter(Gt
|    	GtkTextChildAnchor *anchor;
|    	char *unescaped = gaim_unescape_html(smiley);
|    
|   -	annipixbuf = gtk_smiley_tree_image(imhtml, sml, unescaped);
|   -	if(annipixbuf) {
|   -		if(gdk_pixbuf_animation_is_static_image(annipixbuf)) {
|   -			pixbuf = gdk_pixbuf_animation_get_static_image(annipixbuf);
|   -			if(pixbuf)
|   -				icon = gtk_image_new_from_pixbuf(pixbuf);
|   -		} else {
|   -			icon = gtk_image_new_from_animation(annipixbuf);
|   +	if (imhtml->format_functions & GTK_IMHTML_SMILEY)
|   +	{
|   +		annipixbuf = gtk_smiley_tree_image(imhtml, sml, unescaped);
|   +		if(annipixbuf) {
|   +			if(gdk_pixbuf_animation_is_static_image(annipixbuf)) {
|   +				pixbuf = gdk_pixbuf_animation_get_static_image(annipixbuf);
|   +				if(pixbuf)
|   +					icon = gtk_image_new_from_pixbuf(pixbuf);
|   +			} else {
|   +				icon = gtk_image_new_from_animation(annipixbuf);
|   +			}
|    		}
|    	}
|    

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from f379ea53d73bcaaebf665fb435f7d6d5a617d468