# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1180659019 0
# Node ID 95203f9325a34953f3832c16dd7295ca05fec731
# Parent  42444b7071d3ce06f6fa6628083de747535f0499# Parent  bfdc5995d54af49b9eac8d8e7ac0a415916f6141
merge of '65a2625990bbafe0f7d435e23be894ec9a7dc189'
     and '9000e0be743fc6ffde1eb0eff1f861bbdaec9a06'

diff -r 42444b7071d3 -r 95203f9325a3 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu May 31 21:24:43 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Jun 01 00:50:19 2007 +0000
@@ -235,6 +235,10 @@
 		return FALSE;
 	}
 
+	if (gdk_window_get_state(gtkconv->win->window->window) & GDK_WINDOW_STATE_MAXIMIZED) {
+		return FALSE;
+	}
+
 	/* I find that I resize the window when it has a bunch of conversations in it, mostly so that the
 	 * tab bar will fit, but then I don't want new windows taking up the entire screen.  I check to see
 	 * if there is only one conversation in the window.  This way we'll be setting new windows to the