# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1175718139 0
# Node ID f77f1d5870b6ed1565ee6f46bb3c3037c3b588a0
# Parent  37d928a6579e75b24346f8c05d98b51b2ab5421d# Parent  e78b15c2c60f1eb11716aabf0476acd27ce3bd63
merge of '015699f55d664f822a057b5980abe9f7317959b7'
     and 'ca14417a95631e3443b63dbefedba1709de9d78d'

diff -r e78b15c2c60f -r f77f1d5870b6 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Apr 04 20:20:59 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Apr 04 20:22:19 2007 +0000
@@ -3105,8 +3105,13 @@
 static gboolean
 typing_animation(gpointer data) {
 	PidginConversation *gtkconv = data;
+	PidginWindow *gtkwin = gtkconv->win;
 	const char *stock_id = NULL;
-	PidginWindow *gtkwin = gtkconv->win;
+
+	if(gtkconv != pidgin_conv_window_get_active_gtkconv(gtkwin)) {
+		return FALSE;
+	}
+
 	switch (rand() % 5) {
 	case 0:
 		stock_id = PIDGIN_STOCK_ANIMATION_TYPING0;
@@ -3484,16 +3489,16 @@
 	if (!pixbuf)
 		return NULL;
 
-	scale = gdk_pixbuf_scale_simple(pixbuf, 15, 15, GDK_INTERP_BILINEAR);
+	scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
 	g_object_unref(pixbuf);
 
 	if (flags && purple_conv_chat_is_user_ignored(chat, name)) {
 		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", "default", "ignored.png", NULL);
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
-		scale2 = gdk_pixbuf_scale_simple(pixbuf, 15, 15, GDK_INTERP_BILINEAR);
+		scale2 = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
 		g_object_unref(pixbuf);
-		gdk_pixbuf_composite(scale2, scale, 0, 0, 15, 15, 0, 0, 1, 1, GDK_INTERP_BILINEAR, 192);
+		gdk_pixbuf_composite(scale2, scale, 0, 0, 16, 16, 0, 0, 1, 1, GDK_INTERP_BILINEAR, 192);
 		g_object_unref(scale2);
 	}