# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1091748115 0
# Node ID 1769cb1261be51290da483602e8502eb8db1343a
# Parent  882e7e423457c94c083da6edf8af525eb6e636f3
[gaim-migrate @ 10539]
[ 986151 ] Buddy Icon reappears after hiding

If we weren't in a string freeze, I'd make an option in the "Options" menu
to restore the buddy icon, but for now this works.

committer: Tailor Script <tailor@pidgin.im>

diff -r 882e7e423457 -r 1769cb1261be src/gtkconv.c
--- a/src/gtkconv.c	Thu Aug 05 23:04:16 2004 +0000
+++ b/src/gtkconv.c	Thu Aug 05 23:21:55 2004 +0000
@@ -2461,6 +2461,7 @@
 	gtkconv->u.im->icon = NULL;
 	gtkconv->u.im->anim = NULL;
 	gtkconv->u.im->iter = NULL;
+	gtkconv->u.im->show_icon = FALSE;
 }
 
 static void
@@ -4331,6 +4332,7 @@
 
 	setup_im_buttons(conv, gtkconv->bbox);
 	gtkconv->u.im->animate = gaim_prefs_get_bool("/gaim/gtk/conversations/im/animate_buddy_icons");
+	gtkconv->u.im->show_icon = TRUE;
 
 	/*
 	 * Focus for IM windows should be as follows:
@@ -5658,6 +5660,10 @@
 	g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_IM);
 
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	
+	if (!gtkconv->u.im->show_icon)
+		return;
+
 	account = gaim_conversation_get_account(conv);
 	if(account && account->gc)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
diff -r 882e7e423457 -r 1769cb1261be src/gtkconv.h
--- a/src/gtkconv.h	Thu Aug 05 23:04:16 2004 +0000
+++ b/src/gtkconv.h	Thu Aug 05 23:21:55 2004 +0000
@@ -114,6 +114,7 @@
 
 	/* Buddy icon stuff */
 	GtkWidget *icon;
+	gboolean show_icon;
 	gboolean animate;
 	GdkPixbufAnimation *anim;
 	GdkPixbufAnimationIter *iter;