# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1065736654 0
# Node ID e60a007bab7d6f17c8de982ceb439f1d9ef440ee
# Parent  5f4bccd8e3fd08d38cb5c7a26368773b16bee230
[gaim-migrate @ 7788]
For a minute there, I lost myself.  I lost myself.

committer: Tailor Script <tailor@pidgin.im>

diff -r 5f4bccd8e3fd -r e60a007bab7d NEWS
--- a/NEWS	Thu Oct 09 21:50:39 2003 +0000
+++ b/NEWS	Thu Oct 09 21:57:34 2003 +0000
@@ -1,5 +1,9 @@
 -=[ Gaim ]=-  The Pimpin' Penguin IM Client That's Good For The Soul!
 0.71 (10/09/2003):
+	Rob: It's been a while since I've commited some news.  I've had a
+      	very hectic few weeks/months.  Thing are finally coming together
+	again for me.  This release features much copying and pasting. Yeah.
+
 	Sean: I can't wait for everything to be core/ui split!
 
 	Christian: This is a good release, and I don't think people will have
@@ -15,10 +19,6 @@
 	without it. Starting October 15th, the old protocol won't be supported
 	anymore, so there's no reason to support the old one anymore.
 
-	Rob: It's been a while since I've commited some news.  I've had a
-	very hectic few weeks/months.  Thing are finally coming together
-	again for me.  This release features much copying and pasting. Yeah.
-
 	Herman: I bet some plugin authors have resorted to making voodoo dolls
 	of Christian.  Nothing new for Win Gaim users other than a fix for
 	missing aim buddy icons, and removal of gtk-wimp (until it matures).
diff -r 5f4bccd8e3fd -r e60a007bab7d src/gtkconv.c
--- a/src/gtkconv.c	Thu Oct 09 21:50:39 2003 +0000
+++ b/src/gtkconv.c	Thu Oct 09 21:57:34 2003 +0000
@@ -1940,7 +1940,8 @@
 	GaimGtkConversation *gtkconv;
 	GaimGtkWindow *gtkwin;
 	GaimConnection *gc;
-
+	GdkPixbuf *window_icon;
+	
 	win = (GaimConvWindow *)user_data;
 
 	conv = gaim_conv_window_get_conversation_at(win, page_num);
@@ -1960,7 +1961,6 @@
 
 	/* Update the menubar */
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
-		GdkPixbuf *pixbuf;
 		gtk_widget_show(gtkwin->menu.view_log);
 
 		if (gc && prpl_info->options & OPT_PROTO_IM_IMAGE) {
@@ -2000,12 +2000,10 @@
 			g_timeout_add(0, (GSourceFunc)update_send_as_selection, win);
 		
 		if (gtkconv->u.im->anim) {
-			pixbuf = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
-			gtk_window_set_icon(GTK_WINDOW(gtkwin->window), pixbuf);
+			window_icon = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
+			g_object_ref(window_icon);
 		} else {
-			pixbuf = get_tab_icon(conv);
-			gtk_window_set_icon(GTK_WINDOW(gtkwin->window), pixbuf);
-			g_object_unref(G_OBJECT(pixbuf));
+			window_icon = get_tab_icon(conv);
 		}
 	}
 	else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
@@ -2038,10 +2036,11 @@
 		
 		if (gtkwin->menu.send_as != NULL)
 			g_timeout_add(0, (GSourceFunc)update_send_as_selection, win);
+		window_icon = get_tab_icon(conv);
 	}
 	
 	update_typing_icon(conv);
-
+	
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkwin->menu.logging),
 				       gaim_conversation_is_logging(conv));
 	
@@ -2050,6 +2049,8 @@
 	
 	gtk_widget_grab_focus(gtkconv->entry);
 
+	gtk_window_set_icon(GTK_WINDOW(gtkwin->window), window_icon);
+	g_object_unref(G_OBJECT(window_icon));
 	gtk_window_set_title(GTK_WINDOW(gtkwin->window),
 			     gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)));
 }